commit ec3e958037d3fbe31872b9830ea3be11c810f2bd
Author: Chopper <liushuai711@gmail.com>
Date:   Thu May 13 10:56:04 2021 +0800

    commit message

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..88b623fc
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,17 @@
+<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
new file mode 100644
index 00000000..79ee123c
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 00000000..03d9549e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 00000000..24643cc3
--- /dev/null
+++ b/.idea/lili-shop-ui.iml
@@ -0,0 +1,12 @@
+<?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
new file mode 100644
index 00000000..28a804d8
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..b3b94630
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?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
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?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
new file mode 100644
index 00000000..4702c80f
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,380 @@
+<?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/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..008b0b23
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:9999",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..41c3dcb2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "cSpell.ignoreWords": [
+    "cancel",
+    "role"
+  ]
+}
\ No newline at end of file
diff --git a/buyer/.babelrc b/buyer/.babelrc
new file mode 100644
index 00000000..3a280ba3
--- /dev/null
+++ b/buyer/.babelrc
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
+    "stage-2"
+  ],
+  "plugins": ["transform-vue-jsx", "transform-runtime"]
+}
diff --git a/buyer/.editorconfig b/buyer/.editorconfig
new file mode 100644
index 00000000..9d08a1a8
--- /dev/null
+++ b/buyer/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/buyer/.eslintignore b/buyer/.eslintignore
new file mode 100644
index 00000000..e1fcc9c4
--- /dev/null
+++ b/buyer/.eslintignore
@@ -0,0 +1,4 @@
+/build/
+/config/
+/dist/
+/*.js
diff --git a/buyer/.eslintrc.js b/buyer/.eslintrc.js
new file mode 100644
index 00000000..a9bb190a
--- /dev/null
+++ b/buyer/.eslintrc.js
@@ -0,0 +1,33 @@
+// 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
+    }]
+  }
+}
diff --git a/buyer/.gitignore b/buyer/.gitignore
new file mode 100644
index 00000000..67eb9238
--- /dev/null
+++ b/buyer/.gitignore
@@ -0,0 +1,15 @@
+.DS_Store
+node_modules/
+/dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# or directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+package-lock.json
diff --git a/buyer/.postcssrc.js b/buyer/.postcssrc.js
new file mode 100644
index 00000000..140385cd
--- /dev/null
+++ b/buyer/.postcssrc.js
@@ -0,0 +1,10 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  "plugins": {
+    "postcss-import": {},
+    "postcss-url": {},
+    // to  target browsers: use "browserslist" field in package.json
+    "autoprefixer": {}
+  }
+}
diff --git a/buyer/.travis.yml b/buyer/.travis.yml
new file mode 100644
index 00000000..8f6a4b1c
--- /dev/null
+++ b/buyer/.travis.yml
@@ -0,0 +1,10 @@
+language: node_js
+
+node_js:
+  - '8'
+
+install:
+  - npm i npm install && npm install
+
+script:
+  - npm run build
diff --git a/buyer/Dockerfile b/buyer/Dockerfile
new file mode 100644
index 00000000..d7e43746
--- /dev/null
+++ b/buyer/Dockerfile
@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+RUN mkdir -p /app/
+COPY ./dist /app/
+COPY ./nginx.conf /etc/nginx/nginx.conf
+
+
+EXPOSE 80
diff --git a/buyer/LICENSE b/buyer/LICENSE
new file mode 100644
index 00000000..29f81d81
--- /dev/null
+++ b/buyer/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/buyer/README-ZH.md b/buyer/README-ZH.md
new file mode 100644
index 00000000..e69de29b
diff --git a/buyer/README.md b/buyer/README.md
new file mode 100644
index 00000000..202b0e1e
--- /dev/null
+++ b/buyer/README.md
@@ -0,0 +1,25 @@
+### 全局css src/assets/styles
+
+### 工具类 src/plugins
+
+### 顶部广告页 src/components/advertising
+
+### 全部商品分类  components/nav
+
+### 底部导航栏   components/footer
+
+### 发票模态框  components/invoiceModal
+
+### 商品详情   pages/GoodsDetail.vue
+
+#### 商品详情组件  components/goodsDetail
+
+### 全部商品分类  pages/AllCategories.vue
+
+### 意见反馈 pages/Feedback.vue
+
+### 卡片的封装  components/card
+
+### 购物车    pages/Cart.vue
+
+
diff --git a/buyer/build/build.js b/buyer/build/build.js
new file mode 100644
index 00000000..8f2ad8ad
--- /dev/null
+++ b/buyer/build/build.js
@@ -0,0 +1,41 @@
+'use strict'
+require('./check-versions')()
+
+process.env.NODE_ENV = 'production'
+
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
+
+const spinner = ora('building for production...')
+spinner.start()
+
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+  if (err) throw err
+  webpack(webpackConfig, (err, stats) => {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
+
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
+})
diff --git a/buyer/build/check-versions.js b/buyer/build/check-versions.js
new file mode 100644
index 00000000..3ef972a0
--- /dev/null
+++ b/buyer/build/check-versions.js
@@ -0,0 +1,54 @@
+'use strict'
+const chalk = require('chalk')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+const shell = require('shelljs')
+
+function exec (cmd) {
+  return require('child_process').execSync(cmd).toString().trim()
+}
+
+const versionRequirements = [
+  {
+    name: 'node',
+    currentVersion: semver.clean(process.version),
+    versionRequirement: packageConfig.engines.node
+  }
+]
+
+if (shell.which('npm')) {
+  versionRequirements.push({
+    name: 'npm',
+    currentVersion: exec('npm --version'),
+    versionRequirement: packageConfig.engines.npm
+  })
+}
+
+module.exports = function () {
+  const warnings = []
+
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i]
+
+    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
+      warnings.push(mod.name + ': ' +
+        chalk.red(mod.currentVersion) + ' should be ' +
+        chalk.green(mod.versionRequirement)
+      )
+    }
+  }
+
+  if (warnings.length) {
+    console.log('')
+    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log()
+
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
+      console.log('  ' + warning)
+    }
+
+    console.log()
+    process.exit(1)
+  }
+}
diff --git a/buyer/build/utils.js b/buyer/build/utils.js
new file mode 100644
index 00000000..f6312c33
--- /dev/null
+++ b/buyer/build/utils.js
@@ -0,0 +1,110 @@
+'use strict'
+const path = require('path')
+const config = require('../config')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const packageConfig = require('../package.json')
+
+exports.assetsPath = function (_path) {
+  const assetsSubDirectory = process.env.NODE_ENV === 'production'
+    ? config.build.assetsSubDirectory
+    : config.dev.assetsSubDirectory
+
+  return path.posix.join(assetsSubDirectory, _path)
+}
+
+exports.cssLoaders = function (options) {
+  options = options || {}
+
+  const cssLoader = {
+    loader: 'css-loader',
+    options: {
+      sourceMap: options.sourceMap
+    }
+  }
+
+  const postcssLoader = {
+    loader: 'postcss-loader',
+    options: {
+      sourceMap: options.sourceMap
+    }
+  }
+
+  // generate loader string to be used with extract text plugin
+  function generateLoaders (loader, loaderOptions) {
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
+    if (loader) {
+      loaders.push({
+        loader: loader + '-loader',
+        options: Object.assign({}, loaderOptions, {
+          sourceMap: options.sourceMap
+        })
+      })
+    }
+
+    // Extract CSS when that option is specified
+    // (which is the case during production build)
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
+      })
+    } else {
+      return ['vue-style-loader'].concat(loaders)
+    }
+  }
+
+  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
+  return {
+    css: generateLoaders(),
+    postcss: generateLoaders(),
+    less: generateLoaders('less' , { javascriptEnabled : true }),
+    sass: generateLoaders('sass', { indentedSyntax: true }),
+    scss: generateLoaders('sass').concat(
+      {
+        loader: 'sass-resources-loader',
+        options: {
+            //你自己的scss全局文件的路径
+          resources: path.resolve(__dirname, '../src/assets/styles/global.scss')
+        }
+      }
+    ),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
+  }
+}
+
+// Generate loaders for standalone style files (outside of .vue)
+exports.styleLoaders = function (options) {
+  const output = []
+  const loaders = exports.cssLoaders(options)
+
+  for (const extension in loaders) {
+    const loader = loaders[extension]
+    output.push({
+      test: new RegExp('\\.' + extension + '$'),
+      use: loader
+    })
+  }
+
+  return output
+}
+
+exports.createNotifierCallback = () => {
+  const notifier = require('node-notifier')
+
+  return (severity, errors) => {
+    if (severity !== 'error') return
+
+    const error = errors[0]
+    const filename = error.file && error.file.split('!').pop()
+
+    notifier.notify({
+      title: packageConfig.name,
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
+}
diff --git a/buyer/build/vue-loader.conf.js b/buyer/build/vue-loader.conf.js
new file mode 100644
index 00000000..33ed58bc
--- /dev/null
+++ b/buyer/build/vue-loader.conf.js
@@ -0,0 +1,22 @@
+'use strict'
+const utils = require('./utils')
+const config = require('../config')
+const isProduction = process.env.NODE_ENV === 'production'
+const sourceMapEnabled = isProduction
+  ? config.build.productionSourceMap
+  : config.dev.cssSourceMap
+
+module.exports = {
+  loaders: utils.cssLoaders({
+    sourceMap: sourceMapEnabled,
+    extract: isProduction
+  }),
+  cssSourceMap: sourceMapEnabled,
+  cacheBusting: config.dev.cacheBusting,
+  transformToRequire: {
+    video: ['src', 'poster'],
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href'
+  }
+}
diff --git a/buyer/build/webpack.base.conf.js b/buyer/build/webpack.base.conf.js
new file mode 100644
index 00000000..1642bb12
--- /dev/null
+++ b/buyer/build/webpack.base.conf.js
@@ -0,0 +1,103 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const config = require('../config')
+const vueLoaderConfig = require('./vue-loader.conf')
+
+function resolve (dir) {
+  return path.join(__dirname, '..', dir)
+}
+
+const createLintingRule = () => ({
+  test: /\.(js|vue)$/,
+  loader: 'eslint-loader',
+  enforce: 'pre',
+  include: [resolve('src'), resolve('test')],
+  options: {
+    formatter: require('eslint-friendly-formatter'),
+    emitWarning: !config.dev.showEslintErrorsInOverlay
+  }
+})
+
+module.exports = {
+  context: path.resolve(__dirname, '../'),
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: config.build.assetsRoot,
+    filename: '[name].js',
+    publicPath: process.env.NODE_ENV === 'production'
+      ? config.build.assetsPublicPath
+      : config.dev.assetsPublicPath
+  },
+  resolve: {
+    extensions: ['.js', '.vue', '.json'],
+    alias: {
+      'vue$': 'vue/dist/vue.esm.js',
+      '@': resolve('src'),
+    }
+  },
+  module: {
+    rules: [
+      // ...(config.dev.useEslint ? [createLintingRule()] : []),
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: vueLoaderConfig
+      },
+      {
+        test: /\.scss$/,
+        loaders: ['style', 'css', 'sass']
+      },
+      // {
+
+      //   test: /\.less$/,
+        
+      //   loader: "style-loader!css-loader!less-loader",
+        
+      //   },
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('media/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+        }
+      }
+    ]
+  },
+  node: {
+    // prevent webpack from injecting useless setImmediate polyfill because Vue
+    // source contains it (although only uses it if it's native).
+    setImmediate: false,
+    // prevent webpack from injecting mocks to Node native modules
+    // that does not make sense for the client
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty'
+  }
+}
diff --git a/buyer/build/webpack.dev.conf.js b/buyer/build/webpack.dev.conf.js
new file mode 100644
index 00000000..070ae221
--- /dev/null
+++ b/buyer/build/webpack.dev.conf.js
@@ -0,0 +1,95 @@
+'use strict'
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const path = require('path')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
+
+const HOST = process.env.HOST
+const PORT = process.env.PORT && Number(process.env.PORT)
+
+const devWebpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+  },
+  // cheap-module-eval-source-map is faster for development
+  devtool: config.dev.devtool,
+
+  // these devServer options should be customized in /config/index.js
+  devServer: {
+    clientLogLevel: 'warning',
+    historyApiFallback: {
+      rewrites: [
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
+      ],
+    },
+    hot: true,
+    contentBase: false, // since we use CopyWebpackPlugin.
+    compress: true,
+    host: HOST || config.dev.host,
+    port: PORT || config.dev.port,
+    open: config.dev.autoOpenBrowser,
+    overlay: config.dev.errorOverlay
+      ? { warnings: false, errors: true }
+      : false,
+    publicPath: config.dev.assetsPublicPath,
+    proxy: config.dev.proxyTable,
+    quiet: true, // necessary for FriendlyErrorsPlugin
+    watchOptions: {
+      poll: config.dev.poll,
+    }
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/dev.env')
+    }),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
+    new webpack.NoEmitOnErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
+  ]
+})
+
+module.exports = new Promise((resolve, reject) => {
+  portfinder.basePort = process.env.PORT || config.dev.port
+  portfinder.getPort((err, port) => {
+    if (err) {
+      reject(err)
+    } else {
+      // publish the new Port, necessary for e2e tests
+      process.env.PORT = port
+      // add port to devServer config
+      devWebpackConfig.devServer.port = port
+
+      // Add FriendlyErrorsPlugin
+      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+        compilationSuccessInfo: {
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+        },
+        onErrors: config.dev.notifyOnErrors
+        ? utils.createNotifierCallback()
+        : undefined
+      }))
+
+      resolve(devWebpackConfig)
+    }
+  })
+})
diff --git a/buyer/build/webpack.prod.conf.js b/buyer/build/webpack.prod.conf.js
new file mode 100644
index 00000000..3baac9db
--- /dev/null
+++ b/buyer/build/webpack.prod.conf.js
@@ -0,0 +1,145 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
+const env = require('../config/prod.env')
+
+const webpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({
+      sourceMap: config.build.productionSourceMap,
+      extract: false,
+      usePostCSS: true
+    })
+  },
+  devtool: config.build.productionSourceMap ? config.build.devtool : false,
+  output: {
+    path: config.build.assetsRoot,
+    filename: utils.assetsPath('js/[name].[chunkhash].js'),
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/en/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': env
+    }),
+    new UglifyJsPlugin({
+      uglifyOptions: {
+        compress: {
+          warnings: false
+        }
+      },
+      sourceMap: config.build.productionSourceMap,
+      parallel: true
+    }),
+    // extract css into its own file
+    new ExtractTextPlugin({
+      filename: utils.assetsPath('css/[name].[contenthash].css'),
+      // Setting the following option to `false` will not extract CSS from codesplit chunks.
+      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
+      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+      allChunks: true,
+    }),
+    // Compress extracted CSS. We are using this plugin so that possible
+    // duplicated CSS from different components can be deduped.
+    new OptimizeCSSPlugin({
+      cssProcessorOptions: config.build.productionSourceMap
+        ? { safe: true, map: { inline: false } }
+        : { safe: true }
+    }),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: config.build.index,
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      },
+      // necessary to consistently work with multiple chunks via CommonsChunkPlugin
+      chunksSortMode: 'dependency'
+    }),
+    // keep module.id stable when vendor modules does not change
+    new webpack.HashedModuleIdsPlugin(),
+    // enable scope hoisting
+    new webpack.optimize.ModuleConcatenationPlugin(),
+    // split vendor js into its own file
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks (module) {
+        // any required modules inside node_modules are extracted to vendor
+        return (
+          module.resource &&
+          /\.js$/.test(module.resource) &&
+          module.resource.indexOf(
+            path.join(__dirname, '../node_modules')
+          ) === 0
+        )
+      }
+    }),
+    // extract webpack runtime and module manifest to its own file in order to
+    // prevent vendor hash from being updated whenever app bundle is updated
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'manifest',
+      minChunks: Infinity
+    }),
+    // This instance extracts shared chunks from code splitted chunks and bundles them
+    // in a separate chunk, similar to the vendor chunk
+    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'app',
+      async: 'vendor-async',
+      children: true,
+      minChunks: 3
+    }),
+
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.build.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
+  ]
+})
+
+if (config.build.productionGzip) {
+  const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+  webpackConfig.plugins.push(
+    new CompressionWebpackPlugin({
+      asset: '[path].gz[query]',
+      algorithm: 'gzip',
+      test: new RegExp(
+        '\\.(' +
+        config.build.productionGzipExtensions.join('|') +
+        ')$'
+      ),
+      threshold: 10240,
+      minRatio: 0.8
+    })
+  )
+}
+
+if (config.build.bundleAnalyzerReport) {
+  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
+}
+
+module.exports = webpackConfig
diff --git a/buyer/config/dev.env.js b/buyer/config/dev.env.js
new file mode 100644
index 00000000..204792cb
--- /dev/null
+++ b/buyer/config/dev.env.js
@@ -0,0 +1,8 @@
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"development"',
+  BASE_URL:''
+})
diff --git a/buyer/config/index.js b/buyer/config/index.js
new file mode 100644
index 00000000..529e7a7f
--- /dev/null
+++ b/buyer/config/index.js
@@ -0,0 +1,84 @@
+'use strict'
+// Template version: 1.3.1
+// see http://vuejs-templates.github.io/webpack for documentation.
+
+const path = require('path')
+// const api = 'http://www.baidu.com'
+module.exports = {
+  dev: {
+
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {
+      // '/api': {
+      //   target:api,
+      //   changeOrigin:true,
+      //   pathRewrite:{
+      //     '^/api':''
+      //   }
+      // }
+    },
+
+    // Various Dev Server settings
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    port: 8889, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: false,
+    errorOverlay: true,
+    notifyOnErrors: true,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warnings will be shown in the console.
+    useEslint: false,
+    // If true, eslint errors and warnings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: false,
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'cheap-module-eval-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    cssSourceMap: true
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+
+    /**
+     * Source Maps
+     */
+
+    productionSourceMap: true,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+}
diff --git a/buyer/config/prod.env.js b/buyer/config/prod.env.js
new file mode 100644
index 00000000..5222bb9e
--- /dev/null
+++ b/buyer/config/prod.env.js
@@ -0,0 +1,5 @@
+'use strict'
+module.exports = {
+  NODE_ENV: '"production"',
+  BASE_URL:'http://www.baidu.com'
+}
diff --git a/buyer/docker.sh b/buyer/docker.sh
new file mode 100644
index 00000000..0b919466
--- /dev/null
+++ b/buyer/docker.sh
@@ -0,0 +1 @@
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.1 .
diff --git a/buyer/index.html b/buyer/index.html
new file mode 100644
index 00000000..13a70c4d
--- /dev/null
+++ b/buyer/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="./static/logo.ico" type="image/x-icon">
+    <!-- <script src = 'https://webapi.amap.com/maps?v=2.0&key=b440952723253aa9fe483e698057bf7d'></script> -->
+    <title>LILI</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>
diff --git a/buyer/nginx.conf b/buyer/nginx.conf
new file mode 100644
index 00000000..c1d6be04
--- /dev/null
+++ b/buyer/nginx.conf
@@ -0,0 +1,51 @@
+#这个文件给docker用的
+#user  nobody;
+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;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    client_max_body_size 10m;
+    gzip on;
+    gzip_min_length  5k;
+    gzip_buffers     4 16k;
+    gzip_http_version 1.0;
+    gzip_comp_level 4;
+    gzip_types       text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    gzip_vary on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root /app;
+            try_files $uri $uri/ /index.html $uri/ =404;
+            index  index.html index.htm;
+        }
+    }
+}
diff --git a/buyer/package.json b/buyer/package.json
new file mode 100644
index 00000000..ae2ec6e8
--- /dev/null
+++ b/buyer/package.json
@@ -0,0 +1,90 @@
+{
+  "name": "lilishop-vue",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "start": "npm run dev",
+    "lint": "eslint --ext .js,.vue src",
+    "build": "node build/build.js"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "0.0.7",
+    "axios": "^0.19.2",
+    "js-cookie": "^2.2.1",
+    "less": "^3.12.2",
+    "less-loader": "^5.0.0",
+    "psl": "^1.8.0",
+    "qs": "^6.9.4",
+    "swiper": "^6.4.1",
+    "uuid": "^8.3.2",
+    "v-distpicker": "^1.0.17",
+    "view-design": "^4.3.2",
+    "vue": "^2.5.2",
+    "vue-awesome": "^4.0.2",
+    "vue-awesome-swiper": "^4.1.1",
+    "vue-piczoom": "^1.0.6",
+    "vue-qr": "^2.3.0",
+    "vue-router": "^3.0.1",
+    "vuex": "^3.0.1"
+  },
+  "devDependencies": {
+    "autoprefixer": "^7.1.2",
+    "babel-core": "^6.22.1",
+    "babel-eslint": "^8.2.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-transform-vue-jsx": "^3.5.0",
+    "babel-preset-env": "^1.3.2",
+    "babel-preset-stage-2": "^6.22.0",
+    "chalk": "^2.0.1",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.0",
+    "eslint": "^4.15.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-vue": "^4.0.0",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.1.4",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-webpack-plugin": "^2.30.1",
+    "node-notifier": "^5.1.2",
+    "node-sass": "^4.14.1",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
+    "ora": "^1.2.0",
+    "portfinder": "^1.0.13",
+    "postcss-import": "^11.0.0",
+    "postcss-loader": "^2.0.8",
+    "postcss-url": "^7.2.1",
+    "rimraf": "^2.6.0",
+    "sass-loader": "^7.3.1",
+    "sass-resources-loader": "^2.0.3",
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.6",
+    "uglifyjs-webpack-plugin": "^1.1.1",
+    "url-loader": "^0.5.8",
+    "vue-loader": "^13.3.0",
+    "vue-style-loader": "^3.0.1",
+    "vue-template-compiler": "^2.5.2",
+    "webpack": "^3.6.0",
+    "webpack-bundle-analyzer": "^2.9.0",
+    "webpack-dev-server": "^2.9.1",
+    "webpack-merge": "^4.1.0"
+  },
+  "engines": {
+    "node": ">= 6.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}
diff --git a/buyer/src/App.vue b/buyer/src/App.vue
new file mode 100644
index 00000000..019eb1c1
--- /dev/null
+++ b/buyer/src/App.vue
@@ -0,0 +1,37 @@
+<template>
+  <div id="app">
+    <router-view/>
+  </div>
+</template>
+
+<script>
+import {v4 as uuidv4} from 'uuid';
+import storage from '@/plugins/storage';
+import {getLogo} from '@/api/common.js';
+export default {
+  name: 'App',
+  mounted () {
+    let uuid = storage.getItem('uuid');
+    if (!uuid) {
+      uuid = uuidv4();
+      storage.setItem('uuid', uuid);
+    }
+    if (!this.Cookies.getItem('logo')) {
+      setTimeout(() => {
+        getLogo().then(res => {
+          if (res.success) {
+            let logoObj = JSON.parse(res.result.settingValue)
+            this.Cookies.setItem('logo', logoObj.buyerSideLogo)
+          }
+        })
+      }, 1000)
+    }
+  }
+};
+</script>
+<style lang="scss">
+#app{
+  min-height: 100%;
+  @include background_color($light_background_color);
+}
+</style>
diff --git a/buyer/src/api/account.js b/buyer/src/api/account.js
new file mode 100644
index 00000000..dccbdec1
--- /dev/null
+++ b/buyer/src/api/account.js
@@ -0,0 +1,59 @@
+// import {
+//   getRequest,
+//   postRequest,
+//   putRequest,
+//   deleteRequest,
+//   importRequest,
+//   getRequestWithNoToken
+// } from '@/axios/index.js';
+import request, {Method} from '@/plugins/request.js'
+
+// 获取密码状态
+export function getPwdStatus (params) {
+  return request({
+    url: '/buyer/members/wallet/check',
+    method: Method.GET,
+    needToken: true,
+    params
+  })
+}
+
+// 设置密码
+export function setPwd (params) {
+  return request({
+    url: '/buyer/members/wallet/set-password',
+    method: Method.POST,
+    needToken: true,
+    data: params
+  })
+}
+
+// 设置支付密码
+export function setUpdatePwdOrdinary (params) {
+  return request({
+    url: '/buyer/members/wallet/update-password/ordinary',
+    method: Method.GET,
+    needToken: true,
+    data: params
+  })
+}
+
+// 修改会员资料
+export function editMemberInfo (params) {
+  return request({
+    url: '/buyer/members/editOwn',
+    method: Method.PUT,
+    needToken: true,
+    data: params
+  })
+}
+
+// 修改密码
+export function editPwd (params) {
+  return request({
+    url: `/buyer/members/modifyPass`,
+    method: Method.PUT,
+    needToken: true,
+    data: params
+  })
+}
diff --git a/buyer/src/api/address.js b/buyer/src/api/address.js
new file mode 100644
index 00000000..c3163bb0
--- /dev/null
+++ b/buyer/src/api/address.js
@@ -0,0 +1,60 @@
+import request, {
+  Method, commonUrl
+} from '@/plugins/request.js';
+
+// 会员收货地址列表
+export function memberAddress () {
+  return request({
+    url: '/buyer/memberAddress',
+    needToken: true,
+    method: Method.GET
+  });
+}
+
+// 添加收货地址
+export function newMemberAddress (params) {
+  return request({
+    url: '/buyer/memberAddress',
+    needToken: true,
+    method: Method.POST,
+    data: params
+  });
+}
+
+// 编辑收货地址
+export function editMemberAddress (params) {
+  return request({
+    url: '/buyer/memberAddress',
+    needToken: true,
+    method: Method.PUT,
+    params
+  });
+}
+
+// 删除收货地址
+export function delMemberAddress (id) {
+  return request({
+    url: `/buyer/memberAddress/delById/${id}`,
+    needToken: true,
+    method: Method.DELETE
+  });
+}
+
+// 根据id获取会员地址详情
+export function getAddrDetail (id) {
+  return request({
+    url: `/buyer/memberAddress/get/${id}`,
+    needToken: true,
+    method: Method.GET
+  });
+}
+
+// 传给后台citycode 获取城市街道等id
+export function handleRegion (params) {
+  return request({
+    url: `${commonUrl}/common/region/region`,
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
diff --git a/buyer/src/api/cart.js b/buyer/src/api/cart.js
new file mode 100644
index 00000000..57d99878
--- /dev/null
+++ b/buyer/src/api/cart.js
@@ -0,0 +1,214 @@
+import request, {
+  Method
+} from '@/plugins/request.js';
+
+/**
+ * 清空购物车
+ */
+export function clearCart () {
+  return request({
+    url: '/buyer/trade/carts',
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+/**
+ * 获取购物车页面购物车详情
+ */
+export function cartGoodsAll () {
+  return request({
+    url: '/buyer/trade/carts/all',
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+/**
+ * 获取购物车商品数量
+ */
+export function cartCount () {
+  return request({
+    url: '/buyer/trade/carts/count',
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+/**
+ * 获取结算页面购物车详情
+ */
+export function cartGoodsPay (params) {
+  return request({
+    url: '/buyer/trade/carts/checked',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 向购物车添加一个商品
+ * @param skuId skuId
+ * @param  num  购买数量
+ */
+export function addCartGoods (params) {
+  return request({
+    url: '/buyer/trade/carts',
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 创建交易
+ * @param client 客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端
+ * @param way 购物车购买：CART/立即购买：BUY_NOW / 积分购买：POINT
+ * @param remark 备注  非必填
+ */
+export function createTrade (data) {
+  return request({
+    url: '/buyer/trade/carts/create/trade',
+    method: Method.POST,
+    needToken: true,
+    headers: {'Content-Type': 'application/json'},
+    data
+  });
+}
+
+/**
+ * 选择优惠券
+ * @param memberCouponId 优惠券id
+ * @param way 购物车购买：CART/立即购买：BUY_NOW/ 积分购买：POINT
+ * @param used 使用true 弃用 false
+ */
+export function selectCoupon (params) {
+  return request({
+    url: '/buyer/trade/carts/select/coupon',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 可用优惠券数量
+ */
+export function couponNum (params) {
+  return request({
+    url: '/buyer/trade/carts/coupon/num',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+/**
+ * 选择收货地址
+ * @param shippingAddressId 地址id
+ * @param way 购物车类型
+ */
+export function selectAddr (params) {
+  return request({
+    url: `/buyer/trade/carts/shippingAddress`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 选中购物车所有商品
+ * @param checked 设置选中 0，1
+ */
+export function setCheckedAll (params) {
+  return request({
+    url: `/buyer/trade/carts/sku/checked`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 批量设置某商家的商品为选中或不选中
+ * @param checked 是否选中
+ * @param storeId   商家id
+ */
+export function setCheckedSeller (params) {
+  return request({
+    url: `/buyer/trade/carts/store/${params.storeId}`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 选中购物车中单个产品
+ * @param skuId 产品id
+ * @param checked 设置选中0，1
+ */
+export function setCheckedGoods (params) {
+  return request({
+    url: `/buyer/trade/carts/sku/checked/${params.skuId}`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 更新购物车中单个产品数量
+ * @param skuId 产品id
+ * @param num   产品数量
+ */
+export function setCartGoodsNum (params) {
+  return request({
+    url: `/buyer/trade/carts/sku/num/${params.skuId}`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 删除购物车中一个或多个产品
+ * @param skuIds 产品id数组
+ */
+export function delCartGoods (params) {
+  return request({
+    url: `/buyer/trade/carts/sku/remove`,
+    method: Method.DELETE,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 选择配送方式
+ * @param shippingMethod SELF_PICK_UP(自提),LOCAL_TOWN_DELIVERY(同城配送),LOGISTICS(物流)
+ * @param way 购物方式
+ */
+export function shippingMethod (params) {
+  return request({
+    url: `/buyer/trade/carts/shippingMethod`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 选择发票
+ * @param receiptId 发票Id
+ * @param way 购物方式
+ */
+export function receiptSelect (params) {
+  return request({
+    url: `/buyer/trade/carts/select/receipt`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
diff --git a/buyer/src/api/common.js b/buyer/src/api/common.js
new file mode 100644
index 00000000..76fc0e05
--- /dev/null
+++ b/buyer/src/api/common.js
@@ -0,0 +1,83 @@
+import request, {Method, commonUrl} from '@/plugins/request.js';
+
+/**
+ * 获取拼图验证
+ */
+export function getVerifyImg (verificationEnums) {
+  return request({
+    url: `${commonUrl}/common/slider/${verificationEnums}`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+/**
+ * 验证码校验
+ */
+export function postVerifyImg (params) {
+  return request({
+    url: `${commonUrl}/common/slider/${params.verificationEnums}`,
+    method: Method.POST,
+    needToken: false,
+    params
+  });
+}
+/**
+ * 发送短信验证码
+ */
+export function sendSms (params) {
+  return request({
+    url: `${commonUrl}/common/sms/${params.verificationEnums}/${params.mobile}`,
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
+/**
+ * 发送短信验证码
+ */
+export function getLogo () {
+  return request({
+    url: `${commonUrl}/common/logo`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+// 地区数据，用于三级联动
+export function getRegion (id) {
+  return request({
+    url: `${commonUrl}/common/region/item/${id}`,
+    needToken: true,
+    method: Method.GET
+  });
+}
+
+/**
+ * 分页获取文章列表
+ * @param cateId 文章分类id
+ */
+export function articleList (params) {
+  return request({
+    url: `/buyer/article`,
+    method: Method.GET,
+    params
+  });
+}
+
+/**
+ * 获取帮助中心文章分类列表
+ * @param cateId 文章分类id
+ */
+export function articleCateList () {
+  return request({
+    url: `/buyer/article/articleCategory/list`,
+    method: Method.GET
+  });
+}
+
+// 通过id获取文章
+export function articleDetail (id) {
+  return request({
+    url: `/buyer/article/get/${id}`,
+    method: Method.GET
+  });
+}
diff --git a/buyer/src/api/goods.js b/buyer/src/api/goods.js
new file mode 100644
index 00000000..b0117058
--- /dev/null
+++ b/buyer/src/api/goods.js
@@ -0,0 +1,73 @@
+import request, {
+  Method
+} from '@/plugins/request.js';
+
+// 商品列表
+export function goodsList (params) {
+  return request({
+    url: '/buyer/goods/es',
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
+
+// 商品分类 筛选条件  品牌， 尺寸等
+export function filterList (params) {
+  return request({
+    url: '/buyer/goods/es/related',
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
+
+// id获取商品详情
+export function goodsDetail (goodsId) {
+  return request({
+    url: `/buyer/goods/get/${goodsId}`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+
+// id获取商品Sku详情
+export function goodsSkuDetail (params) {
+  return request({
+    url: `/buyer/goods/sku/${params.goodsId}/${params.skuId}`,
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
+
+// 获取所有商品分类
+export function getCategory (parentId) {
+  return request({
+    url: `/buyer/category/get/${parentId}`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+
+// 当前拼团活动未成团会员
+export function pintuanMembers (pintuanId) {
+  return request({
+    url: `/buyer/promotion/pintuan/${pintuanId}/members`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+
+/**
+ * @param {Number} start 搜索起始下标
+ * @param {Number} end 搜索结束下标
+ */
+export function hotWords (params) {
+  return request({
+    url: `/buyer/goods/hot-words`,
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
diff --git a/buyer/src/api/index.js b/buyer/src/api/index.js
new file mode 100644
index 00000000..900df3ee
--- /dev/null
+++ b/buyer/src/api/index.js
@@ -0,0 +1,35 @@
+import request, {Method} from '@/plugins/request.js'
+
+// 获取首页楼层装修数据
+export function indexData (params) {
+  return request({
+    url: '/buyer/pageData/getIndex',
+    method: Method.GET,
+    needToken: false,
+    params
+  })
+}
+
+/**
+ * 楼层装修数据
+ * @param pageClientType 客户端类型,可用值:PC,H5,WECHAT_MP,APP
+ * @param pageType 页面类型,可用值:INDEX,STORE,SPECIAL
+ */
+export function pageData (params) {
+  return request({
+    url: `/buyer/pageData`,
+    method: Method.GET,
+    needToken: false,
+    params
+  })
+}
+/**
+ * 刷新token
+ */
+export function handleRefreshToken (token) {
+  return request({
+    url: `/buyer/members/refresh/${token}`,
+    method: Method.GET,
+    needToken: false
+  })
+}
diff --git a/buyer/src/api/login.js b/buyer/src/api/login.js
new file mode 100644
index 00000000..ab81f1f5
--- /dev/null
+++ b/buyer/src/api/login.js
@@ -0,0 +1,94 @@
+
+import request, {Method, buyerUrl} from '@/plugins/request.js';
+
+/**
+ * 注册
+ */
+export function regist (params) {
+  return request({
+    url: '/buyer/members/register',
+    method: Method.POST,
+    needToken: false,
+    data: params
+  });
+}
+
+/**
+ * 账号密码登录
+ */
+export function login (params) {
+  return request({
+    url: '/buyer/members/userLogin',
+    method: Method.POST,
+    needToken: false,
+    data: params,
+    headers: { 'clientType': 'PC' }
+  });
+}
+
+/**
+ * 手机号验证码登录
+ */
+export function smsLogin (params) {
+  return request({
+    url: '/buyer/members/smsLogin',
+    method: Method.POST,
+    needToken: false,
+    data: params,
+    headers: { 'clientType': 'PC' }
+  });
+}
+
+/**
+ * 获取用户信息
+ */
+export function getMemberMsg (params) {
+  return request({
+    url: '/buyer/members',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 第三方登录 支付宝，微博，qq,微信
+ */
+export function webLogin (type) {
+  window.open(`${buyerUrl}/buyer/connect/login/web/${type}`, 'blank');
+}
+
+/**
+ * 第三方登录成功 回调接口
+ */
+export function loginCallback (uuid) {
+  return request({
+    url: `/buyer/connect/result?state=${uuid}`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+
+/**
+ * 忘记密码  验证手机验证码
+ */
+export function validateCode (params) {
+  return request({
+    url: `/buyer/members/resetByMobile`,
+    method: Method.POST,
+    needToken: false,
+    params
+  });
+}
+
+/**
+ * 忘记密码 重置密码
+ */
+export function resetPassword (params) {
+  return request({
+    url: `/buyer/members/resetPassword`,
+    method: Method.POST,
+    needToken: false,
+    params
+  });
+}
diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js
new file mode 100644
index 00000000..063ccd17
--- /dev/null
+++ b/buyer/src/api/member.js
@@ -0,0 +1,443 @@
+import request, {Method} from '@/plugins/request.js';
+
+// 查询账户余额
+export function getMembersWallet () {
+  return request({
+    url: '/buyer/members/wallet',
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 查询余额列表
+export function getDepositLog (params) {
+  return request({
+    url: '/buyer/wallet/log',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 查询充值记录
+export function getRecharge (params) {
+  return request({
+    url: '/buyer/member/recharge',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 查询提现记录
+export function getWithdrawApply (params) {
+  return request({
+    url: '/buyer/member/withdrawApply',
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 在线充值
+export function recharge (params) {
+  return request({
+    url: '/buyer/trade/recharge',
+    method: Method.POST,
+    needToken: true,
+    data: params
+  });
+}
+
+// 提现
+export function withdrawalApply (params) {
+  return request({
+    url: '/buyer/members/wallet/withdrawal',
+    method: Method.POST,
+    needToken: true,
+    data: params
+  });
+}
+
+// 收藏商品、店铺
+export function collectGoods (type, id) {
+  return request({
+    url: `/buyer/member/collection/add/${type}/${id}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+// 取消 收藏商品、店铺
+export function cancelCollect (type, id) {
+  return request({
+    url: `/buyer/member/collection/delete/${type}/${id}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+// 查看是否收藏
+export function isCollection (type, goodsId) {
+  return request({
+    url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 会员收藏列表
+export function collectList (params) {
+  return request({
+    url: `/buyer/member/collection/${params.type}`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 单个商品评价
+export function goodsComment (params) {
+  return request({
+    url: `/buyer/memberEvaluation/${params.goodsId}/goodsEvaluation`,
+    method: Method.GET,
+    needToken: false,
+    params
+  });
+}
+
+// 商品各评价类别数量
+export function goodsCommentNum (goodsId) {
+  return request({
+    url: `/buyer/memberEvaluation/${goodsId}/evaluationNumber`,
+    method: Method.GET,
+    needToken: false
+  });
+}
+
+// 添加会员评价
+export function addEvaluation (params) {
+  return request({
+    url: `/buyer/memberEvaluation`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+// 会员评价详情
+export function evaluationDetail (id) {
+  return request({
+    url: `/buyer/memberEvaluation/get/${id}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 发票分页列表
+export function receiptList () {
+  return request({
+    url: `/buyer/trade/receipt`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 保存发票信息
+export function saveReceipt (params) {
+  return request({
+    url: `/buyer/trade/receipt`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+// 获取可领取优惠券列表
+export function couponList (params) {
+  return request({
+    url: `/buyer/promotion/coupon`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 会员优惠券列表
+export function memberCouponList (params) {
+  return request({
+    url: `/buyer/promotion/coupon/getCoupons`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 会员优惠券列表
+export function canUseCouponList (params) {
+  return request({
+    url: `/buyer/promotion/coupon/canUse`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 领取优惠券
+export function receiveCoupon (couponId) {
+  return request({
+    url: `/buyer/promotion/coupon/receive/${couponId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 获取申请售后列表
+export function afterSaleList (params) {
+  return request({
+    url: `/buyer/afterSale/page`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 获取申请售后页面信息
+export function afterSaleInfo (sn) {
+  return request({
+    url: `/buyer/afterSale/applyAfterSaleInfo/${sn}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 获取申请售后、投诉原因
+export function afterSaleReason (serviceType) {
+  return request({
+    url: `/buyer/afterSale/get/afterSaleReason/${serviceType}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+// 获取申请售后详情
+export function afterSaleDetail (sn) {
+  return request({
+    url: `/buyer/afterSale/get/${sn}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+// 售后日志
+export function afterSaleLog (sn) {
+  return request({
+    url: `/buyer/afterSale/get/getAfterSaleLog/${sn}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 申请售后
+export function applyAfterSale (params) {
+  return request({
+    url: `/buyer/afterSale/save/${params.orderItemSn}`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+// 取消售后申请
+export function cancelAfterSale (afterSaleSn) {
+  return request({
+    url: `/buyer/afterSale/cancel/${afterSaleSn}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+// 投诉商品
+export function handleComplain (data) {
+  return request({
+    url: `/buyer/complain`,
+    method: Method.POST,
+    needToken: true,
+    data
+  });
+}
+// 分页获取我的投诉列表
+export function complainList (params) {
+  return request({
+    url: `/buyer/complain`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 获取投诉详情
+ */
+export function getComplainDetail (id) {
+  return request({
+    url: `/buyer/complain/${id}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+/**
+ * 取消投诉
+ */
+export function clearComplain (id) {
+  return request({
+    url: `/buyer/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
+ */
+export function selectDistGoods (distributionGoodsId) {
+  return request({
+    url: `/buyer/distributionGoods/checked/${distributionGoodsId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+/**
+ * 分销商提现历史
+ */
+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 页码
+ * @param {Number} pageSize 页数
+ */
+export function tracksList (params) {
+  return request({
+    url: `/buyer/footprint`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 清空足迹
+ */
+export function clearTracks () {
+  return request({
+    url: `/buyer/footprint`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+/**
+ * 根据id删除足迹
+ * @param {String} ids id集合
+ */
+export function clearTracksById (ids) {
+  return request({
+    url: `/buyer/footprint/delByIds/${ids}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+/**
+ * 获取会员积分
+ */
+export function memberPoint (params) {
+  return request({
+    url: `/buyer/member/memberPointsHistory/getMemberPointsHistoryVO`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 积分历史
+ */
+export function memberPointHistory (params) {
+  return request({
+    url: `/buyer/member/memberPointsHistory/getByPage`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
diff --git a/buyer/src/api/order.js b/buyer/src/api/order.js
new file mode 100644
index 00000000..579c76d1
--- /dev/null
+++ b/buyer/src/api/order.js
@@ -0,0 +1,98 @@
+import request, {
+  Method
+} from '@/plugins/request.js';
+
+// 查询会员订单列表
+export function getOrderList (params) {
+  return request({
+    url: `/buyer/orders`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 订单明细
+ * @param {orderSn} 订单编号
+ */
+export function orderDetail (orderSn) {
+  return request({
+    url: `/buyer/orders/${orderSn}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+/**
+ * 取消订单
+ * @param {orderSn} 订单编号
+ * @param reason 取消订单原因
+ */
+export function cancelOrder (params) {
+  return request({
+    url: `/buyer/orders/${params.orderSn}/cancel`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 删除订单
+ * @param {orderSn} 订单编号
+ */
+export function delOrder (orderSn) {
+  return request({
+    url: `/buyer/orders/${orderSn}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+/**
+ * 确认收货
+ * @param {orderSn} 订单编号
+ */
+export function sureReceived (orderSn) {
+  return request({
+    url: `/buyer/orders/${orderSn}/receiving`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+/**
+ * 查询物流
+ * @param {orderSn} 订单编号
+ */
+export function getTraces (orderSn) {
+  return request({
+    url: `/buyer/orders/getTraces/${orderSn}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+/**
+ * 评价列表
+ *
+ */
+export function evolutionList (params) {
+  return request({
+    url: `/buyer/memberEvaluation`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+// 添加交易投诉对话
+export function communication (params) {
+  return request({
+    url: `/buyer/complain/communication`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
diff --git a/buyer/src/api/pay.js b/buyer/src/api/pay.js
new file mode 100644
index 00000000..c573a583
--- /dev/null
+++ b/buyer/src/api/pay.js
@@ -0,0 +1,48 @@
+import request, {
+  Method
+} from '@/plugins/request.js';
+
+/**
+ * 获取支付详情
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ * @param clientType  调起方式，PC
+ */
+export function tradeDetail (params) {
+  return request({
+    url: '/buyer/cashier/tradeDetail',
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
+
+/**
+ * 支付
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param paymentMethod 支付方式 可用值:ALIPAY,WECHAT
+ * @param payClient  调起方式 可用值：APP,NATIVE,JSAPI,H5
+ * @param sn   订单编号
+ */
+export function pay (params) {
+  return request({
+    url: `/buyer/cashier/pay/${params.paymentMethod}/${params.paymentClient}`,
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
+
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function payCallback (params) {
+  return request({
+    url: `/buyer/cashier/result`,
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
diff --git a/buyer/src/api/promotion.js b/buyer/src/api/promotion.js
new file mode 100644
index 00000000..432f1ebf
--- /dev/null
+++ b/buyer/src/api/promotion.js
@@ -0,0 +1,48 @@
+import request, {
+  Method
+} from '@/plugins/request.js';
+
+/**
+ * 获取当天限时抢购信息
+ */
+export function seckillByDay (params) {
+  return request({
+    url: '/buyer/promotion/seckill',
+    method: Method.GET,
+    params
+  });
+}
+
+/**
+ * 获取某个时刻限时抢购信息
+ */
+export function seckillByTimeline (timeline) {
+  return request({
+    url: `/buyer/promotion/seckill/${timeline}`,
+    method: Method.GET
+  });
+}
+
+/**
+ * 获取积分商品分类列表
+ */
+export function pointGoodsCategory (params) {
+  return request({
+    url: `/buyer/promotion/pointsGoods/category`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
+/**
+ * 获取积分商品列表
+ */
+export function pointGoods (params) {
+  return request({
+    url: `/buyer/promotion/pointsGoods`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js
new file mode 100644
index 00000000..82020595
--- /dev/null
+++ b/buyer/src/api/shopentry.js
@@ -0,0 +1,77 @@
+import request, {
+  Method
+} from '@/plugins/request.js'
+
+// 店铺分页列表
+export function shopList (params) {
+  return request({
+    url: '/buyer/store',
+    needToken: true,
+    method: Method.GET,
+    params
+  })
+}
+
+// 申请店铺第一步-填写企业信息
+export function applyFirst (params) {
+  return request({
+    url: '/buyer/store/apply/first',
+    needToken: true,
+    method: Method.PUT,
+    params
+  })
+}
+
+// 申请店铺第一步-填写企业信息
+export function applySecond (params) {
+  return request({
+    url: '/buyer/store/apply/second',
+    needToken: true,
+    method: Method.PUT,
+    params
+  })
+}
+
+// 申请店铺第一步-填写企业信息
+export function applyThird (params) {
+  return request({
+    url: '/buyer/store/apply/third',
+    needToken: true,
+    method: Method.PUT,
+    params
+  })
+}
+
+// 店铺详情
+export function getDetailById (id) {
+  return request({
+    url: `/buyer/store/get/detail/${id}`,
+    needToken: true,
+    method: Method.GET
+  })
+}
+// 店铺分类
+export function getCateById (id) {
+  return request({
+    url: `/buyer/store/label/get/${id}`,
+    needToken: true,
+    method: Method.GET
+  })
+}
+//  店铺入驻协议
+export function agreement () {
+  return request({
+    url: `/buyer/article/get/1349291301250293760`,
+    needToken: true,
+    method: Method.GET
+  })
+}
+
+//  获取当前登录会员的店铺信息
+export function applyStatus () {
+  return request({
+    url: `/buyer/store/apply`,
+    needToken: true,
+    method: Method.GET
+  })
+}
diff --git a/buyer/src/assets/iconfont/iconfont.css b/buyer/src/assets/iconfont/iconfont.css
new file mode 100644
index 00000000..c15273a3
--- /dev/null
+++ b/buyer/src/assets/iconfont/iconfont.css
@@ -0,0 +1,41 @@
+@font-face {font-family: "iconfont";
+  src: url('iconfont.eot?t=1608105836276'); /* IE9 */
+  src: url('iconfont.eot?t=1608105836276#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAdMAAsAAAAADPQAAAb9AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDVgqMUIodATYCJAMcCxAABCAFhG0HWRvmCsiOkUtOluX/f0k8/LOfu+9PRBKZs9KQTCTiSURCgdOJVgN9AiXs+HfTeyS0aaCioU7FjYpvyLyI1mDmsHm7OQtTozMxZGL+ZQfHUj+twfK+7V0qAyvx6fkpajywyKYfbfi8CQ1wyFtgZ1s+k3Q5ARQFiYeWeXV8IOAEdUDBvkYlAcJlgceQA6F3CDk0DegdmIhkJuMqgDf95+MfUoMASDBTIOy6tlchh+IxfHDB9P+fYYCKAGl5LjBHgRQwAtIgHkM91zBTNdI1ZNjv4OqAMgIDPkavy14Pff36g8v//4zBpRBygc1FTIMMLJe0P/+8yAKpKQN2PZsFY5D5ZMAY8UmBcRmfBIyH8kmD8WuXMLdSkKwWDzksrwIDkCRo/QQBN6JJzeJCMQhRSUSkE5tydyKRZ0V0PIpmk95u7FDKZ6zlJd/6SmB/I7K9FmqMG/2WR28ww2IL2XU+cv1Z9b1sfoYtUT1Bi9f70PakZZTdLkJWq2CR7zarFxraZdQvYnWbDLRQWdm1Xr+hf1Hl6q79kXzRYVtQBhF1OE1aLHy9r1GS0pC+nrTZhEHu5RZlJlFmx0ZJWWclVcbFXsYVvuZ93vvscaYjcYdtlg67KIMovwhE2XaXbrakrz97/nCPnzftQyOaEvc2LaOO2CP2WauX7fFnIxYi5SRtYrEAlCQ8+tlSbBWMRXZbr9vClTbeWUuApfimRQDG5b5LzBEbWEXejdUdtyl42Xa+nnPSwl9Kdm3Wm1ndm6gLeVeKTFTF4kav4RN8xZ5ktlZv2FdRWYK311gD7eMjmYR00pC3wG19hl0i3PnGxUvMGzZRIspEoVD+ZGRQGTeDfgOrewsy0FlGL6O3t4ky0CLa53L5Xkv0UWuO+VxWN+uAPe6Ejb/4YnjXdT+aWnbiwrkY85pBff4wm23gVkv5+vD087bc67Y0u2jTBTOHo4eonwNRB7YFGBd5X7IK6Y00bTCxkOlczKIVHKOR9KGLUQkMJHlae+Fxm1cXvdREmawFt7iY5Aru6opfEYWqSGm1T0eMMN14eadAON2ZqAjOCI7zI/OCMsxzc5xNwvozP29Mv+rIizGswEcalrcwQBz068w2xDjyjgIsPZFXPa+Szn88//TVufz3/xdQ6F/kM+cezuXi90ShKlIU9iJzx1FCHj+WU3k9ucGVIZyqlaE+aHJft+rTpBBpW1GDn2peUxP7R5SnhwBpWxjVjCqtWADNhm6YZyMSyq/KXQb5t/j/93dR95APPR+S7CpfhQ3E6tTbcUnDnqZ+uule5rduo4uPfFCIGhs9LbQZBqaP//17nFTitBU/bi+fDo7KCvh+3Scasz/flbcN71rIcGuMIphMJ7/4R48Dq1x0XDnlfo3iuwR2524O3JzHFDmVVu8P3J+7APNrCWoKEHAhc7PBF4lS53qiUl+tsPDpU1FhS5nvt7CUuSBcuPq2jX80Mp/j27Zy4hAYCr42pw0L7vVkYYefujAwp3ZEdR1xMsBzvt98T48Jucxdb7+MFPkLZkrFgB4YpuXI4BpQ0UuTRtRXXlRfll9oDLoDSHFDj3Mw8Fr2/Pb1QXhP+LU1azKSl0QuSc4wbrdYqYYRlzO+fg0r9wIsjwH4CH8qc2G7OLv1hj/zr2CyCMJulmQyVGMb7v7mT91dF/glg2hecea/mzNbxvO9t8mxn073ijgZjjcGxI+Xb4/jMTz8cwasxV5GqvRB72T/4ZLwk1LvnuaAloP5o8flajIuO/mQZGr6mOSQc/Pr2+94cGoKL8/c//WI+xEnaBryRi3oS212LDbM5vCGZFNmAjOsIFjVWW4NrGSnw2iLXiJ1vewAgwDmK7FnmBRgfhw7jZUCzHGnmVgxAOlgrAyTXq+bwWtRyJcW1/xfBOsWHvj9/7Rdr5rrcYTpAY5HLaSWXp3WNCpN8ZUL1lz63UHWho5UI4cGAhzhJkWxB1yVgabH5ek6qaUPAJ23DQlHgZBCCEemsfGQwZIOWYQiKIpTeXSJpyEwKO0EYNFUAhA3O4DBxQnAuLmGxLGPgMnHJ3DgFhiQhOF5SpbI0JBlQxSSYQo5Vzqaq5FpO5WSfRhpFPZSqIa3S4Y45TpFqBgyVBPnpiQme/OVik7FkDL2GDpClTpsmJKrHKLt4PKIqyna27Vc3RBtq0I2LFE9bJguNylJGbZnokzbAaQyQyhIDFM55bikRgtqyGh1UvYfhvR9fy8KKsO1kxgS0/ETFlLYuxoNrJ4rRaLkFMhKTWeqjm0pH2oElVTD0KXEleuH0OrAxUOXQruY0eLShW/USkFmmETqHCmdXEnYTZlWk1i/rmM5T0CR8Eq5YCAM4YiJHJAjIoBxMthhpEIzStNJjFFrlMOlEi3eptDLHUdpJKM10uHMiLBUCwAAAAA=') format('woff2'),
+  url('iconfont.woff?t=1608105836276') format('woff'),
+  url('iconfont.ttf?t=1608105836276') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1608105836276#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-qq:before {
+  content: "\e6e6";
+}
+
+.icon-weixin:before {
+  content: "\e643";
+}
+
+.icon-zhifubao:before {
+  content: "\e601";
+}
+
+.icon-kefu:before {
+  content: "\e673";
+}
+
+.icon-xiayibu:before {
+  content: "\e600";
+}
+
+.icon-weibo:before {
+  content: "\eb0e";
+}
+
diff --git a/buyer/src/assets/iconfont/iconfont.eot b/buyer/src/assets/iconfont/iconfont.eot
new file mode 100644
index 00000000..070ceedc
Binary files /dev/null and b/buyer/src/assets/iconfont/iconfont.eot differ
diff --git a/buyer/src/assets/iconfont/iconfont.js b/buyer/src/assets/iconfont/iconfont.js
new file mode 100644
index 00000000..9e350850
--- /dev/null
+++ b/buyer/src/assets/iconfont/iconfont.js
@@ -0,0 +1 @@
+!function(t){var e,c,o,n,i,l,a='<svg><symbol id="icon-qq" viewBox="0 0 1024 1024"><path d="M512 30.990828c-265.653359 0-480.988706 215.344556-480.988706 481.012242 0 265.661545 215.335347 481.006102 480.988706 481.006102s480.988706-215.344556 480.988706-481.006102C992.987682 246.335385 777.653359 30.990828 512 30.990828L512 30.990828zM776.822434 661.914358c-12.421914 11.596106-33.748638-1.032516-54.248531-29.399587-8.900717 24.019043-20.496823 46.170552-33.95637 66.051345 28.987195 10.352789 47.625694 26.504654 47.625694 44.725644 0 31.472805-55.698556 56.941873-124.443243 56.941873-40.790008 0-76.818573-8.898671-99.593276-22.776749-22.564925 13.877055-58.799174 22.776749-99.590206 22.776749-68.744687 0-124.443243-25.469068-124.443243-56.941873 0-18.014282 18.637476-34.372855 47.625694-44.725644-13.666254-19.8767-25.055652-42.033325-33.95944-66.051345-20.4958 28.15627-41.821501 40.996716-54.248531 29.399587-16.977673-15.940041-10.555403-72.262814 14.70184-125.687584 5.799076-12.215206 12.009522-23.188118 18.427698-32.716122 3.518127-155.296949 105.804744-279.9469 231.280504-279.9469l0.413416 0c125.474736 0 227.762377 124.443243 231.280504 279.9469 6.417153 9.526981 12.633738 20.500916 18.426675 32.716122C787.176247 589.651544 793.805224 645.974317 776.822434 661.914358L776.822434 661.914358zM776.822434 661.914358"  ></path></symbol><symbol id="icon-weixin" viewBox="0 0 1024 1024"><path d="M579.6 511.6c-11.7 0-23.4 10.8-23.4 24.2 0 10.8 11.7 21.7 23.4 21.7 17.5 0 30-10.8 30-21.7 0-13.4-12.5-24.2-30-24.2M502.8 399c18.4 0 30-11.7 30-29.2 0-18.4-11.7-29.2-30-29.2-17.5 0-34.2 10.8-34.2 29.2 0 17.5 16.7 29.2 34.2 29.2M512 0C229.2 0 0 229.2 0 512s229.2 512 512 512 512-229.2 512-512S794.8 0 512 0m-96.8 641.7c-30.9 0-53.4-5-82.6-13.3l-84.3 42.5 24.2-71.7c-59.2-41.7-94.3-94.3-94.3-158.5 0-113.5 106.8-200.2 236.9-200.2 115.1 0 217.7 68.4 237.7 165.2-8.3-1.7-15.9-2.5-22.5-2.5-113.5 0-201 85.1-201 187.7 0 17.5 2.5 33.4 6.7 50.1-6.6 0.7-14.1 0.7-20.8 0.7m347.9 81.8l16.7 60.1-63.4-35.9c-24.2 5-47.5 12.5-71.7 12.5-111.8 0-200.2-76.7-200.2-171.8s88.4-171.8 200.2-171.8c105.9 0 201 76.7 201 171.8 0 53.3-35.9 100.9-82.6 135.1M337.7 340.6c-17.5 0-35.9 10.8-35.9 29.2 0 17.5 18.4 29.2 35.9 29.2 16.7 0 30-11.7 30-29.2 0-18.4-13.4-29.2-30-29.2m372.8 171c-12.5 0-23.4 10.8-23.4 24.2 0 10.8 10.8 21.7 23.4 21.7 16.7 0 29.2-10.8 29.2-21.7 0-13.4-12.5-24.2-29.2-24.2m0 0z"  ></path></symbol><symbol id="icon-zhifubao" viewBox="0 0 1024 1024"><path d="M264.504 568.721c-10.624 8.55-22.01 21.032-25.317 36.9-4.5 21.68-0.94 48.815 19.975 70.103 25.338 25.806 63.842 32.869 80.473 34.083 45.176 3.267 93.326-19.136 129.619-44.687 14.224-10.038 38.583-30.19 61.866-61.279-52.18-26.94-117.314-56.74-186.946-53.824-35.57 1.487-61.044 8.863-79.67 18.704z m661.692 119.131C949.223 633.794 962 574.374 962 512c0-248.126-201.854-450-450-450S62 263.874 62 512c0 248.146 201.854 450 450 450 149.752 0 282.56-73.585 364.422-186.437-77.341-38.445-204.81-101.72-283.324-140.009-37.468 42.711-92.857 85.52-155.426 104.146-39.307 11.68-74.74 16.141-111.796 8.57-36.685-7.514-63.704-24.692-79.454-41.91-8.022-8.784-17.237-19.956-23.91-33.24a62.622 62.622 0 0 0 1.057 2.68s-3.834-6.613-6.769-17.139a75.58 75.58 0 0 1-2.936-15.946 82.193 82.193 0 0 1-0.175-11.465c-0.333-6.77-0.058-13.872 1.467-21.15 3.679-17.785 11.27-38.505 30.913-57.737 43.122-42.222 100.879-44.491 130.794-44.315 44.315 0.254 121.324 19.644 186.163 42.574 17.961-38.25 29.484-79.162 36.92-106.436H330.337v-29.151h138.444V356.73H301.185v-29.153H468.78v-58.284c0-8.003 1.584-14.576 14.575-14.576h65.584v72.86h182.19v29.153H548.94v58.304h145.74s-14.634 81.587-60.398 162c101.564 36.274 244.449 92.152 291.914 110.817z" fill="#666666" ></path></symbol><symbol id="icon-kefu" viewBox="0 0 1024 1024"><path d="M870.1 562.4v-25.5c2-116.5-32.2-214.5-99.6-284-32.2-33.2-71-58.2-116-75.6-7.2-62.8-74.6-112.4-156.8-112.4-82.2 0-150.2 49.5-156.8 112.4-45 17.4-83.8 42.4-116 75.6-67.4 69.5-101.7 167-99.6 283.5v31.2c-17.4 17.9-31.2 44.4-20.9 82.2 7.7 28.1 28.1 48.5 53.1 57.7 12.8 8.2 27.6 12.8 43.9 12.8 32.2 141 148.1 237 299.9 237 151.7 0 267.7-96 299.9-237.5 1 0 2 0.5 3.1 0.5 19.9 0 38.3-7.2 53.1-18.9 18.9-10.7 33.7-29.1 39.8-52.1 10.7-41-7.2-69.1-27.1-86.9z m-88.9 77.1c0 18.9-1.5 36.8-4.1 54.1-49.5 79.7-131.3 131.8-232.9 143-7.7-10.2-23-16.9-40.9-16.9-25.5 0-46 13.8-46 31.2 0 16.9 20.4 31.2 46 31.2 23 0 41.4-11.2 45.5-26.1 32.7-3.6 63.9-11.7 93.5-23.5 41.9-16.9 78.7-41.9 109.8-73.6 5.1-5.1 9.7-10.2 14.3-15.8-36.8 113-135.4 185.5-263.6 185.5h-1c-165 0-279.9-119-279.9-289.1l-0.5-16.3c0-7.2 1-26.6 2-45 68.5-25 130.3-120.6 155.3-164.5 23 31.2 75.6 91.4 156.3 122.6 30.1 11.7 60.8 17.9 90.9 24.5 59.8 12.8 116.5 25 154.8 75.1l1.5 1.5-1 2.1z m0 0"  ></path></symbol><symbol id="icon-xiayibu" viewBox="0 0 1025 1024"><path d="M1024.950857 512c0-2.706286-1.097143-5.193143-1.536-7.826286-0.585143-3.145143-0.658286-6.363429-1.901714-9.362285l-0.146286-0.365715c-1.682286-3.949714-4.388571-7.314286-7.021714-10.605714-1.024-1.316571-1.462857-2.925714-2.706286-4.096 0 0-0.146286 0-0.146286-0.146286l-241.590857-240.274285a45.714286 45.714286 0 0 0-64.365714 64.877714l162.889143 162.084571H46.665143a45.714286 45.714286 0 1 0 0 91.428572h821.76L705.536 719.798857a45.714286 45.714286 0 1 0 64.365714 64.877714l241.517715-240.274285 0.219428-0.146286c1.170286-1.243429 1.682286-2.779429 2.706286-4.096 2.633143-3.291429 5.339429-6.582857 7.021714-10.605714l0.146286-0.365715c1.243429-2.925714 1.316571-6.217143 1.901714-9.362285 0.438857-2.633143 1.462857-5.12 1.462857-7.753143V512c0-0.073143 0 0 0 0z" fill="#333333" ></path></symbol><symbol id="icon-weibo" viewBox="0 0 1024 1024"><path d="M413.422 603.35c-20.053 0-38.503 16.509-38.813 34.706-0.253 15.525 12.797 27.338 30.291 27.338 20.813 0.028 38.222-15.638 38.362-34.481 0.141-16.059-12.403-27.563-29.841-27.563zM463.316 589.513c-5.962 2.925-11.7 7.228-15.806 12.431-0.872 1.125 5.231 7.763 10.181 14.878 6.356-6.975 12.094-10.997 14.203-16.425 0.928-2.334-7.594-11.391-8.578-10.884z"  ></path><path d="M589.259 510.622c-9.675-6.047-20.081-11.109-30.712-15.412-35.578-14.231-72.9-18.45-110.841-15.131-57.375 4.978-110.362 21.881-151.566 64.434-47.784 49.303-41.316 111.712 14.934 150.834 38.081 26.438 81.309 35.522 126.984 34.425 8.297 0 16.622 0.647 24.863-0.113 52.003-4.978 99.9-20.756 139.584-55.941 57.994-51.328 52.172-122.006-13.247-163.097z m-64.35 144.928c-19.744 29.925-54.703 48.094-92.672 48.291-47.869 0.309-83.784-26.578-90.141-68.4-1.406-8.55-1.013-17.944 0.928-26.325 9.647-41.034 38.053-63.956 76.725-74.306 38.194-10.125 73.716-3.516 101.503 26.831 23.006 25.116 23.934 63.394 3.656 93.909z"  ></path><path d="M512.028 62C263.487 62 62 263.487 62 512s201.487 450 450 450c248.512 0 450-201.487 450-450 0-248.512-201.459-450-449.972-450z m214.594 584.353c-38.447 59.147-97.509 88.481-163.491 104.653-31.922 7.875-65.25 10.294-82.575 12.938-81.816-2.025-145.097-14.119-202.162-49.584-71.916-44.691-92.869-111.656-55.266-187.594 40.387-81.45 103.219-141.694 185.681-180.422 15.3-7.172 32.709-11.25 49.5-13.331 34.594-4.303 54.787 15.328 53.916 50.147-0.197 7.622-1.913 15.131-2.362 22.809-0.337 6.553 0.141 13.219 0.309 19.8 6.722-1.097 13.5-1.8 20.081-3.263 26.663-5.709 53.044-15.244 79.903-16.678 46.631-2.475 67.528 25.763 53.353 70.059-6.103 18.872-1.547 25.228 16.088 31.556 66.319 23.906 85.416 79.903 47.025 138.909z m-34.791-248.316c-10.969-13.95-35.859-17.184-43.734-17.269-11.644-0.084-21.037-9.619-20.925-21.234 0.084-11.588 9.506-20.897 21.037-20.897h0.169c5.147 0 51.3 1.322 76.556 33.328 10.013 12.684 20.278 35.241 12.15 70.341-2.25 9.788-10.941 16.369-20.531 16.369a19.75 19.75 0 0 1-4.725-0.591c-11.363-2.616-18.422-13.95-15.806-25.256 3.544-15.356 2.166-26.747-4.191-34.791zM815.834 467c-1.659 10.35-10.575 17.831-20.813 17.831-1.041 0-2.194-0.141-3.291-0.309-11.475-1.772-19.322-12.572-17.55-24.075 7.819-49.753-0.141-88.453-23.766-114.891-41.119-46.069-116.494-43.341-117.253-43.341-11.756 0.478-21.487-8.522-21.994-20.109-0.478-11.616 8.578-21.459 20.166-21.994 3.909-0.141 96.188-3.375 150.525 57.347 32.4 36.366 43.819 86.681 33.975 149.541z"  ></path></symbol></svg>',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function s(){i||(i=!0,o())}e=function(){var t,e,c,o;(o=document.createElement("div")).innerHTML=a,a=null,(c=o.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(e=document.body).firstChild?(o=t,(c=e.firstChild).parentNode.insertBefore(o,c)):e.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,n=t.document,i=!1,(l=function(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}s()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,s())})}(window);
\ No newline at end of file
diff --git a/buyer/src/assets/iconfont/iconfont.json b/buyer/src/assets/iconfont/iconfont.json
new file mode 100644
index 00000000..df039ece
--- /dev/null
+++ b/buyer/src/assets/iconfont/iconfont.json
@@ -0,0 +1,51 @@
+{
+  "id": "2274088",
+  "name": "lili shop",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "829012",
+      "name": "QQ",
+      "font_class": "qq",
+      "unicode": "e6e6",
+      "unicode_decimal": 59110
+    },
+    {
+      "icon_id": "2450774",
+      "name": "微信",
+      "font_class": "weixin",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "7010369",
+      "name": "支付宝",
+      "font_class": "zhifubao",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "10615183",
+      "name": "服务评价-客服",
+      "font_class": "kefu",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "13090705",
+      "name": "下一步",
+      "font_class": "xiayibu",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "14510226",
+      "name": "微博",
+      "font_class": "weibo",
+      "unicode": "eb0e",
+      "unicode_decimal": 60174
+    }
+  ]
+}
diff --git a/buyer/src/assets/iconfont/iconfont.svg b/buyer/src/assets/iconfont/iconfont.svg
new file mode 100644
index 00000000..5355dc73
--- /dev/null
+++ b/buyer/src/assets/iconfont/iconfont.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="qq" unicode="&#59110;" d="M512 865.009172c-265.653359 0-480.988706-215.344556-480.988706-481.012242 0-265.661545 215.335347-481.006102 480.988706-481.006102s480.988706 215.344556 480.988706 481.006102C992.987682 649.664615 777.653359 865.009172 512 865.009172L512 865.009172zM776.822434 234.085642c-12.421914-11.596106-33.748638 1.032516-54.248531 29.399587-8.900717-24.019043-20.496823-46.170552-33.95637-66.051345 28.987195-10.352789 47.625694-26.504654 47.625694-44.725644 0-31.472805-55.698556-56.941873-124.443243-56.941873-40.790008 0-76.818573 8.898671-99.593276 22.776749-22.564925-13.877055-58.799174-22.776749-99.590206-22.776749-68.744687 0-124.443243 25.469068-124.443243 56.941873 0 18.014282 18.637476 34.372855 47.625694 44.725644-13.666254 19.8767-25.055652 42.033325-33.95944 66.051345-20.4958-28.15627-41.821501-40.996716-54.248531-29.399587-16.977673 15.940041-10.555403 72.262814 14.70184 125.687584 5.799076 12.215206 12.009522 23.188118 18.427698 32.716122 3.518127 155.296949 105.804744 279.9469 231.280504 279.9469l0.413416 0c125.474736 0 227.762377-124.443243 231.280504-279.9469 6.417153-9.526981 12.633738-20.500916 18.426675-32.716122C787.176247 306.348456 793.805224 250.025683 776.822434 234.085642L776.822434 234.085642zM776.822434 234.085642"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="weixin" unicode="&#58947;" d="M579.6 384.4c-11.7 0-23.4-10.8-23.4-24.2 0-10.8 11.7-21.7 23.4-21.7 17.5 0 30 10.8 30 21.7 0 13.4-12.5 24.2-30 24.2M502.8 497c18.4 0 30 11.7 30 29.2 0 18.4-11.7 29.2-30 29.2-17.5 0-34.2-10.8-34.2-29.2 0-17.5 16.7-29.2 34.2-29.2M512 896C229.2 896 0 666.8 0 384s229.2-512 512-512 512 229.2 512 512S794.8 896 512 896m-96.8-641.7c-30.9 0-53.4 5-82.6 13.3l-84.3-42.5 24.2 71.7c-59.2 41.7-94.3 94.3-94.3 158.5 0 113.5 106.8 200.2 236.9 200.2 115.1 0 217.7-68.4 237.7-165.2-8.3 1.7-15.9 2.5-22.5 2.5-113.5 0-201-85.1-201-187.7 0-17.5 2.5-33.4 6.7-50.1-6.6-0.7-14.1-0.7-20.8-0.7m347.9-81.8l16.7-60.1-63.4 35.9c-24.2-5-47.5-12.5-71.7-12.5-111.8 0-200.2 76.7-200.2 171.8s88.4 171.8 200.2 171.8c105.9 0 201-76.7 201-171.8 0-53.3-35.9-100.9-82.6-135.1M337.7 555.4c-17.5 0-35.9-10.8-35.9-29.2 0-17.5 18.4-29.2 35.9-29.2 16.7 0 30 11.7 30 29.2 0 18.4-13.4 29.2-30 29.2m372.8-171c-12.5 0-23.4-10.8-23.4-24.2 0-10.8 10.8-21.7 23.4-21.7 16.7 0 29.2 10.8 29.2 21.7 0 13.4-12.5 24.2-29.2 24.2m0 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhifubao" unicode="&#58881;" d="M264.504 327.279c-10.624-8.55-22.01-21.032-25.317-36.9-4.5-21.68-0.94-48.815 19.975-70.103 25.338-25.806 63.842-32.869 80.473-34.083 45.176-3.267 93.326 19.136 129.619 44.687 14.224 10.038 38.583 30.19 61.866 61.279-52.18 26.94-117.314 56.74-186.946 53.824-35.57-1.487-61.044-8.863-79.67-18.704z m661.692-119.131C949.223 262.206 962 321.626 962 384c0 248.126-201.854 450-450 450S62 632.126 62 384c0-248.146 201.854-450 450-450 149.752 0 282.56 73.585 364.422 186.437-77.341 38.445-204.81 101.72-283.324 140.009-37.468-42.711-92.857-85.52-155.426-104.146-39.307-11.68-74.74-16.141-111.796-8.57-36.685 7.514-63.704 24.692-79.454 41.91-8.022 8.784-17.237 19.956-23.91 33.24a62.622 62.622 0 0 1 1.057-2.68s-3.834 6.613-6.769 17.139a75.58 75.58 0 0 0-2.936 15.946 82.193 82.193 0 0 0-0.175 11.465c-0.333 6.77-0.058 13.872 1.467 21.15 3.679 17.785 11.27 38.505 30.913 57.737 43.122 42.222 100.879 44.491 130.794 44.315 44.315-0.254 121.324-19.644 186.163-42.574 17.961 38.25 29.484 79.162 36.92 106.436H330.337v29.151h138.444V539.27H301.185v29.153H468.78v58.284c0 8.003 1.584 14.576 14.575 14.576h65.584v-72.86h182.19v-29.153H548.94v-58.304h145.74s-14.634-81.587-60.398-162c101.564-36.274 244.449-92.152 291.914-110.817z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="kefu" unicode="&#58995;" d="M870.1 333.6v25.5c2 116.5-32.2 214.5-99.6 284-32.2 33.2-71 58.2-116 75.6-7.2 62.8-74.6 112.4-156.8 112.4-82.2 0-150.2-49.5-156.8-112.4-45-17.4-83.8-42.4-116-75.6-67.4-69.5-101.7-167-99.6-283.5v-31.2c-17.4-17.9-31.2-44.4-20.9-82.2 7.7-28.1 28.1-48.5 53.1-57.7 12.8-8.2 27.6-12.8 43.9-12.8 32.2-141 148.1-237 299.9-237 151.7 0 267.7 96 299.9 237.5 1 0 2-0.5 3.1-0.5 19.9 0 38.3 7.2 53.1 18.9 18.9 10.7 33.7 29.1 39.8 52.1 10.7 41-7.2 69.1-27.1 86.9z m-88.9-77.1c0-18.9-1.5-36.8-4.1-54.1-49.5-79.7-131.3-131.8-232.9-143-7.7 10.2-23 16.9-40.9 16.9-25.5 0-46-13.8-46-31.2 0-16.9 20.4-31.2 46-31.2 23 0 41.4 11.2 45.5 26.1 32.7 3.6 63.9 11.7 93.5 23.5 41.9 16.9 78.7 41.9 109.8 73.6 5.1 5.1 9.7 10.2 14.3 15.8-36.8-113-135.4-185.5-263.6-185.5h-1c-165 0-279.9 119-279.9 289.1l-0.5 16.3c0 7.2 1 26.6 2 45 68.5 25 130.3 120.6 155.3 164.5 23-31.2 75.6-91.4 156.3-122.6 30.1-11.7 60.8-17.9 90.9-24.5 59.8-12.8 116.5-25 154.8-75.1l1.5-1.5-1-2.1z m0 0"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayibu" unicode="&#58880;" d="M1024.950857 384c0 2.706286-1.097143 5.193143-1.536 7.826286-0.585143 3.145143-0.658286 6.363429-1.901714 9.362285l-0.146286 0.365715c-1.682286 3.949714-4.388571 7.314286-7.021714 10.605714-1.024 1.316571-1.462857 2.925714-2.706286 4.096 0 0-0.146286 0-0.146286 0.146286l-241.590857 240.274285a45.714286 45.714286 0 0 1-64.365714-64.877714l162.889143-162.084571H46.665143a45.714286 45.714286 0 1 1 0-91.428572h821.76L705.536 176.201143a45.714286 45.714286 0 1 1 64.365714-64.877714l241.517715 240.274285 0.219428 0.146286c1.170286 1.243429 1.682286 2.779429 2.706286 4.096 2.633143 3.291429 5.339429 6.582857 7.021714 10.605714l0.146286 0.365715c1.243429 2.925714 1.316571 6.217143 1.901714 9.362285 0.438857 2.633143 1.462857 5.12 1.462857 7.753143V384c0 0.073143 0 0 0 0z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="weibo" unicode="&#60174;" d="M413.422 292.65c-20.053 0-38.503-16.509-38.813-34.706-0.253-15.525 12.797-27.338 30.291-27.338 20.813-0.028 38.222 15.638 38.362 34.481 0.141 16.059-12.403 27.563-29.841 27.563zM463.316 306.487c-5.962-2.925-11.7-7.228-15.806-12.431-0.872-1.125 5.231-7.763 10.181-14.878 6.356 6.975 12.094 10.997 14.203 16.425 0.928 2.334-7.594 11.391-8.578 10.884zM589.259 385.378c-9.675 6.047-20.081 11.109-30.712 15.412-35.578 14.231-72.9 18.45-110.841 15.131-57.375-4.978-110.362-21.881-151.566-64.434-47.784-49.303-41.316-111.712 14.934-150.834 38.081-26.438 81.309-35.522 126.984-34.425 8.297 0 16.622-0.647 24.863 0.113 52.003 4.978 99.9 20.756 139.584 55.941 57.994 51.328 52.172 122.006-13.247 163.097z m-64.35-144.928c-19.744-29.925-54.703-48.094-92.672-48.291-47.869-0.309-83.784 26.578-90.141 68.4-1.406 8.55-1.013 17.944 0.928 26.325 9.647 41.034 38.053 63.956 76.725 74.306 38.194 10.125 73.716 3.516 101.503-26.831 23.006-25.116 23.934-63.394 3.656-93.909zM512.028 834C263.487 834 62 632.513 62 384s201.487-450 450-450c248.512 0 450 201.487 450 450 0 248.512-201.459 450-449.972 450z m214.594-584.353c-38.447-59.147-97.509-88.481-163.491-104.653-31.922-7.875-65.25-10.294-82.575-12.938-81.816 2.025-145.097 14.119-202.162 49.584-71.916 44.691-92.869 111.656-55.266 187.594 40.387 81.45 103.219 141.694 185.681 180.422 15.3 7.172 32.709 11.25 49.5 13.331 34.594 4.303 54.787-15.328 53.916-50.147-0.197-7.622-1.913-15.131-2.362-22.809-0.337-6.553 0.141-13.219 0.309-19.8 6.722 1.097 13.5 1.8 20.081 3.263 26.663 5.709 53.044 15.244 79.903 16.678 46.631 2.475 67.528-25.763 53.353-70.059-6.103-18.872-1.547-25.228 16.088-31.556 66.319-23.906 85.416-79.903 47.025-138.909z m-34.791 248.316c-10.969 13.95-35.859 17.184-43.734 17.269-11.644 0.084-21.037 9.619-20.925 21.234 0.084 11.588 9.506 20.897 21.037 20.897h0.169c5.147 0 51.3-1.322 76.556-33.328 10.013-12.684 20.278-35.241 12.15-70.341-2.25-9.788-10.941-16.369-20.531-16.369a19.75 19.75 0 0 0-4.725 0.591c-11.363 2.616-18.422 13.95-15.806 25.256 3.544 15.356 2.166 26.747-4.191 34.791zM815.834 429c-1.659-10.35-10.575-17.831-20.813-17.831-1.041 0-2.194 0.141-3.291 0.309-11.475 1.772-19.322 12.572-17.55 24.075 7.819 49.753-0.141 88.453-23.766 114.891-41.119 46.069-116.494 43.341-117.253 43.341-11.756-0.478-21.487 8.522-21.994 20.109-0.478 11.616 8.578 21.459 20.166 21.994 3.909 0.141 96.188 3.375 150.525-57.347 32.4-36.366 43.819-86.681 33.975-149.541z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/buyer/src/assets/iconfont/iconfont.ttf b/buyer/src/assets/iconfont/iconfont.ttf
new file mode 100644
index 00000000..300049b3
Binary files /dev/null and b/buyer/src/assets/iconfont/iconfont.ttf differ
diff --git a/buyer/src/assets/iconfont/iconfont.woff b/buyer/src/assets/iconfont/iconfont.woff
new file mode 100644
index 00000000..45836ec6
Binary files /dev/null and b/buyer/src/assets/iconfont/iconfont.woff differ
diff --git a/buyer/src/assets/iconfont/iconfont.woff2 b/buyer/src/assets/iconfont/iconfont.woff2
new file mode 100644
index 00000000..887e2f28
Binary files /dev/null and b/buyer/src/assets/iconfont/iconfont.woff2 differ
diff --git a/buyer/src/assets/images/R168dc76973e0ae1cb3f6235b5a8cc0da.png b/buyer/src/assets/images/R168dc76973e0ae1cb3f6235b5a8cc0da.png
new file mode 100644
index 00000000..f80f50c9
Binary files /dev/null and b/buyer/src/assets/images/R168dc76973e0ae1cb3f6235b5a8cc0da.png differ
diff --git a/buyer/src/assets/images/arrow-left.png b/buyer/src/assets/images/arrow-left.png
new file mode 100644
index 00000000..fb9701dd
Binary files /dev/null and b/buyer/src/assets/images/arrow-left.png differ
diff --git a/buyer/src/assets/images/cart-coupon-icons02.png b/buyer/src/assets/images/cart-coupon-icons02.png
new file mode 100644
index 00000000..aadc5eaf
Binary files /dev/null and b/buyer/src/assets/images/cart-coupon-icons02.png differ
diff --git a/buyer/src/assets/images/empty.png b/buyer/src/assets/images/empty.png
new file mode 100644
index 00000000..fa5d46e9
Binary files /dev/null and b/buyer/src/assets/images/empty.png differ
diff --git a/buyer/src/assets/images/feedback.png b/buyer/src/assets/images/feedback.png
new file mode 100644
index 00000000..8eb42bcd
Binary files /dev/null and b/buyer/src/assets/images/feedback.png differ
diff --git a/buyer/src/assets/images/festival_icon.png b/buyer/src/assets/images/festival_icon.png
new file mode 100644
index 00000000..3a30a87e
Binary files /dev/null and b/buyer/src/assets/images/festival_icon.png differ
diff --git a/buyer/src/assets/images/footer/ico_service.png b/buyer/src/assets/images/footer/ico_service.png
new file mode 100644
index 00000000..2cef1f76
Binary files /dev/null and b/buyer/src/assets/images/footer/ico_service.png differ
diff --git a/buyer/src/assets/images/geted.png b/buyer/src/assets/images/geted.png
new file mode 100644
index 00000000..9bab88c6
Binary files /dev/null and b/buyer/src/assets/images/geted.png differ
diff --git a/buyer/src/assets/images/goodsDetail/price-bg.png b/buyer/src/assets/images/goodsDetail/price-bg.png
new file mode 100644
index 00000000..7e7c8fe7
Binary files /dev/null and b/buyer/src/assets/images/goodsDetail/price-bg.png differ
diff --git a/buyer/src/assets/images/logo.png b/buyer/src/assets/images/logo.png
new file mode 100644
index 00000000..6fba9abe
Binary files /dev/null and b/buyer/src/assets/images/logo.png differ
diff --git a/buyer/src/assets/images/logo1.png b/buyer/src/assets/images/logo1.png
new file mode 100644
index 00000000..9335dee1
Binary files /dev/null and b/buyer/src/assets/images/logo1.png differ
diff --git a/buyer/src/assets/images/pay-success.png b/buyer/src/assets/images/pay-success.png
new file mode 100644
index 00000000..95b0977c
Binary files /dev/null and b/buyer/src/assets/images/pay-success.png differ
diff --git a/buyer/src/assets/images/seckillBg.png b/buyer/src/assets/images/seckillBg.png
new file mode 100644
index 00000000..f630342e
Binary files /dev/null and b/buyer/src/assets/images/seckillBg.png differ
diff --git a/buyer/src/assets/images/small-circle.png b/buyer/src/assets/images/small-circle.png
new file mode 100644
index 00000000..8ea7a24b
Binary files /dev/null and b/buyer/src/assets/images/small-circle.png differ
diff --git a/buyer/src/assets/styles/coupon.scss b/buyer/src/assets/styles/coupon.scss
new file mode 100644
index 00000000..52399f82
--- /dev/null
+++ b/buyer/src/assets/styles/coupon.scss
@@ -0,0 +1,92 @@
+.coupon-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.coupon-item {
+  width: 380px;
+  height: 145px;
+  margin-bottom: 20px;
+  margin-right: 10px;
+  margin-left: 10px;
+  position: relative;
+  border: 1px solid #eee;
+  .c-left {
+    width: 100%;
+    padding: 20px;
+    >div, > p {
+      margin-bottom: 10px;
+    }
+    >div {
+      .price{
+        color: $theme_color;
+        font-size: 20px;
+      }
+      .describe{
+        background-color: #fff4ec;
+        color: $theme_color;
+        padding: 0 5px;
+        margin-left: 10px;
+        font-size: 13px;
+      }
+    }
+    p:nth-of-type(1){
+      font-weight: bold;
+    }
+    p:nth-of-type(2){
+      color: #999;
+    }
+  }
+  b{
+    position: absolute;
+    z-index: 2;
+    top: 0;
+    right: 50px;
+    display: block;
+    width: 3px;
+    height: 100%;
+  }
+  .c-right {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 52px;
+    height: 100%;
+    background-color: $theme_color;
+    color: #fff;
+    font-size: 16px;
+    padding: 20px;
+    &:hover{
+      font-weight: bold;
+    }
+  }
+  i{
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    right: 42px;
+    border: 1px solid #eee;
+    background-color: #fff;
+    border-radius: 20px;
+    &:after{
+      content: '';
+      position: absolute;
+      width: 25px;
+      height: 20px;
+      left: -2px;
+      background-color: #fff;
+
+    }
+  }
+  i.circle-top{
+    top: -10px;
+    &::after{
+      top: -11px;
+    }
+  }
+  i.circle-bottom{
+    bottom: -10px;
+    &::after{
+      bottom: -11px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/buyer/src/assets/styles/global.scss b/buyer/src/assets/styles/global.scss
new file mode 100644
index 00000000..c3497a2c
--- /dev/null
+++ b/buyer/src/assets/styles/global.scss
@@ -0,0 +1,125 @@
+/*
+ * @Author: LMR
+ * @Date: 2020-08-11 10:12:34
+ * @Last Modified by: LMR
+ * @Last Modified time: 2020-08-18 16:00:10
+ */
+
+//引入主题色
+@import "./theme.scss";
+
+.global_color{
+  color: $theme_color;
+}
+.global_background_color{
+  background-color: $theme_color;
+}
+.global_text_left {
+    text-align: left;
+}
+.global_text_right {
+    text-align: right;
+}
+.global_float_left {
+    float: left;
+}
+.global_float_right {
+    float: right;
+}
+.clearfix::after{
+    content: '';
+    display: block;
+    clear: both;
+}
+.width_1200{width: 1200px;}
+.width_800{width: 800px;}
+.width_400{width: 400px;}
+.width_300{width: 300px;}
+.width_200{width: 200px;}
+.width_100{width: 100px;}
+
+.fontsize_12{font-size: 12px;}
+.fontsize_14{font-size: 14px;}
+.fontsize_16{font-size: 16px;}
+.fontsize_18{font-size: 18px;}
+
+.mb_20{margin-bottom: 20px;}
+.mt_20{margin-top: 20px;}
+.ml_20{margin-left: 20px;}
+.mr_20{margin-right: 20px;}
+
+.mb_10{margin-bottom: 10px;}
+.mt_10{margin-top: 10px;}
+.ml_10{margin-left: 10px;}
+.mr_10{margin-right: 10px;}
+
+.pb_20{padding-bottom: 20px;}
+.pt_20{padding-top: 20px;}
+.pl_20{padding-left: 20px;}
+.pr_20{padding-right: 20px;}
+
+.pb_10{padding-bottom: 10px;}
+.pt_10{padding-top: 10px;}
+.pl_10{padding-left: 10px;}
+.pr_10{padding-right: 10px;}
+
+.color999{
+    color: #999;
+}
+
+html,
+body {
+    height: 100%;
+    width: 100%;
+    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    // overflow: hidden;
+    margin: 0;
+    padding: 0;
+
+}
+li{
+    list-style: none;
+}
+.hover-color:hover{
+    color: $theme_color!important;
+    cursor: pointer;
+}
+.hover-pointer{
+    cursor: pointer;
+}
+.center{
+    margin: 0 auto;
+}
+.relative{
+    position: relative;
+}
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+.promotion-decorate{
+    width: 200px;
+    text-align: center;
+    font-size: 25px;
+    position: relative;
+    font-weight: bold;
+    margin: 30px auto 30px;
+    &::before,&::after{
+      content: '';
+      display: inline-block;
+      width: 25px;
+      height: 20px;
+      background-size: 50px 20px;
+      background-repeat: no-repeat;
+      background-position: 0 0;
+      position: absolute;
+      top: 10px;
+      left: -3px;
+    }
+    &::after{
+      background-position: -24px 0;
+      right: -3px;
+      left: auto;
+    }
+  }
\ No newline at end of file
diff --git a/buyer/src/assets/styles/goodsList.scss b/buyer/src/assets/styles/goodsList.scss
new file mode 100644
index 00000000..dc3df752
--- /dev/null
+++ b/buyer/src/assets/styles/goodsList.scss
@@ -0,0 +1,58 @@
+.text-danger {
+  color: $theme_color;
+}
+.seckill-price{
+  margin-right: 5px;
+  font-size: 25px;
+  font-weight: bold;
+}
+.goods-list {
+  display: flex;
+  flex-wrap: wrap;
+  width: 1200px;
+  margin: 0 auto;
+}
+.goods-show-info {
+  width: 235px;
+  padding: 6px;
+  margin: 10px 0px;
+  margin-left: 5px;
+  position: relative;
+  border: 1px solid #fff;
+  cursor: pointer;
+  background-color: #fff;
+}
+.goods-show-info:hover {
+  border: 1px solid #ccc;
+  box-shadow: 0px 0px 15px #ccc;
+}
+.goods-show-price {
+  margin-top: 6px;
+}
+.goods-show-detail {
+  font-size: 12px;
+  margin: 6px 0px;
+}
+.goods-show-num {
+  font-size: 12px;
+  margin-bottom: 6px;
+  color: #666;
+}
+.goods-show-num {
+  font-size: 12px;
+  margin-bottom: 6px;
+  color: #009688;
+}
+.goods-show-num span {
+  color: #005aa0;
+  font-weight: bold;
+}
+.goods-show-seller {
+  font-size: 12px;
+  color: $theme_color;
+}
+.goods-page {
+  margin:10px auto ;
+  text-align: right;
+  width: 1200px;
+}
\ No newline at end of file
diff --git a/buyer/src/assets/styles/theme.less b/buyer/src/assets/styles/theme.less
new file mode 100644
index 00000000..9feafdbb
--- /dev/null
+++ b/buyer/src/assets/styles/theme.less
@@ -0,0 +1,84 @@
+@import '~view-design/src/styles/index.less';
+
+@primary-color: #ed3f14;
+
+
+@table-thead-bg               : #f8f8f9;
+@table-td-stripe-bg           : #f8f8f9;
+@table-td-hover-bg            : #ededed;
+@table-td-highlight-bg        : #ededed;
+
+
+
+//
+//.colorPaletteMixin() {
+//  @functions: ~`(function() {
+//  var hueStep = 2;
+//  var saturationStep = 0.16;
+//  var saturationStep2 = 0.05;
+//  var brightnessStep1 = 0.05;
+//  var brightnessStep2 = 0.15;
+//  var lightColorCount = 5;
+//  var darkColorCount = 4;
+//
+//  var getHue = function(hsv, i, isLight) {
+//    var hue;
+//    if (hsv.h >= 60 && hsv.h <= 240) {
+//      hue = isLight ? hsv.h - hueStep * i : hsv.h + hueStep * i;
+//    } else {
+//      hue = isLight ? hsv.h + hueStep * i : hsv.h - hueStep * i;
+//    }
+//    if (hue < 0) {
+//      hue += 360;
+//    } else if (hue >= 360) {
+//      hue -= 360;
+//    }
+//    return Math.round(hue);
+//  };
+//  var getSaturation = function(hsv, i, isLight) {
+//    var saturation;
+//    if (isLight) {
+//      saturation = hsv.s - saturationStep * i;
+//    } else if (i === darkColorCount) {
+//      saturation = hsv.s + saturationStep;
+//    } else {
+//      saturation = hsv.s + saturationStep2 * i;
+//    }
+//    if (saturation > 1) {
+//      saturation = 1;
+//    }
+//    if (isLight && i === lightColorCount && saturation > 0.1) {
+//      saturation = 0.1;
+//    }
+//    if (saturation < 0.06) {
+//      saturation = 0.06;
+//    }
+//    return Number(saturation.toFixed(2));
+//  };
+//  var getValue = function(hsv, i, isLight) {
+//    var value;
+//    if (isLight) {
+//      value = hsv.v + brightnessStep1 * i;
+//    }else{
+//      value = hsv.v - brightnessStep2 * i
+//    }
+//    if (value > 1) {
+//      value = 1;
+//    }
+//    return Number(value.toFixed(2))
+//  };
+//
+//  this.colorPalette = function(color, index) {
+//    var isLight = index <= 6;
+//    var hsv = tinycolor(color).toHsv();
+//    var i = isLight ? lightColorCount + 1 - index : index - lightColorCount - 1;
+//    return tinycolor({
+//      h: getHue(hsv, i, isLight),
+//      s: getSaturation(hsv, i, isLight),
+//      v: getValue(hsv, i, isLight),
+//    }).toHexString();
+//  };
+//})()`;
+//}
+
+//.colorPaletteMixin();
diff --git a/buyer/src/assets/styles/theme.scss b/buyer/src/assets/styles/theme.scss
new file mode 100644
index 00000000..ea8537fb
--- /dev/null
+++ b/buyer/src/assets/styles/theme.scss
@@ -0,0 +1,114 @@
+/*
+ * @Author: LMR
+ * @Date: 2020-08-14 11:04:12
+ * @Last Modified by: LMR
+ * @Last Modified time: 2020-08-18 14:21:41
+ */
+
+
+// 主题颜色
+
+// 明亮主题颜色
+$primary_color: #2d8cf0;
+$primary_light_color: #0f1011;
+$primary_dark_color: #2b85e4;
+$success_color: #19be6b;
+$warning_color: #ff9900;
+$error_color: #ed3f14;
+$handle-btn-color: #438cde;
+
+$theme_color: #ed3f14;
+
+$border_color: #dddee1;
+$title_color: #8c8c8c;
+$light_title_color: #1c2438;
+$light_content_color: #495060;
+$light_sub_color: #80848f;
+$light_background_color: #f8f8f9;
+$light_white_background_color :#fff;
+// 暗黑主题颜色
+$dark_background_color: #141414;
+$dark_sub_background_color: #1d1d1d; //稍微浅一点的
+$dark_content_color: #d5d5d5;
+
+
+
+/***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
+
+
+// 背景颜色
+@mixin background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+// 辅助背景颜色
+@mixin sub_background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+
+
+@mixin white_background_color() {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $light_white_background_color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_white_background_color;
+  }
+}
+
+
+// 正文颜色
+@mixin content_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_content_color;
+  }
+}
+
+// 辅助颜色
+@mixin sub_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_sub_color;
+  }
+}
+
+// 标题颜色
+@mixin title_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_title_color;
+  }
+}
+
+
diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue
new file mode 100644
index 00000000..3a3653a1
--- /dev/null
+++ b/buyer/src/components/Search.vue
@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <div class="container">
+      <img
+        :src="logoImg"
+        v-if="showLogo"
+        class="logo-img"
+        alt=""
+        @click="$router.push('/')"
+      />
+      <i-input
+        v-model="searchData"
+        size="large"
+        class="search"
+        placeholder="输入你想查找的商品"
+        @keyup.enter.native="search"
+      >
+        <Button v-if="!store"  slot="append" @click="search">搜索</Button>
+      </i-input>
+      <div v-if="store" class="btn-div">
+        <Button class="store-search" type="warning" @click="searchStore">搜本店</Button>
+        <Button class="store-search" type="primary" @click="search">搜全站</Button>
+      </div>
+      <template v-if="showTag">
+        <div style="height:12px" v-if="promotionTags.length === 0"></div>
+        <div v-else>
+          <Tag
+            v-for="(item, index) in promotionTags"
+            :key="index"
+          >
+            <span class="hover-color" @click="selectTags(item)">{{ item }}</span>
+          </Tag>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getLogo} from '@/api/common.js'
+import {hotWords} from '@/api/goods.js'
+export default {
+  name: 'search',
+  props: {
+    showTag: { // 是否展示搜索栏下方热门搜索
+      type: Boolean,
+      default: true
+    },
+    showLogo: { // 是否展示左侧logo
+      type: Boolean,
+      default: true
+    },
+    store: { // 是否为店铺页面
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      searchData: '', // 搜索内容
+      logoImg: '', // pc端展示logo
+      promotionTags: [] // 热门搜索列表
+    };
+  },
+  methods: {
+    selectTags (item) {
+      this.searchData = item;
+      this.search();
+    },
+    search () {
+      this.$router.push({
+        path: '/goodsList',
+        query: { keyword: this.searchData }
+      });
+    },
+    searchStore () {
+      this.$emit('search', this.searchData)
+    }
+  },
+  mounted () {
+    if (!this.Cookies.getItem('logo')) {
+      getLogo().then(res => {
+        if (res.success) {
+          let logoObj = JSON.parse(res.result.settingValue)
+          this.Cookies.setItem('logo', logoObj.buyerSideLogo)
+          this.logoImg = logoObj.buyerSideLogo
+        }
+      })
+    } else {
+      this.logoImg = this.Cookies.getItem('logo')
+    }
+    this.searchData = this.$route.query.keyword
+    hotWords({start: 1, end: 5}).then(res => {
+      if (res.success) this.promotionTags = res.result
+    })
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.container {
+  margin: 30px auto;
+  width: 460px;
+  position: relative;
+}
+.search {
+  margin: 10px 0px 5px 0;
+  /deep/ .ivu-input.ivu-input-large {
+    border: 2px solid $theme_color;
+    font-size: 12px;
+    height: 34px;
+    &:focus {
+      box-shadow: none;
+    }
+  }
+  /deep/ .ivu-input-group-append {
+    border: 1px solid $theme_color;
+    border-left: none;
+    height: 30px;
+    background-color: $theme_color;
+    color: #ffffff;
+    button {
+      font-size: 14px;
+      font-weight: 600;
+      line-height: 1;
+    }
+  }
+}
+.logo-img {
+  position: absolute;
+  left: -360px;
+  top: -9px;
+  width: 150px;
+  cursor: pointer;
+}
+.store-search{
+  padding: 0 9px;
+  border-radius: 0;
+  &:nth-child(2){
+    margin-left: -5px;
+  }
+}
+.btn-div{
+  position: relative;
+  height: 0px;
+  top: -38px;
+  left: 336px;
+}
+</style>
diff --git a/buyer/src/components/addressManage/index.vue b/buyer/src/components/addressManage/index.vue
new file mode 100644
index 00000000..78843e25
--- /dev/null
+++ b/buyer/src/components/addressManage/index.vue
@@ -0,0 +1,173 @@
+<template>
+  <div>
+    <Modal v-model="showAddr" width="800" title="收件人地址">
+      <Form
+        :model="formData"
+        ref="form"
+        label-position="left"
+        :label-width="100"
+        :rules="ruleInline"
+      >
+        <FormItem label="收件人" prop="name">
+          <i-input v-model="formData.name" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="收件地区" prop="address">
+          <i-input
+            v-model="formData.address"
+            disabled
+            style="width: 600px"
+          ></i-input>
+          <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
+        </FormItem>
+        <FormItem label="详细地址" prop="detail">
+          <i-input v-model="formData.detail" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="手机号码" prop="mobile">
+          <i-input v-model="formData.mobile" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="地址别名">
+          <i-input
+            v-model="formData.alias"
+            length
+            :maxlength="4"
+            placeholder="请输入地址别名，例如公司"
+            style="width: 600px"
+          ></i-input>
+        </FormItem>
+        <FormItem label="默认地址">
+          <i-switch v-model="formData.isDefault" />
+        </FormItem>
+      </Form>
+      <div class="mt_20" slot="footer">
+        <Button @click="hide">取消</Button>
+        <Button type="primary" class="mr_10" :loading="loading" @click="save">保存收货地址</Button>
+      </div>
+    </Modal>
+    <lili-map ref="map" @getAddress="getAddress"></lili-map>
+  </div>
+</template>
+
+<script>
+import liliMap from '@/components/map';
+import {
+  newMemberAddress,
+  editMemberAddress,
+  getAddrDetail
+} from '@/api/address';
+export default {
+  name: 'addressManage',
+  props: {
+    id: {
+      defalut: '',
+      type: String
+    }
+  },
+  data () {
+    return {
+      showAddr: false, // 控制模态框显隐
+      formData: { // 表单数据
+        isDefault: false
+      },
+      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'
+          }
+        ]
+      },
+      loading: false, // 提交的加载状态
+      mapMsg: {} // 地图信息
+    };
+  },
+  methods: {
+    save () {
+      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.code === 200) {
+                this.$Message.success('编辑地址成功');
+                this.$emit('change', true);
+                this.hide();
+              }
+            }).catch(() => { this.loading = false; });
+          } else {
+            newMemberAddress(params).then((res) => {
+              this.loading = false;
+              if (res.code === 200) {
+                this.$Message.success('新增地址成功');
+                this.$emit('change', true);
+                this.hide();
+              }
+            }).catch(() => { this.loading = false; });
+          }
+        }
+      });
+    },
+    getAddrById (id) {
+      // 获取地址详情
+      getAddrDetail(id).then((res) => {
+        if (res.code === 200) {
+          console.log(res);
+          const data = res.result;
+          data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');
+          this.formData = data;
+        }
+      });
+    },
+    getAddress (item) {
+      // 获取地图选择信息
+      console.log(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: {
+      immediate: true,
+      handler: function (v) {
+        console.log(v);
+        if (v) {
+          this.getAddrById(v);
+        } else {
+          this.formData = {}
+          this.$refs.form.resetFields();
+        }
+      }
+    }
+  },
+  components: {
+    liliMap
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.add-box {
+  margin: 40px 0;
+}
+</style>
diff --git a/buyer/src/components/advertising/FixedTop.vue b/buyer/src/components/advertising/FixedTop.vue
new file mode 100644
index 00000000..0a2d686d
--- /dev/null
+++ b/buyer/src/components/advertising/FixedTop.vue
@@ -0,0 +1,42 @@
+<template>
+  <!-- 头部广告 -->
+  <div class="advertising" v-if="show" :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" />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    data: { // 传入的广告信息
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      show: true // 是否显示头部广告
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.advertising {
+  height: 80px;
+  width: 100%;
+  background-color: $theme_color;
+  text-align: center;
+  overflow: hidden;
+  position: relative;
+  > img {
+    width: 1200px;
+    height: 100%;
+  }
+  *:nth-child(2){
+    position: relative;
+    right: 36px;
+    top: -57px;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/buyer/src/components/advertising/README.md b/buyer/src/components/advertising/README.md
new file mode 100644
index 00000000..d59fe4ef
--- /dev/null
+++ b/buyer/src/components/advertising/README.md
@@ -0,0 +1,2 @@
+# 广告
+## FixedTop 顶部广告
\ No newline at end of file
diff --git a/buyer/src/components/card/README.md b/buyer/src/components/card/README.md
new file mode 100644
index 00000000..1a1557e9
--- /dev/null
+++ b/buyer/src/components/card/README.md
@@ -0,0 +1,12 @@
+## 自定义card -
+
+### 参数
+>_Title 卡片头部
+
+>_More 右侧栏显示内容 -- 默认不显示
+
+>_Src 右侧内容显示之后的src路径
+
+>_Tabs 传入数组  --  默认无
+
+>_Change 点击数组返回的index
diff --git a/buyer/src/components/card/index.vue b/buyer/src/components/card/index.vue
new file mode 100644
index 00000000..397eb531
--- /dev/null
+++ b/buyer/src/components/card/index.vue
@@ -0,0 +1,149 @@
+<template>
+  <Card class="_Card" :bordered="false" :dis-hover="true">
+    <div slot="title" class="cardTitle">
+      <span :style="{fontSize:`${_Size}px`}">{{_Title}}</span>
+
+      <div v-if="_Tabs" class="cardTabs">
+        <div @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 slot="extra" class="cardExtra" v-if="_More" @click="callBack()">
+      {{_More}}
+    </div>
+    <div>
+
+    </div>
+  </Card>
+</template>
+
+<script>
+export default {
+  name: 'index',
+  props:
+    {
+      _Tabs: { // 可点击的tab栏
+        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栏下标
+    };
+  },
+  mounted () {},
+  methods: {
+    // 点击右侧的回调
+    callBack () {
+      let _this = this;
+      if (this._Src !== '' || this._Src != null) {
+        this.$router.push({
+          path: _this._Src
+        });
+      }
+    },
+    // 点击tab的回调
+    tabsChange (index) {
+    //  处理并返回index
+      this.isActive = index;
+      this.$emit('_Change', index);
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+  .cardTitle {
+    display: flex;
+    cursor: pointer;
+  }
+  .active{
+    color: $theme_color;
+    position: relative;
+    &::before{
+      content: '';
+      position: absolute;
+      width: 100%;
+      height: 3px;
+      bottom: 0;
+      left: 0;
+      background: $theme_color;
+    }
+  }
+
+  .cardTabs {
+    display: flex;
+    padding: 0 12px;
+
+    > .cardTabsItem {
+      padding: 0 12px;
+
+    }
+
+    > .cardTabsItem:hover {
+
+      color: $theme_color;
+    }
+  }
+
+  /deep/ .ivu-card, .ivu-card-head, ._Card {
+    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 {
+    padding: 0 !important;
+    display: none;
+  }
+
+</style>
diff --git a/buyer/src/components/coupon/Coupon.vue b/buyer/src/components/coupon/Coupon.vue
new file mode 100644
index 00000000..a54e8ead
--- /dev/null
+++ b/buyer/src/components/coupon/Coupon.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="wrapper">
+    <empty v-if="list.length==0" />
+    <ul class="coupon-list" v-else>
+      <li v-for="(item, index) in list" class="coupon-item" :key="index">
+        <div class="c-left">
+          <div>
+            <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
+            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+            <span class="describe">满{{item.consumeThreshold}}元可用</span>
+          </div>
+          <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
+          <p>有效期：{{item.endTime}}</p>
+        </div>
+        <b></b>
+        <a class="c-right" @click="go(item)">立即使用</a>
+        <i class="circle-top"></i>
+        <i class="circle-bottom"></i>
+      </li>
+    </ul>
+    <Page :total="total" @on-change="changePageNum"
+      v-if="list.length && total > params.pageNumber"
+      class="pageration"
+      @on-page-size-change="changePageSize"
+      :page-size="params.pageSize"
+      show-sizer>
+    </Page>
+    <Spin v-if="loading" fix></Spin>
+  </div>
+</template>
+
+<script>
+import { memberCouponList } from '@/api/member.js';
+export default {
+  data () {
+    return {
+      loading: false, // 列表加载状态
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10
+      },
+      total: 0, // 优惠券总数
+      list: [] // 优惠券列表
+    };
+  },
+  methods: {
+    getList () {
+      this.loading = true
+      memberCouponList(this.params).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.list = res.result.records
+          this.total = res.result.total
+        }
+      })
+    },
+
+    go (item) { // 根据使用条件跳转商品列表页面
+      if (item.storeId !== 'platform') {
+        this.$router.push({path: '/merchant', query: {id: item.storeId}})
+      } else {
+        if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
+          this.$router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
+        } else {
+          this.$router.push({path: '/goodsList'})
+        }
+      }
+    },
+
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+
+    useScope (type, storeName) {
+      let shop = '平台';
+      let goods = '全部商品'
+      if (storeName !== 'platform') shop = storeName
+      switch (type) {
+        case 'ALL':
+          goods = '全部商品'
+          break;
+        case 'PORTION_GOODS':
+          goods = '部分商品'
+          break;
+        case 'PORTION_GOODS_CATEGORY':
+          goods = '部分分类商品'
+          break;
+      }
+      return `${shop}${goods}可用`
+    }
+  },
+  mounted () {
+    this.getList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../assets/styles/coupon.scss';
+.pageration{
+    text-align: right;
+}
+</style>
diff --git a/buyer/src/components/drawer/Drawer.vue b/buyer/src/components/drawer/Drawer.vue
new file mode 100644
index 00000000..af4dc3db
--- /dev/null
+++ b/buyer/src/components/drawer/Drawer.vue
@@ -0,0 +1,323 @@
+<template>
+  <div class="content-drawer">
+    <div v-if="title === '购物车'" class="cart-con">
+      <ul>
+        <li v-for="(goods,goodsIndex) in cartList" :key="goodsIndex">
+          <div>
+            <img :src="goods.goodsSku.thumbnail" 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>
+          </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>
+    </div>
+
+    <div v-else-if="title === '我的订单'" class="order-con">
+      <ul>
+        <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"
+              @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>
+        </li>
+      </ul>
+      <Button type="primary" @click="linkTo('/home/MyOrder')" long>查看全部订单</Button>
+    </div>
+
+    <div v-else-if="title === '优惠券'" class="coupon-con">
+      <ul class="coupon-list">
+          <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 === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{coupon.discount}}</span>折</span>
+                <span class="describe">满{{coupon.consumeThreshold}}元可用</span>
+              </div>
+              <p>使用范围：{{useScope(coupon.scopeType, coupon.storeName)}}</p>
+              <p>有效期：{{coupon.endTime}}</p>
+            </div>
+            <b></b>
+            <a class="c-right" @click="receive(coupon)">立即领取</a>
+            <i class="circle-top"></i>
+            <i class="circle-bottom"></i>
+          </li>
+        </ul>
+    </div>
+    <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">
+          <div @click="addToCart(track.id)">加入购物车</div>
+          <p class="global_color">{{track.price | unitPrice('￥')}}</p>
+        </li>
+      </ul>
+      <div class="hover-color" style="text-align:center;" @click="linkTo('/home/MyTracks')">查看更多>></div>
+    </div>
+    <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">
+          <div @click="addToCart(collect.skuId)">加入购物车</div>
+          <span class="del-icon" @click.stop="cancelCollect(collect.skuId)">
+            <Icon type="md-trash" />
+          </span>
+          <p class="global_color">{{collect.price | unitPrice('￥')}}</p>
+        </li>
+      </ul>
+      <div class="hover-color" style="text-align:center;" @click="linkTo('/home/Favorites')">查看更多>></div>
+    </div>
+    <Spin v-if="loading" fix></Spin>
+  </div>
+</template>
+
+<script>
+import {cartGoodsAll, delCartGoods, addCartGoods, cartCount} from '@/api/cart.js'
+import { getOrderList } from '@/api/order';
+import {couponList, receiveCoupon, tracksList, collectList, cancelCollect} from '@/api/member.js'
+export default {
+  name: 'Drawer',
+  props: {
+    title: {
+      default: '',
+      type: String
+    }
+  },
+  watch: {
+    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'
+        }
+      ]
+    };
+  },
+  components: {},
+  mounted () {},
+  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.code === 200) {
+          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.code === 200) {
+          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 })
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../assets/styles/coupon.scss';
+@import './drawer.scss';
+.coupon-item{
+  overflow: hidden;
+  background-color: #fff;
+  height: 120px;
+  .c-left{
+    padding: 15px;
+  }
+  .c-right{
+    width: 38px;
+    padding: 13px;
+    font-size: 14px;
+  }
+  i{
+    right: 30px;
+    background-color: #eee;
+  }
+}
+</style>
diff --git a/buyer/src/components/drawer/Main.vue b/buyer/src/components/drawer/Main.vue
new file mode 100644
index 00000000..c5c32162
--- /dev/null
+++ b/buyer/src/components/drawer/Main.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <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">
+          <Icon size="20" :type="item.icon"/>
+          <p class="barTitle" v-if="item.titleShow"> {{item.title}}</p>
+          <div class="circle" v-if="item.title === '购物车'">
+            {{cartNum < 100 ? cartNum : 99}}
+          </div>
+        </Tooltip>
+      </div>
+
+    </div>
+    <Drawer width="300" class="popup" :title="drawerData.title" :mask="resetConfig.mask" :closable="resetConfig.closable"
+      v-model="handleDrawer">
+      <drawerPage :title="drawerData.title" />
+    </Drawer>
+  </div>
+</template>
+
+<script>
+import Storage from '@/plugins/storage.js';
+import Configuration from './config';
+import drawerPage from './Drawer'
+import {cartCount} from '@/api/cart.js'
+export default {
+  name: 'Main',
+  data () {
+    return {
+      resetConfig: Configuration, // 菜单项
+      handleDrawer: false, // 是否可展开
+      drawerData: '' // 菜单基础数据
+    }
+  },
+  components: {drawerPage},
+  computed: {
+    userInfo () {
+      return Storage.getItem('userInfo');
+    },
+    cartNum () {
+      return this.$store.state.cartNum
+    }
+  },
+  methods: {
+    showCartNum (item) {
+      if (this.userInfo && item.title === '购物车') {
+        this.getCartList()
+      }
+    },
+    clickBar (val) {
+      if (!this.userInfo) {
+        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)
+              }
+            });
+          }
+        });
+      } 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) {
+      let routerUrl = this.$router.resolve({
+        path: path
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    getCartList () { // 获取购物车列表
+      cartCount().then(res => {
+        this.$store.commit('SET_CARTNUM', res.result)
+        this.Cookies.setItem('cartNum', res.result)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .wrapper {
+    background-color: #000!important;
+  }
+  .barItem {
+    text-align: center;
+    padding: 13px 0;
+
+    cursor: pointer;
+    color: #fff;
+    &:hover{
+      background-color: $theme_color;
+      .circle{
+        color: $theme_color;
+        background-color: #fff;
+      }
+    }
+  }
+
+  .barTitle {
+    writing-mode: vertical-lr;
+    letter-spacing: 2px;
+    padding: 4px 0;
+
+  }
+
+  .circle {
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    color: #fff;
+    background: $theme_color;
+  }
+
+  .wrapper {
+    width: 40px;
+    position: fixed;
+    transition: .35s;
+    height: 100%;
+    z-index: 9999;
+    background: $dark_background_color;
+    top: 0;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+  }
+  /deep/.popup .ivu-drawer-body{
+    padding: 0!important;
+    background-color: #eee;
+  }
+  /deep/.popup .ivu-drawer-wrap{
+    z-index: 3001;
+  }
+</style>
diff --git a/buyer/src/components/drawer/README.md b/buyer/src/components/drawer/README.md
new file mode 100644
index 00000000..830d7c94
--- /dev/null
+++ b/buyer/src/components/drawer/README.md
@@ -0,0 +1,42 @@
+# 右侧侧边栏组件
+> 本组件依赖于iview的组件基础上进行封装
+>项目结构
+>* Main  -- 组件用于挂在右侧的横栏
+>* drawer -- 右侧横栏的内容
+>* config -- 用于设置大小
+
+
+#### config设置
+```
+/**
+menuList // 组件的menu
+display //是否显示此menu
+badge //显示徽标数
+titleShow //是否显示title
+*/
+
+//实例代码
+ width : 50, //bar的大小
+ menuList:[
+   {
+      icon
+   }
+ ]
+
+
+```
+
+
+
+> 账户信息
+> 购物车
+> 我的订单
+> 优惠券
+> 我的资产
+> 我的足迹
+> 我的收藏
+> 邮箱订阅
+
+
+## 如何使用
+1.
diff --git a/buyer/src/components/drawer/config.js b/buyer/src/components/drawer/config.js
new file mode 100644
index 00000000..c7dc2e69
--- /dev/null
+++ b/buyer/src/components/drawer/config.js
@@ -0,0 +1,63 @@
+const config = {
+  closable: true, // 是否显示右上角关闭按钮
+  mask: true, // 是否显示遮罩层
+
+  menuList: [{
+    icon: 'md-person', // menu的icon
+    title: '会员中心', // menu的标题
+    titleShow: false,
+    path: '', // menu点击的路径
+    display: false // 是否显示此menu
+  },
+  {
+    icon: 'ios-cart', // menu的icon
+    title: '购物车', // menu的标题
+    path: '', // menu点击的路径
+    display: true, // 是否显示此menu
+    badge: 12,
+    titleShow: true
+  },
+  {
+    icon: 'md-clipboard', // menu的icon
+    title: '我的订单', // menu的标题
+    path: '', // menu点击的路径
+    display: true, // 是否显示此menu
+    badge: '',
+    titleShow: false
+  },
+  {
+    icon: 'md-pricetag', // menu的icon
+    title: '优惠券', // menu的标题
+    path: '', // menu点击的路径
+    display: true, // 是否显示此menu
+    badge: '',
+    titleShow: false
+  },
+  {
+    icon: 'logo-usd', // menu的icon
+    title: '我的资产', // menu的标题
+    path: '', // menu点击的路径
+    display: false, // 是否显示此menu
+    badge: '',
+    titleShow: false
+  },
+  {
+    icon: 'ios-eye', // menu的icon
+    title: '我的足迹', // menu的标题
+    path: '', // menu点击的路径
+    display: true, // 是否显示此menu
+    badge: '',
+    titleShow: false
+  },
+  {
+    icon: 'md-star', // menu的icon
+    title: '我的收藏', // menu的标题
+    path: '', // menu点击的路径
+    display: true, // 是否显示此menu
+    badge: '',
+    titleShow: false
+  }
+  ]
+}
+
+export default config
diff --git a/buyer/src/components/drawer/drawer.scss b/buyer/src/components/drawer/drawer.scss
new file mode 100644
index 00000000..f647a2ab
--- /dev/null
+++ b/buyer/src/components/drawer/drawer.scss
@@ -0,0 +1,130 @@
+.content-drawer {
+  height: 100%;
+  font-size: 12px;
+}
+// 购物车样式
+.cart-con{
+  position: relative;
+  background: #fff;
+  height: 100%;
+  ul>li{
+    font-size: 12px;
+    border-bottom: 1px dashed #999;
+    margin: 0 10px;
+    display: flex;
+    padding: 10px 0;
+    align-items: center;
+    position: relative;
+    p{margin-bottom: 10px;}
+    .del{
+      position: absolute;
+      right: 10px;
+      bottom: 30px;
+    }
+
+    .price {
+      color: $theme_color;
+      span{color: #999;}
+    }
+
+    &:last-child{border: none;}
+  }
+  
+}
+// 订单样式
+.order-con{
+  ul>li {
+    margin: 10px;
+    background-color: #fff;
+    .order-status {
+      display: flex;
+      background-color: #666;
+      border-radius: 3px 3px 0 0;
+      color: #fff;
+      justify-content: space-between;
+      padding: 0 10px;
+    }
+
+    .goods-img {
+      padding-left: 10px;
+      padding-top: 10px;
+      img{
+        border: 1px solid #eee;
+        margin-right: 10px;
+        
+        &:hover{
+          cursor: pointer;
+        }
+      }
+    }
+    
+    .order-handle{
+      display: flex;
+      justify-content: space-between;
+      padding:5px 10px;
+      border-top: 1px solid #eee;
+      span:nth-child(1){
+        color: $theme_color;
+      }
+    }
+  }
+}
+// 优惠券样式
+.coupon-con{
+  margin-top: 10px;
+}
+// 足迹样式
+.tracks-con,.collect-con{
+  ul{
+    display: flex;
+    flex-wrap: wrap;
+    padding: 10px;
+  }
+  li {
+    background-color: #fff;
+    margin: 10px;
+    width: 120px;
+    position: relative;
+    text-align: center;
+    &:hover{
+      div,.del-icon{
+        display: block;
+      }
+
+    }
+
+    img{
+      cursor: pointer;
+    }
+
+    div{
+      display: none;
+      position: absolute;
+      bottom: 18px;
+      width: 100%;
+      background-color: #666;
+      color: #fff;
+      &:hover{
+        background-color: $theme_color;
+        cursor: pointer;
+      }
+    }
+    .del-icon{
+      display: none;
+      font-size: 20px;
+      position: absolute;
+      width: 30px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      right: 0;
+      top: 0;
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+// 我的收藏样式
+.collect-con{
+
+}
\ No newline at end of file
diff --git a/buyer/src/components/empty/Main.vue b/buyer/src/components/empty/Main.vue
new file mode 100644
index 00000000..a1af93a8
--- /dev/null
+++ b/buyer/src/components/empty/Main.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="empty">
+    <img
+      class="empty-img"
+      :style="{ width: _Size + 'px' }"
+      src="../../assets/images/empty.png"
+      alt=""
+    />
+    <p v-if="_Title">{{ _Title }}</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Main',
+  data () {
+    return {
+
+    };
+  },
+  props: {
+    _Title: { // 描述内容
+      type: null,
+      default: '暂无更多'
+    },
+    _Size: { // 图片大小
+      type: Number,
+      default: 150
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.empty {
+  margin: 30px 0;
+  text-align: center;
+  width: 100%;
+
+}
+p {
+  cursor: pointer;
+  @include sub_color($light_sub_color);
+}
+</style>
diff --git a/buyer/src/components/empty/README.md b/buyer/src/components/empty/README.md
new file mode 100644
index 00000000..60ffebec
--- /dev/null
+++ b/buyer/src/components/empty/README.md
@@ -0,0 +1,10 @@
+# 空状态封装
+
+```
+// _Title
+
+<empty></empty>  //默认显示
+
+q
+<empty _Title='暂无更多了' ></empty>   //自定义返回标题
+```
diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue
new file mode 100644
index 00000000..254fa366
--- /dev/null
+++ b/buyer/src/components/footer/Footer.vue
@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <footer class="footer">
+      <div class="clearfix"></div>
+      <div class="icon-row">
+        <div class="footer-icon">
+          <h5 class="footer-icon-child"></h5>
+          <span class="footer-icon-text">品类齐全，轻松购物</span>
+        </div>
+        <div class="footer-icon">
+          <h5 class="footer-icon-child footer-icon-child-2"></h5>
+          <span class="footer-icon-text">多仓直发，极速配送</span>
+        </div>
+        <div class="footer-icon">
+          <h5 class="footer-icon-child footer-icon-child-3"></h5>
+          <span class="footer-icon-text">正品行货，精致服务</span>
+        </div>
+        <div class="footer-icon">
+          <h5 class="footer-icon-child footer-icon-child-4"></h5>
+          <span class="footer-icon-text">天天低价，畅选无忧</span>
+        </div>
+      </div>
+      <div class="service-intro">
+        <div class="servece-type">
+          <div class="servece-type-info" v-for="(guide, index) in guideArr" :key="index">
+            <ul>
+              <li v-for="(item, index) in guide" :key="index" @click="goArticle">{{item}}</li>
+            </ul>
+          </div>
+        </div>
+        <div class="clearfix"></div>
+        <div class="friend-link">
+          <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="clearfix"></div>
+        <div class="copyright">
+          <p>Copyright © LILI</p>
+        </div>
+      </div>
+    </footer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Footer',
+  data () {
+    return {
+      guideArr: [ // 导航链接
+        [ '购物指南', '购物流程', '会员介绍', '生活旅行', '常见问题', '大家电', '联系客服' ],
+        [ '配送方式', '上门自提', '211限时达', '配送服务查询', '收取标准', '海外配送' ],
+        [ '支付方式', '货到付款', '在线支付', '分期付款', '邮局汇款', '公司转账' ],
+        [ '售后服务', '售后政策', '价格保护', '退款说明', '返修/退换货', '取消订单' ]
+      ],
+      moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'] // 更多链接
+    };
+  },
+  methods: {
+    goArticle () { // 跳转
+      let routeUrl = this.$router.resolve({
+        path: '/article'
+      })
+      window.open(routeUrl.href, '_blank')
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/*****************************底 部 开 始*****************************/
+.footer {
+  width: 100%;
+  height: 450px;
+  padding-top: 30px;
+
+  @include background_color($light_background_color);
+
+}
+.icon-row {
+  margin: 15px auto;
+  padding-top: 8px;
+  width: 1000px;
+  height: 64px;
+}
+.footer-icon {
+  margin-left: 17px;
+  margin-right: 17px;
+  float: left;
+}
+.footer-icon-child {
+  margin-top: 10px;
+  overflow: hidden;
+  position: absolute;
+  width: 36px;
+  height: 42px;
+  background-image: url("../../assets/images/footer/ico_service.png");
+  text-indent: -999px;
+}
+.footer-icon-child-2 {
+  background-position: 0 -43px;
+}
+.footer-icon-child-3 {
+  background-position: 0 -86px;
+}
+.footer-icon-child-4 {
+  background-position: 0 -129px;
+}
+ .footer-icon-text{
+  margin-left: 45px;
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 64px;
+}
+.service-intro {
+  width: 100%;
+  border-top: 1px solid $border_color;
+}
+.servece-type {
+  margin: 15px auto;
+  height: 200px;
+  width: 800px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+.servece-type-info ul {
+  list-style: none;
+}
+.servece-type-info li {
+  font-size: 14px;
+  cursor: pointer;
+  line-height: 26px;
+}
+.servece-type-info li:first-child {
+  font-size: 16px;
+  line-height: 28px;
+  font-weight: bold;
+}
+
+.friend-link {
+  display: flex;
+  align-items: center;
+  width: 908px;
+  height: 30px;
+  margin: 0px auto;
+  border-top: 1px solid $border_color;
+}
+.friend-link-item {
+  margin: 0px auto;
+}
+.friend-link-item ul {
+  list-style: none;
+}
+.friend-link-item li {
+  padding: 5px 0px;
+  float: left;
+}
+.link-item {
+  padding: 0px 8px;
+  cursor: pointer;
+  border-right: 1px solid $border_color;
+}
+.link-last-item {
+  border: none;
+}
+.copyright {
+  width: 100%;
+  line-height: 30px;
+  text-align: center;
+}
+.copyright a{
+  color: #232323;
+  font-size: 20px;
+}
+.footer-icon-text{
+  @include title_color($light_title_color)
+}
+.copyright,.friend-link,.servece-type-info {
+  @include sub_color($light_sub_color)
+}
+/*****************************底 部 结 束*****************************/
+</style>
diff --git a/buyer/src/components/global.js b/buyer/src/components/global.js
new file mode 100644
index 00000000..84e17108
--- /dev/null
+++ b/buyer/src/components/global.js
@@ -0,0 +1,54 @@
+// 全局组件配置
+
+import empty from './empty/Main' // 空状态组件
+import drawer from './drawer/Main' // 右侧bar
+import Header from '@/components/header/Header'; // 头部组件
+import FixedTopPage from '@/components/advertising/FixedTop'; // 顶部广告
+import Footer from '@/components/footer/Footer'; // 底部栏
+import Search from '@/components/Search' // 搜索框
+import card from '@/components/card' // 个人中心 卡片
+import cateNav from '@/components/nav/cateNav' // 个人中心 卡片
+
+empty.install = function (Vue) {
+  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)
+}
diff --git a/buyer/src/components/goodsDetail/Promotion.vue b/buyer/src/components/goodsDetail/Promotion.vue
new file mode 100644
index 00000000..0cdb7626
--- /dev/null
+++ b/buyer/src/components/goodsDetail/Promotion.vue
@@ -0,0 +1,123 @@
+<template>
+  <div>
+    <div class="wrapper" v-if="type === 'goodsDetail'">
+      <div class="wr-l"><Icon size="23" type="ios-alarm-outline" /> 秒杀活动</div>
+      <div class="count-down" v-if="end === ''">
+      <p>倒计时：</p><span>{{ hours }}</span><span>{{ minutes }}</span><span>{{ seconds }}</span>
+      </div>
+      <div v-else>{{end}}</div>
+    </div>
+    <span v-else class="cart-promotion">
+      <span v-if="end === ''">据活动结束：<span>{{ hours }}</span> : <span>{{ minutes }}</span> : <span>{{ seconds }}</span></span>
+      <span v-else>活动已结束</span>
+    </span>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    time: { // 传入的初始时间
+      default: 1718977559428
+    },
+    type: {
+      default: 'goodsDetail', // 设置两个值，goodsDetail和cart，样式不同
+      type: String
+    }
+  },
+  data () {
+    return {
+      end: '', // 结束状态
+      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((item) => {
+        this.countDown(this.time);
+      }, 1000);
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.cart-promotion{
+  font-size: 13px;
+  color: #999;
+  margin-left: 10px;
+}
+.wrapper {
+  background-image: linear-gradient(266deg, #ff0b33, #ff4257, #ff5f7c, #fa78a2);
+  height: 32px;
+  color: #fff;
+  line-height: 32px;
+  font-size: 16px;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.wr-r{
+  font-size: 13px;
+}
+.count-down {
+  margin-right: -20px;
+  p{
+    float: left;
+    line-height: 20px;
+  }
+  > span {
+    position: relative;
+    float: left;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    background-color: #2f3430;
+    margin-right: 20px;
+    color: white;
+    font-size: 14px;
+    line-height: 20px;
+    &::after {
+      content: ":";
+      display: block;
+      position: absolute;
+      right: -20px;
+      font-weight: bolder;
+      font-size: 14px;
+      width: 20px;
+      height: 100%;
+      top: 0;
+    }
+  }
+  > span:last-child::after {
+    content: "";
+  }
+}
+
+</style>
diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
new file mode 100644
index 00000000..ba6a169d
--- /dev/null
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -0,0 +1,658 @@
+<template>
+  <div class="wrapper">
+    <div class="item-detail-show">
+      <!-- 详情左侧展示数据、图片，收藏、举报 -->
+      <div class="item-detail-left">
+        <!-- 大图、放大镜 -->
+        <div class="item-detail-big-img">
+          <pic-zoom :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
+        </div>
+        <div class="item-detail-img-row">
+          <div
+            class="item-detail-img-small"
+            @mouseover="imgIndex = index"
+            v-for="(item, index) in imgList"
+            :key="index"
+          >
+            <img :src="item.url" />
+          </div>
+        </div>
+
+        <div class="goodsConfig mt_10">
+          <span @click="collect" ><Icon type="ios-heart" :color="isCollected ? '#ed3f14' : '#666'" />{{isCollected?'已收藏':'收藏'}}</span>
+          <!-- <span>举报</span> -->
+        </div>
+      </div>
+      <!-- 右侧商品信息、活动信息、操作展示 -->
+      <div class="item-detail-right">
+        <div class="item-detail-title">
+          <p>
+            {{ skuDetail.goodsName }}
+          </p>
+        </div>
+        <!-- 限时秒杀 -->
+        <Promotion v-if="promotionMap['SECKILL']" :time="promotionMap['SECKILL'].endTime"></Promotion>
+        <!-- 商品详细 价格、优惠券、促销 -->
+        <div class="item-detail-price-row">
+          <div class="item-price-left">
+            <!-- 商品原价 -->
+            <div class="item-price-row" v-if="!skuDetail.promotionPrice">
+              <p>
+                <span class="item-price-title">价 &nbsp;&nbsp;&nbsp;&nbsp;格</span>
+                <span class="item-price">{{skuDetail.price | unitPrice("￥")}}</span>
+              </p>
+            </div>
+            <!-- 秒杀价格 -->
+            <div class="item-price-row" v-if="skuDetail.promotionPrice">
+              <p>
+                <span class="item-price-title" v-if="promotionMap['SECKILL']">秒 &nbsp;杀&nbsp;价</span>
+                <span class="item-price">{{skuDetail.promotionPrice | unitPrice("￥")}}</span>
+                <span class="item-price-old">{{skuDetail.price | unitPrice("￥")}}</span>
+              </p>
+            </div>
+            <!-- 优惠券展示 -->
+            <div class="item-price-row"  v-if="promotionMap['COUPON'].length">
+              <p>
+                <span class="item-price-title">优 惠 券</span>
+                <span
+                  class="item-coupon"
+                  v-for="(item, index) in promotionMap['COUPON']"
+                  :key="index"
+                  @click="receiveCoupon(item.id)"
+                  >
+                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price}}</span>
+                  <span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span>
+                  </span>
+              </p>
+            </div>
+             <!-- 满减展示 -->
+            <div class="item-price-row" v-if="promotionMap['FULL_DISCOUNT']">
+              <p>
+                <span class="item-price-title">促&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;销</span>
+                <span class="item-promotion">满减</span>
+                <span class="item-desc-pintuan" v-if="promotionMap['FULL_DISCOUNT'].fullMinus">满{{ promotionMap['FULL_DISCOUNT'].fullMoney }}元，立减现金{{ promotionMap['FULL_DISCOUNT'].fullMinus}}元</span>
+                <span class="item-desc-pintuan" v-if="promotionMap['FULL_DISCOUNT'].fullRate">满{{ promotionMap['FULL_DISCOUNT'].fullMoney }}元，立享{{ promotionMap['FULL_DISCOUNT'].fullRate}}折</span>
+              </p>
+            </div>
+          </div>
+          <div class="item-price-right">
+            <div class="item-remarks-sum">
+              <p>累计评价</p>
+              <p>
+                <span class="item-remarks-num">{{ skuDetail.commentNum || 0 }} 条</span>
+              </p>
+            </div>
+          </div>
+        </div>
+        <!-- 选择颜色 -->
+        <div class="item-select" v-for="(sku, index) in formatList" :key="sku.id">
+          <div class="item-select-title">
+            <p>{{ sku.name }}</p>
+          </div>
+          <div class="item-select-column">
+            <div class="item-select-row" v-for="(item) in sku.values" :key="item.id">
+              <div class="item-select-box" @click="select(index, sku.id, item.id)"
+                :class="{ 'item-select-box-active': item.id === currentSelceted[index] }"
+              >
+                <div class="item-select-intro">
+                  <p>{{ item.value }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <br />
+        <div class="add-buy-car-box">
+          <div class="item-select">
+            <div class="item-select-title">
+              <p>数量</p>
+            </div>
+            <div class="item-select-row">
+              <InputNumber :min="1" :disabled="skuDetail.quantity === 0" v-model="count"></InputNumber>
+              <span class="inventory"> 库存{{skuDetail.quantity}}</span>
+            </div>
+          </div>
+          <div class="item-select">
+            <div class="item-select-title">
+              <p>重量</p>
+            </div>
+            <div class="item-select-row">
+              <span class="inventory"> {{skuDetail.weight}}kg</span>
+            </div>
+          </div>
+          <div class="add-buy-car">
+            <Button type="error" :loading="loading" :disabled="skuDetail.quantity === 0" @click="addShoppingCartBtn">加入购物车</Button>
+            <Button type="warning" :loading="loading1" :disabled="skuDetail.quantity === 0" @click="buyNow">立即购买</Button>
+          </div>
+        </div>
+      </div>
+
+      <!-- <div class="item-detail-see">
+        <Divider>更多推荐</Divider>
+        <Row>
+          <Col :span="24" class="see-Item">
+            <img class="see-Img" src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg" alt="" />
+            <p>
+              名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
+              升6GB独显 送正版WIN10 一年上门
+            </p>
+            <p class="global_color">￥2500.00</p>
+          </Col>
+          <Col :span="24" class="see-Item">
+            <img
+              class="see-Img"
+              src="https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489099128797.jpg"
+              alt=""
+            />
+            <p>
+              名龙堂i7 6700升7700 GTX1060 6G台式电脑主机DIY游戏组装整机
+              升6GB独显 送正版WIN10 一年上门
+            </p>
+            <p class="global_color">￥2500.00</p>
+          </Col>
+        </Row>
+      </div> -->
+    </div>
+  </div>
+</template>
+
+<script>
+import Promotion from './Promotion.vue';
+import PicZoom from 'vue-piczoom'; // 图片放大 https://github.com/826327700/vue-piczoom
+import { collectGoods, isCollection, receiveCoupon, cancelCollect } from '@/api/member.js';
+import { addCartGoods } from '@/api/cart.js';
+export default {
+  name: 'ShowGoods',
+  props: {
+    detail: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      count: 1, // 商品数量
+      imgIndex: 0, // 展示图片下标
+      currentSelceted: [], // 当前商品sku
+      imgList: this.detail.data.specList[0].specImage, // 商品图片列表
+      skuDetail: this.detail.data, // sku详情
+      goodsSpecList: this.detail.specs, // 商品spec
+      promotionMap: { // 活动状态
+        SECKILL: null,
+        FULL_DISCOUNT: null,
+        COUPON: []
+      }, // 促销活动
+      formatList: [], // 选择商品品类的数组
+      loading: false, // 立即购买loading
+      loading1: false, // 加入购物车loading
+      isCollected: false // 是否收藏
+    };
+  },
+  components: {
+    PicZoom,
+    Promotion
+  },
+  methods: {
+    select (index, id, valueId) { // 选择规格
+      this.$set(this.currentSelceted, index, valueId);
+
+      let selectedSkuId = this.goodsSpecList.find((i) => {
+        let matched = true;
+        let specValues = i.specValues.filter((j) => j.specName !== 'images');
+        for (let n = 0; n < specValues.length; n++) {
+          if (specValues[n].specValueId !== this.currentSelceted[n]) {
+            matched = false;
+            return;
+          }
+        }
+        if (matched) {
+          return i;
+        }
+      });
+      console.log(selectedSkuId);
+      this.$router.push({
+        path: '/goodsDetail',
+        query: { skuId: selectedSkuId.skuId, goodsId: this.skuDetail.goodsId }
+      });
+    },
+
+    addShoppingCartBtn () { // 添加购物车
+      const params = {
+        num: this.count,
+        skuId: this.skuDetail.id
+      };
+      this.loading = true;
+      addCartGoods(params).then(res => {
+        this.loading = false;
+        if (res.code === 200) {
+          this.$router.push({path: '/shoppingCart', query: {detail: this.skuDetail, count: this.count}});
+        } else {
+          this.$Message.warning(res.message);
+        }
+      });
+    },
+    buyNow () { // 立即购买
+      const params = {
+        num: this.count,
+        skuId: this.skuDetail.id,
+        cartType: 'BUY_NOW'
+      };
+      this.loading1 = true;
+      addCartGoods(params).then(res => {
+        this.loading1 = false;
+        if (res.code === 200) {
+          this.$router.push({path: '/pay', query: {way: 'BUY_NOW'}});
+        } else {
+          this.$Message.warning(res.message);
+        }
+      });
+    },
+    async collect () { // 收藏商品
+      if (this.isCollected) {
+        let cancel = await cancelCollect('GOODS', this.skuDetail.id)
+        if (cancel.success) {
+          this.$Message.success('取消收藏成功')
+          this.isCollected = false
+        }
+      } else {
+        let collect = await collectGoods('GOODS', this.skuDetail.id);
+        if (collect.code === 200) {
+          this.isCollected = true;
+          this.$Message.success('收藏商品成功,可以前往个人中心我的收藏查看');
+        }
+      }
+    },
+    formatSku (list) {
+      // 格式化数据
+
+      let arr = [{}];
+
+      list.forEach((item, index) => {
+        item.specValues.forEach((spec, specIndex) => {
+          let id = spec.specNameId;
+          let name = spec.specName;
+          let values = {
+            id: spec.specValueId,
+            value: spec.specValue,
+            quantity: item.quantity
+          };
+          if (name === 'images') {
+            return;
+          }
+
+          arr.forEach((arrItem, arrIndex) => {
+            if (
+              arrItem.name === name &&
+              arrItem.values &&
+              !arrItem.values.find((i) => i.id === values.id)
+            ) {
+              arrItem.values.push(values);
+            }
+
+            let keys = arr.map((key) => {
+              return key.name;
+            });
+            if (!keys.includes(name)) {
+              arr.push({
+                id: id,
+                name: name,
+                values: [values]
+              });
+            }
+          });
+        });
+      });
+      arr.shift();
+      this.formatList = arr;
+
+      let cur = list.filter((i) => i.skuId === this.$route.query.skuId)[0];
+      if (cur) {
+        cur.specValues.filter((i) => i.specName !== 'images')
+          .forEach((value, _index) => {
+            this.currentSelceted[_index] = value.specValueId;
+          });
+      }
+      this.skuList = list;
+    },
+    receiveCoupon (id) { // 领取优惠券
+      receiveCoupon(id).then(res => {
+        if (res.success) {
+          this.$Message.success('优惠券领取成功')
+        } else {
+          this.$Message.warning(res.message)
+        }
+      })
+    },
+    promotion () { // 格式化促销活动，返回当前促销的对象
+      let keysArr = Object.keys(this.detail.promotionMap);
+      if (keysArr.length === 0) return false;
+
+      for (let i = 0; i < keysArr.length; i++) {
+        let key = keysArr[i].split('-')[0]
+        if (key === 'COUPON') {
+          this.promotionMap[key].push(this.detail.promotionMap[keysArr[i]])
+        } else {
+          this.promotionMap[key] = this.detail.promotionMap[keysArr[i]]
+        }
+      }
+    }
+  },
+  mounted () {
+    if (this.Cookies.getItem('userInfo')) {
+      isCollection('GOODS', this.skuDetail.id).then(res => {
+        if (res.success && res.result) {
+          this.isCollected = true;
+        }
+      })
+    }
+    
+    this.formatSku(this.goodsSpecList);
+    this.promotion()
+    document.title = this.skuDetail.goodsName
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/******************商品图片及购买详情开始******************/
+.item-detail-see {
+  width: 175px;
+  margin-left: 30px;
+}
+.inventory {
+  padding-left: 4px;
+  @include sub_color($light_sub_color);
+}
+
+.global_color {
+  text-align: center;
+}
+
+.see-Img {
+  width: 100%;
+  height: 175px;
+}
+
+.see-Item {
+  > p {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.Report {
+  color: $theme_color !important;
+}
+
+.wrapper {
+  @include white_background_color();
+}
+.item-sale-flex {
+  width: 29%;
+  padding: 0 3%;
+}
+.item-sale {
+  margin: 10px 0;
+  > h3 {
+    width: 13%;
+    text-align: center;
+    font-size: 20px;
+    line-height: 60px;
+    box-sizing: border-box;
+    border-right: 1px solid $border_color;
+  }
+  height: 60px;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  width: 1200px;
+  margin: 0 auto;
+  margin-bottom: 10px;
+  border: 1px solid $border_color;
+  background: #f7f7f7;
+}
+
+.item-detail-show {
+  width: 1200px;
+  margin: 0 auto;
+  padding: 30px;
+  display: flex;
+  flex-direction: row;
+}
+
+.item-detail-left {
+  width: 350px;
+  margin-right: 30px;
+}
+
+.item-detail-big-img {
+  width: 350px;
+  height: 350px;
+  box-shadow: 0px 0px 8px $border_color;
+  cursor: pointer;
+}
+
+.item-detail-big-img img {
+  width: 100%;
+}
+
+.item-detail-img-row {
+  margin-top: 15px;
+  display: flex;
+}
+
+.item-detail-img-small {
+  width: 68px;
+  height: 68px;
+  box-shadow: 0px 0px 8px #ccc;
+  cursor: pointer;
+  margin-left: 5px;
+}
+
+.item-detail-img-small img {
+  height: 100%;
+  width: 100%;
+}
+
+/*商品选购详情*/
+.item-detail-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.item-detail-title p {
+  @include content_color($light_content_color);
+  font-weight: bold;
+  font-size: 20px;
+  padding: 8px 0;
+}
+
+.item-detail-express {
+  font-size: 14px;
+  padding: 2px 3px;
+  border-radius: 3px;
+  background-color: $theme_color;
+  color: #fff;
+}
+
+/*商品标签*/
+.item-detail-tag {
+  padding: 8px 0;
+  font-size: 12px;
+  color: $theme_color;
+}
+
+/*价格详情等*/
+.item-detail-price-row {
+  padding: 10px;
+  display: flex;
+  // width: 555px;
+  flex-direction: row;
+  justify-content: space-between;
+  // @include background_color($light_background_color);
+  background: url("../../assets/images/goodsDetail/price-bg.png");
+}
+
+.item-price-left {
+  display: flex;
+  flex-direction: column;
+}
+
+.item-price-title {
+  color: #999999;
+  font-size: 14px;
+  margin-right: 15px;
+}
+
+.item-price-row {
+  margin: 5px 0px;
+}
+
+.item-price {
+  color: $theme_color;
+  font-size: 20px;
+  cursor: pointer;
+}
+.item-price-old {
+  color: gray;
+  text-decoration: line-through;
+  font-size: 14px;
+  margin-left: 5px;
+}
+
+.item-coupon {
+  margin-right: 5px;
+  padding: 3px;
+  color: $theme_color;
+  font-size: 12px;
+  background-color: #ffdedf;
+  border: 1px dotted $theme_color;
+  cursor: pointer;
+}
+.item-promotion {
+  margin-right: 5px;
+  padding: 3px;
+  color: $theme_color;
+  font-size: 12px;
+  border: 1px solid $theme_color;
+}
+.item-remarks-sum {
+  padding-left: 8px;
+  border-left: 1px solid $border_color;
+}
+
+.item-remarks-sum p {
+  color: #999999;
+  font-size: 12px;
+  line-height: 10px;
+  text-align: center;
+}
+
+.item-remarks-num {
+  line-height: 18px;
+  color: #005eb7;
+}
+
+.item-select {
+  display: flex;
+  flex-direction: row;
+  margin-top: 15px;
+}
+
+.item-select-title {
+  @include content_color($light_content_color);
+  font-size: 14px;
+  margin-right: 15px;
+  width: 60px;
+}
+
+.item-select-column {
+  display: flex;
+  flex-wrap: wrap;
+  flex: 1;
+}
+
+.item-select-row {
+  // display: flex;
+  // flex-direction: row;
+  // flex-wrap: wrap;
+  margin-bottom: 8px;
+}
+
+.item-select-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.item-select-img {
+  width: 36px;
+}
+
+.item-select-box {
+  padding: 5px;
+  margin-right: 8px;
+  @include background_color($light_background_color);
+  border: 0.5px solid $border_color;
+  cursor: pointer;
+  @include content_color($light_content_color);
+}
+
+.item-select-box:hover {
+  border: 0.5px solid $theme_color;
+}
+
+.item-select-box-active {
+  border: 0.5px solid $theme_color;
+}
+
+.item-select-box-disabled {
+  background-color: gray;
+}
+
+.item-select-img img {
+  width: 100%;
+}
+
+.item-select-intro p {
+  margin: 0px;
+  padding: 5px;
+}
+
+.item-select-class {
+  padding: 5px;
+  margin-right: 8px;
+  @include sub_background_color($light_background_color);
+  border: 0.5px solid #ccc;
+  cursor: pointer;
+}
+
+.item-select-class:hover {
+  border: 0.5px solid $theme_color;
+}
+
+.add-buy-car-box {
+  width: 100%;
+  margin-top: 15px;
+  border-top: 1px dotted $border_color;
+}
+
+.add-buy-car {
+  margin-top: 15px;
+}
+
+.goodsConfig {
+  display: flex;
+  justify-content: space-between;
+  > span {
+    padding-right: 10px;
+    &:hover{
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+/******************商品图片及购买详情结束******************/
+</style>
diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
new file mode 100644
index 00000000..a2a19a40
--- /dev/null
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -0,0 +1,489 @@
+<template>
+  <div>
+    <div class="item-intro-show">
+      <!-- <div class="item-intro-recommend">
+        <div class="item-recommend-title">
+          <p>店铺热销</p>
+        </div>
+        <div class="item-intro-recommend-column">
+          <div class="item-recommend-column" v-for="(item, index) in hotList" :key="index">
+            <div class="item-recommend-img">
+              <img :src="item.img" alt="">
+            </div>
+            <div class="item-recommend-intro">
+              <span>
+                <span class="item-recommend-top-num">{{index + 1}}</span> 热销{{item.sale}}件</span>
+              <span class="item-recommend-price">￥{{item.price | unitPrice}}</span>
+            </div>
+          </div>
+        </div>
+      </div> -->
+      <div class="item-intro-detail" ref="itemIntroDetail">
+        <div class="item-intro-nav item-tabs">
+          <Tabs :animated="false" @on-click="tabClick">
+            <TabPane label="商品介绍">
+              <div class="item-intro-img" ref="itemIntroGoods">
+                <div v-html="skuDetail.intro" v-if="skuDetail.intro"></div>
+                <div v-else style="margin:20px;">暂无商品介绍</div>
+              </div>
+            </TabPane>
+            <TabPane label="商品评价">
+              <div class="remarks-container" ref="itemGoodsComment">
+                <div class="remarks-analyse-box">
+                  <div class="remarks-analyse-goods">
+                    <i-circle :percent="skuDetail.grade || 100" stroke-color="#5cb85c">
+                      <span class="remarks-analyse-num">{{skuDetail.grade || 100}}%</span>
+                      <p class="remarks-analyse-title">好评率</p>
+                    </i-circle>
+                  </div>
+                </div>
+                <div class="remarks-bar">
+                  <span @click="searchByGrade('')" :class="{selectedBar: commentParams.grade === ''}">全部({{commentTypeNum.all}})</span>
+                  <span @click="searchByGrade('GOOD')" :class="{selectedBar: commentParams.grade === 'GOOD'}">好评({{commentTypeNum.good}})</span>
+                  <span @click="searchByGrade('MODERATE')" :class="{selectedBar: commentParams.grade === 'MODERATE'}">中评({{commentTypeNum.moderate}})</span>
+                  <span @click="searchByGrade('WORSE')" :class="{selectedBar: commentParams.grade === 'WORSE'}">差评({{commentTypeNum.worse}})</span>
+                </div>
+                <div style="text-align: center;margin-top: 20px;" v-if="commentList.length === 0">
+                  暂无评价数据
+                </div>
+                <div class="remarks-box" v-for="(item,index) in commentList" :key="index" v-else>
+                  <div class="remarks-user">
+                    <Avatar :src="item.memberProfile" />
+                    <span class="remarks-user-name">{{item.memberName | secrecyMobile}}</span>
+                  </div>
+                  <div class="remarks-content-box">
+                    <p>
+                      <Rate disabled :value="Number(item.descriptionScore)" allow-half class="remarks-star"></Rate>
+                    </p>
+                    <p class="remarks-content">{{item.content}}</p>
+                    <div class="comment-img" v-if="item.haveImage">
+                      <div v-for="(img, imgIndex) in item.image.split(',')"
+                       @click="previewImg(img, item)"
+                       :class="{borderColor:img === item.previewImg}"
+                       :key="imgIndex">
+                        <img :src="img" alt="">
+                      </div>
+                    </div>
+                    <div class="preview-img"  v-if="item.previewImg"  @click.prevent="hidePreviewImg(item)">
+                      <div>
+                        <span @click.stop="rotatePreviewImg(0, item)"><Icon type="md-refresh" />左转</span>
+                        <span @click.stop="rotatePreviewImg(1, item)"><Icon type="md-refresh" />右转</span>
+                      </div>
+                      <img :src="item.previewImg" :style="{transform:`rotate(${item.deg}deg)`}" width="198" alt="">
+                    </div>
+                    <p class="remarks-sub">
+                      <span class="remarks-item">{{item.goodsName}}</span>
+                      <span class="remarks-time">{{item.createTime}}</span>
+                    </p>
+                  </div>
+                </div>
+                <div class="remarks-page">
+                  <Page :total="commentTotal" size="small"
+                    @on-change="changePageNum"
+                    @on-page-size-change="changePageSize"
+                    :page-size="commentParams.pageSize"
+                    ></Page>
+                </div>
+              </div>
+            </TabPane>
+            <!-- <TabPane label="商品问答">
+              <ShowGoodsQuestion/>
+            </TabPane> -->
+          </Tabs>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ShowGoodsQuestion from '@/components/goodsDetail/ShowGoodsQuestion';
+import { goodsComment, goodsCommentNum } from '@/api/member.js';
+export default {
+  name: 'ShowGoodsDetail',
+  props: {
+    detail: { // 商品详情
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      commentList: [], // 评论列表
+      commentParams: { // 评论传参
+        pageNumber: 1,
+        pageSize: 10,
+        grade: '',
+        goodsId: ''
+      },
+      commentTypeNum: {}, // 评论数量，包括好中差分别的数量
+      commentTotal: 0, // 评论总数
+      onceFlag: true // 只调用一次
+    };
+  },
+  computed: {
+    skuDetail () {
+      return this.detail.data;
+    }
+  },
+  methods: {
+    changeHeight (name) {
+      let heightCss = window.getComputedStyle(this.$refs[name]).height;
+      heightCss = parseInt(heightCss.substr(0, heightCss.length - 2)) + 89;
+      this.$refs.itemIntroDetail.style.height = heightCss + 'px';
+    },
+    changePageNum (val) {
+      this.commentParams.pageNumber = val;
+      this.getList();
+    },
+    changePageSize (val) {
+      this.commentParams.pageNumber = 1;
+      this.commentParams.pageSize = val;
+      this.getList();
+    },
+    getList () { // 获取评论列表
+      this.commentParams.goodsId = this.skuDetail.goodsId;
+      goodsComment(this.commentParams).then(res => {
+        if (res.code === 200) {
+          this.commentList = res.result.records;
+          this.commentTotal = res.result.total;
+        }
+      });
+      goodsCommentNum(this.skuDetail.goodsId).then(res => {
+        if (res.code === 200) {
+          this.commentTypeNum = res.result;
+        }
+      });
+    },
+    searchByGrade (grade) {
+      this.$set(this.commentParams, 'grade', grade);
+      this.commentParams.pageNumber = 1;
+      this.getList();
+    },
+    tabClick (name) {
+      if (name === 0) {
+        this.$nextTick(() => {
+          this.changeHeight('itemIntroGoods')
+        });
+      } else {
+        this.$nextTick(() => {
+          this.changeHeight('itemGoodsComment')
+        });
+      }
+    },
+    previewImg (img, item) { // 预览图片
+      this.$set(item, 'previewImg', img);
+      this.$nextTick(() => {
+        this.changeHeight('itemGoodsComment')
+      });
+    },
+    hidePreviewImg (item) { // 隐藏预览图片
+      this.$set(item, 'previewImg', '');
+      this.$nextTick(() => {
+        this.changeHeight('itemGoodsComment')
+      });
+    },
+    rotatePreviewImg (type, item) { // 图片旋转
+      if (type) {
+        if (item.deg) {
+          this.$set(item, 'deg', item.deg + 90);
+        } else {
+          this.$set(item, 'deg', 90);
+        }
+      } else {
+        if (item.deg) {
+          this.$set(item, 'deg', item.deg - 90);
+        } else {
+          this.$set(item, 'deg', -90);
+        }
+      }
+    },
+    handleScroll () {
+      if (this.onceFlag) {
+        this.$nextTick(() => {
+          this.changeHeight('itemIntroGoods')
+        });
+        this.onceFlag = false
+      }
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      setTimeout(this.changeHeight('itemIntroGoods'), 2000);
+    });
+    window.addEventListener('scroll', this.handleScroll)
+    this.getList();
+  },
+  components: {
+    ShowGoodsQuestion
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/***************商品详情介绍和推荐侧边栏开始***************/
+.item-intro-show{
+
+  width: 1200px;
+  margin: 15px auto;
+  display: flex;
+  flex-direction: row;
+
+}
+.item-intro-recommend{
+  width: 200px;
+  display: flex;
+  flex-direction: column;
+}
+.item-intro-recommend-column{
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0px 0px 5px #999;
+}
+.item-recommend-title{
+  width: 100%;
+  height: 38px;
+  font-size: 16px;
+  line-height: 38px;
+  color: #fff;
+  background-color: $theme_color;
+  box-shadow: 0px 0px 5px $theme_color;
+  text-align: center;
+}
+.item-recommend-column{
+  margin-top: 15px;
+}
+.item-recommend-intro{
+  padding: 5px 15px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-size: 12px;
+  color: #999;
+  cursor: pointer;
+}
+.item-recommend-img{
+  width: 80%;
+  margin: 0px auto;
+  cursor: pointer;
+}
+.item-recommend-img img{
+  width: 100%;
+}
+.item-recommend-top-num{
+  color: #fff;
+  margin: 0px 2px;
+  padding: 1px 5px;
+  border-radius: 12px;
+  background-color: $theme_color;
+}
+.item-recommend-price{
+  color: $theme_color;
+  font-weight: bolder;
+}
+.item-intro-detail{
+  margin: 0  30px;
+  // min-height: 1500px;
+  width: 100%;
+}
+.item-intro-nav{
+  width: 100%;
+  height: 38px;
+  background-color: #F7F7F7;
+  // border-bottom: 1px solid $theme_color;
+}
+.item-intro-nav ul{
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+}
+.item-intro-nav li{
+  float: left;
+  height: 100%;
+  width: 120px;
+  line-height: 38px;
+  text-align: center;
+  color: $theme_color;
+}
+.item-intro-nav li:first-child{
+  background-color: $theme_color;
+  color: #fff;
+}
+.item-intro-img {
+  width: 100%;
+  min-height: 300px;
+}
+.item-intro-img img{
+  max-width: 1000px;
+}
+/************* 商品参数 *************/
+.item-param-container {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.item-param-box {
+  padding: 5px;
+  padding-left: 30px;
+  width: 240px;
+  height: 36px;
+  font-size: 14px;
+  /* text-align: center; */
+  /* background-color: #ccc; */
+}
+.item-param-title {
+  color: #232323;
+}
+.item-param-content {
+  color: #999;
+}
+.remarks-title {
+  padding-left: 15px;
+  height: 36px;
+  font-size: 16px;
+  font-weight: bolder;
+  line-height: 36px;
+  color: #666666;
+  background-color: #F7F7F7;
+}
+.remarks-analyse-box {
+  padding: 15px;
+  display: flex;
+  align-items: center;
+}
+.remarks-analyse-goods {
+  margin-left: 15px;
+  margin-right: 15px;
+}
+.remarks-analyse-num {
+  font-size: 26px;
+}
+.remarks-analyse-title {
+  font-size: 12px;
+  line-height: 20px;
+}
+.remarks-bar {
+  padding-left: 15px;
+  height: 36px;
+  line-height: 36px;
+  color: #666666;
+  background-color: #F7F7F7;
+  .selectedBar{
+    color: $theme_color;
+  }
+}
+.remarks-bar span {
+  margin-right: 15px;
+  &:hover{
+    color: $theme_color;
+    cursor: pointer;
+  }
+}
+.remarks-box {
+  padding: 15px;
+  display: flex;
+  flex-direction: row;
+  border-bottom: 1px #ccc dotted;
+}
+.remarks-user {
+  width: 180px;
+}
+.remarks-user-name {
+  padding-left: 15px;
+}
+.remarks-content-box {
+  width: calc(100% - 180px);
+  .comment-img{
+    display: flex;
+    .borderColor{
+      border-color: $theme_color;
+    }
+    div{
+      border: 1px solid #999;
+      margin-right: 5px;
+      width: 50px;
+      height: 50px;
+      img{width: 100%;}
+    }
+  }
+  .preview-img{
+    position: relative;
+    border: 1px solid #eee;
+    margin: 10px 0;
+    width: 200px;
+
+    div{
+      position: absolute;
+      top: 3px;
+      left: 3px;
+      z-index: 3;
+      span{
+        display: inline-block;
+        background-color: rgba(0,0,0,.5);
+        padding:3px 5px;
+        color: #fff;
+        border-radius: 4px;
+        cursor: pointer;
+      }
+      span:nth-child(1) .ivu-icon {
+        transform: rotateY(180deg);
+      }
+    }
+
+    img:hover{
+      cursor: url(require('../../../static/small.cur')),auto;
+    }
+  }
+}
+
+.remarks-content {
+  font-size: 14px;
+  color: #232323;
+  line-height: 28px;
+}
+.remarks-sub {
+  margin-top: 5px;
+  color: #ccc;
+}
+.remarks-time {
+  margin-left: 15px;
+}
+.remarks-page {
+  margin: 15px;
+  display: flex;
+  justify-content:flex-end;
+}
+/***************商品详情介绍和推荐侧边栏结束***************/
+/* 改变便签页样式 */
+.ivu-tabs-ink-bar {
+  background-color: $theme_color !important;
+}
+/deep/.ivu-tabs-bar{
+  border: none;
+}
+.item-tabs > .ivu-tabs > .ivu-tabs-bar .ivu-tabs-tab{
+  border-radius: 0px;
+  color: #999;
+  height: 38px;
+  // background: #F7F7F7;
+}
+.item-tabs > .ivu-tabs > .ivu-tabs-bar .ivu-tabs-tab-active{
+  color: #fff;
+  background-color: $theme_color;
+}
+.item-tabs > .ivu-tabs > .ivu-tabs-bar .ivu-tabs-tab-active:before{
+  content: '';
+  display: block;
+  width: 100%;
+  height: 1px;
+  color: #fff;
+  background: #F7F7F7;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.ivu-rate-star-full:before, .ivu-rate-star-half .ivu-rate-star-content:before {
+  color: $theme_color;
+}
+</style>
diff --git a/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue b/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue
new file mode 100644
index 00000000..bd70c809
--- /dev/null
+++ b/buyer/src/components/goodsDetail/ShowGoodsQuestion.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="wrapper">
+    <div v-if="true" class="question-list">
+      <div class="-item" v-for="index in 6" :key="index">
+        <!-- 提问 -->
+        <div class="-item-put -item-div">
+          <div class="-item-div-l blod">
+            <Tag color="warning">问</Tag>
+            有屏幕调节亮度吗
+          </div>
+          <div class="-item-div-r">2020年10月21日17:03:35</div>
+        </div>
+        <!-- 解答 -->
+        <div class="-item-reply -item-div">
+          <div class="-item-div-l">
+            <Tag color="success">答</Tag>
+            能调节，点屏幕上方有一条调整带，可正负2调整。
+          </div>
+          <div class="-item-div-r">2020年10月21日17:03:35</div>
+        </div>
+      </div>
+    </div>
+    <div v-else class="question-empty">
+      <empty></empty>
+    </div>
+  </div>
+</template>
+<script>
+export default {};
+</script>
+<style scoped lang="scss">
+.-item-div {
+  padding: 10px 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+.-item-div-l {
+  display: flex;
+  @include content_color($light_content_color);
+}
+.-item-div-r {
+  @include sub_color($light_content_color);
+}
+.blod {
+  font-weight: bold;
+}
+.-item {
+  margin: 10px 0;
+  border-bottom: 1px solid $border_color;
+}
+</style>
diff --git a/buyer/src/components/goodsDetail/ShowProductWarranty.vue b/buyer/src/components/goodsDetail/ShowProductWarranty.vue
new file mode 100644
index 00000000..3bbb7550
--- /dev/null
+++ b/buyer/src/components/goodsDetail/ShowProductWarranty.vue
@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <div class="remarks-title">
+      <span>售后保障</span>
+    </div>
+    <div class="item-protect-container">
+      <div class="item-protect-box">
+        <p class="item-protect-title-box">
+          <Avatar style="background-color: #e4393c" icon="ribbon-a" />
+          <span class="item-protect-title">卖家服务</span>
+        </p>
+        <p class="item-protect-detail">
+          高品质敢承诺：7天无理由退货，30天免费换新，质量问题商家承担来回运费换新；如需发票，请在确认收货无误后联系商家开出。（注*发票不随货品一同发出）
+        </p>
+      </div>
+      <div class="item-protect-box">
+        <p class="item-protect-title-box">
+          <Avatar style="background-color: #e4393c" icon="cash" />
+          <span class="item-protect-title">平台承诺</span>
+        </p>
+        <p class="item-protect-detail">
+          平台卖家销售并发货的商品，由平台卖家提供发票和相应的售后服务。请您放心购买！<br> 注：因厂家会在没有任何提前通知的情况下更改产品包装、产地或者一些附件，本司不能确保客户收到的货物与商城图片、产地、附件说明完全一致。只能确保为原厂正货！并且保证与当时市场上同样主流新品一致。若本商城没有及时更新，请大家谅解！
+        </p>
+      </div>
+      <div class="item-protect-box">
+        <p class="item-protect-title-box">
+          <Avatar style="background-color: #e4393c" icon="locked" />
+          <span class="item-protect-title">正品行货</span>
+        </p>
+        <p class="item-protect-detail">
+          BIT商城向您保证所售商品均为正品行货，BIT自营商品开具机打发票或电子发票。
+        </p>
+      </div>
+      <div class="item-protect-box">
+        <p class="item-protect-title-box">
+          <Avatar style="background-color: #e4393c" icon="settings" />
+          <span class="item-protect-title">全国联保</span>
+        </p>
+        <p class="item-protect-detail">
+          凭质保证书及BIT商城发票，可享受全国联保服务（奢侈品、钟表除外；奢侈品、钟表由BIT联系保修，享受法定三包售后服务），与您亲临商场选购的商品享受相同的质量保证。BIT商城还为您提供具有竞争力的商品价格和运费政策，请您放心购买！<br><br> 注：因厂家会在没有任何提前通知的情况下更改产品包装、产地或者一些附件，本司不能确保客户收到的货物与商城图片、产地、附件说明完全一致。只能确保为原厂正货！并且保证与当时市场上同样主流新品一致。若本商城没有及时更新，请大家谅解！
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ShowProductWarranty'
+};
+</script>
+
+<style scoped lang="scss">
+.remarks-title {
+  padding-left: 15px;
+  height: 36px;
+  font-size: 16px;
+  font-weight: bolder;
+  line-height: 36px;
+  color: #666666;
+  background-color: #F7F7F7;
+}
+.item-protect-container {
+  padding: 15px;
+}
+.item-protect-box {
+  margin-bottom: 30px;
+}
+.item-protect-title-box {
+  display: flex;
+  align-items: center;
+}
+.item-protect-title {
+  padding-left: 15px;
+  font-size: 20px;
+  font-weight: bolder;
+  color: $theme_color;
+}
+.item-protect-detail {
+  padding-top: 5px;
+  padding-left: 46px;
+  font-size: 14px;
+  color: #999;
+}
+</style>
diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
new file mode 100644
index 00000000..af0b69f7
--- /dev/null
+++ b/buyer/src/components/header/Header.vue
@@ -0,0 +1,426 @@
+<template>
+  <div class="box">
+    <div class="nav">
+      <ul class="location">
+        <li><router-link to="/" v-if="$route.path !== '/'" class="home-page" ><Icon type="md-home" />首页</router-link></li>
+        <li>
+          <Dropdown placement="bottom-start">
+            <a href="javascript:void(0)">
+              <Icon type="ios-pin" class="icon"></Icon>
+              {{ city }}
+            </a>
+            <DropdownMenu slot="list">
+              <div class="city">
+                <p v-for="(items, index) in cityArr" :key="index">
+                  <span
+                    v-for="(item, index) in items"
+                    class="city-item"
+                    :key="index"
+                    @click="changeCity(item)"
+                    >{{ item }}</span>
+                </p>
+              </div>
+            </DropdownMenu>
+          </Dropdown>
+        </li>
+      </ul>
+      <ul class="detail">
+        <!-- <li class="first hover-pointer" @click="handleClickTheme()">切换主题</li> -->
+        <li class="first" v-show="!userInfo.username">
+          <router-link :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
+            <span style="border:none" class="tipsLogin">请登录</span>
+          </router-link>
+        </li>
+        <li v-show="!!userInfo.username">
+          <Dropdown>
+            <p class="username-p">
+              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small" />
+              <span class="username">{{ userInfo.nickName? userInfo.nickName : userInfo.username | secrecyMobile }}</span>
+            </p>
+            <DropdownMenu slot="list">
+              <div class="my-page">
+                <div class="my-info" @click="myInfo">
+                  <Icon type="md-home"></Icon>
+                  <p>我的主页</p>
+                </div>
+                <div class="sign-out" @click="signOutFun">
+                  <Icon type="md-exit"></Icon>
+                  <p>退出登陆</p>
+                </div>
+              </div>
+            </DropdownMenu>
+          </Dropdown>
+        </li>
+        <li class="hover-color" @click="goUserCenter('home/MyOrder')"><span class="nav-item">我的订单</span></li>
+        <li class="hover-color" @click="goUserCenter('home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li v-if="$route.name !== 'Cart'" style="position:relative;" @mouseenter="getCartList">
+          <i class="cart-badge" v-show="cartNum">{{cartNum < 100 ? cartNum : '99'}}</i>
+          <Dropdown placement="bottom-start">
+            <router-link to="cart" target="_blank">
+              <Icon
+                size="18"
+                class="cart-icon"
+                type="ios-cart-outline"
+              ></Icon>
+              购物车
+            </router-link>
+
+            <DropdownMenu slot="list">
+              <div class="shopping-cart-null" style="width:200px" v-show="shoppingCart.length <= 0">
+                <Icon type="ios-cart-outline" class="cart-null-icon"></Icon>
+                <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" />
+                  </div>
+                  <div class="shopping-cart-info">
+                    <div class="shopping-cart-title ">
+                      <p class="hover-pointer goods-title">{{ item.goodsSku.goodsName }}</p>
+                    </div>
+                    <div class="shopping-cart-detail">
+                      <p>
+                        数量:
+                        <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>
+          </Dropdown>
+        </li>
+        <li>
+          <span class="nav-item" @click="shopEntry">店铺入驻</span>
+        </li>
+        <!-- <li>
+          <router-link to="/feedback">意见反馈</router-link>
+        </li>-->
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import storage from '@/plugins/storage.js';
+import {cartGoodsAll, cartCount} from '@/api/cart.js'
+export default {
+  name: 'M-Header',
+  created () {
+    if (storage.getItem('userInfo')) {
+      this.userInfo = JSON.parse(storage.getItem('userInfo'));
+    }
+  },
+
+  data () {
+    return {
+      // 主题颜色切换
+      themeType: 'light',
+      city: '珠海', // 展示城市
+      cityArr: [
+        ['北京', '上海', '天津', '重庆', '广州'],
+        ['深圳', '河南', '辽宁', '吉林', '江苏'],
+        ['江西', '四川', '海南', '贵州', '云南'],
+        ['西藏', '陕西', '甘肃', '青海', '珠海']
+      ],
+      userInfo: {}, // 用户信息
+      shoppingCart: [] // 购物车
+    };
+  },
+  computed: {
+    cartNum () {
+      return this.$store.state.cartNum
+    }
+  },
+  methods: {
+    handleClickTheme () {
+      this.themeType === 'light'
+        ? (this.themeType = 'dark')
+        : (this.themeType = 'light');
+      window.document.documentElement.setAttribute(
+        'data-theme',
+        this.themeType
+      );
+    },
+    changeCity (city) {
+      this.city = city;
+    },
+    goToPay () {
+      let url = this.$router.resolve({
+        path: '/cart'
+      })
+      window.open(url.href, '_blank')
+    },
+    myInfo () {
+      let url = this.$router.resolve({
+        path: '/home'
+      })
+      window.open(url.href, '_blank')
+    },
+    signOutFun () {
+      storage.removeItem('accessToken');
+      storage.removeItem('refreshToken');
+      storage.removeItem('userInfo');
+      this.$router.push('/login');
+    },
+    goUserCenter (path) { // 跳转我的订单，我的足迹
+      if (this.userInfo.username) {
+        this.$router.push({path: path})
+      } 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 () { // 店铺入驻
+      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) {
+        cartCount().then(res => {
+          this.$store.commit('SET_CARTNUM', res.result)
+          this.Cookies.setItem('cartNum', res.result)
+        })
+        cartGoodsAll().then(res => {
+          this.shoppingCart = res.result.skuList
+        })
+      }
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.shopping-cart-detail,
+.shopping-cart-text,
+.shopping-cart-info,
+.nav a,
+.location,
+.first,
+.username,
+.shopping-cart-null span {
+  @include sub_color($light_sub_color);
+}
+.tipsLogin {
+  color: $theme_color;
+}
+
+.box {
+  width: 100%;
+  // height: 35px;
+  @include background_color($light_white_background_color);
+}
+.nav {
+  margin: 0 auto;
+  width: 1200px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.nav ul {
+  list-style: none;
+}
+.nav li {
+  float: left;
+  font-size: 14px;
+  line-height: 35px;
+  margin-right: 15px;
+  font-weight: bold;
+}
+.nav a,.nav-item {
+  text-decoration: none;
+  padding-left: 15px;
+  border-left: 1px solid #ccc;
+  color: #999;
+  cursor: pointer;
+}
+.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;
+  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;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.cart-null-icon {
+  font-size: 38px;
+  margin-bottom: 15px;
+}
+.shopping-cart-null span {
+  font-size: 12px;
+  line-height: 16px;
+}
+.username-p {
+  cursor: pointer;
+}
+.my-page {
+  padding: 3px 5px;
+  width: 180px;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.my-page a {
+  margin: 0px;
+  padding: 0px;
+  border: none;
+}
+.my-info {
+  padding: 5px;
+  width: 50%;
+  height: 100%;
+  text-align: center;
+  cursor: pointer;
+}
+.my-info:hover {
+  box-shadow: 0px 0px 5px #ccc;
+}
+.my-info i {
+  font-size: 28px;
+}
+.my-info p {
+  font-size: 12px;
+}
+.sign-out {
+  padding: 5px;
+  width: 50%;
+  height: 100%;
+  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;
+}
+.cart-icon{
+  padding: 0 6px;
+}
+.goods-title:hover {
+  color: $theme_color;
+}
+.cart-badge {
+  position: absolute;
+  right: -8px;
+  font-style: normal;
+  background-color: $theme_color;
+  color: #fff;
+  font-size: 12px;
+  width: 17px;
+  height: 17px;
+  border-radius: 10px;
+  line-height: 17px;
+  text-align: center;
+  z-index: 3;
+  top: 3px;
+}
+</style>
diff --git a/buyer/src/components/header/ShopHeader.vue b/buyer/src/components/header/ShopHeader.vue
new file mode 100644
index 00000000..3d7ec3e6
--- /dev/null
+++ b/buyer/src/components/header/ShopHeader.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="shop-box">
+    <div class="shop-container">
+      <div class="shop-title">
+        <div class="shop-title-content">
+          <p><router-link :to="`/merchant?id=${skuDetail.storeId}`">{{ skuDetail.storeName }}</router-link></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ShopHeader',
+  props: {
+    detail: {
+      type: Object,
+      default: null
+    }
+  },
+  computed: {
+    skuDetail () {
+      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 {
+  display: flex;
+  flex-direction: row;
+}
+
+.shop-title-icon {
+  font-size: 46px;
+}
+
+.shop-title-content {
+  padding-top: 8px;
+  margin-left: 15px;
+  display: flex;
+}
+
+.shop-title-content p {
+  line-height: 26px;
+  font-size: 20px;
+
+}
+.shop-title-content p:nth-child(2) {
+  font-size: 16px;
+  margin-left: 20px;
+}
+.shop-title-content a {
+  color: #fff;
+}
+
+.shop-another-item {
+  display: flex;
+  flex-direction: row;
+}
+
+.shop-another-item-detail {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-left: 15px;
+}
+
+.shop-another-item-img {
+  height: 80px;
+  border-radius: 40px;
+  overflow: hidden;
+}
+
+.shop-another-item-img img {
+  width: 80px;
+}
+
+.shop-anoter-item-intro {
+  margin-left: 15px;
+}
+</style>
diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue
new file mode 100644
index 00000000..5c9e21a0
--- /dev/null
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="scroll-show">
+    <div class="content clearfix">
+      <cateNav class="cate" :showNavBar="false"></cateNav>
+      <Search class="search-con" :showLogo="false" :showTag="false"></Search>
+      <Icon type="ios-cart-outline" @click="goCartList" class="cart-icon"  @mouseenter.native="getCartList" />
+      <i class="cart-badge">{{cartNum < 100 ? cartNum : '99'}}</i>
+    </div>
+  </div>
+</template>
+<script>
+import {cartCount} from '@/api/cart.js'
+import storage from '@/plugins/storage.js';
+export default {
+  data () {
+    return {
+      userInfo: {} // 用户信息
+    }
+  },
+  computed: {
+    cartNum () { // 购物车数量
+      return this.$store.state.cartNum
+    }
+  },
+  methods: {
+    goCartList () {
+      let routerUrl = this.$router.resolve({
+        path: '/cart'
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    getCartList () { // 获取购物车列表
+      if (storage.getItem('userInfo')) {
+        cartCount().then(res => {
+          this.$store.commit('SET_CARTNUM', res.result)
+          this.Cookies.setItem('cartNum', res.result)
+        })
+      }
+    }
+  },
+  mounted () {
+    if (storage.getItem('userInfo')) {
+      this.userInfo = JSON.parse(storage.getItem('userInfo'));
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .content{
+    width: 1200px;
+    height: 40px;
+    margin: 10px auto;
+    position: relative;
+  }
+  .cate {
+    float: left;
+    width: 200px!important;
+  }
+  .search-con{
+    float: left;
+    width: 800px;
+    overflow: hidden;
+    margin-top: -27px;
+  }
+  .cart-icon {
+    width: 30px;
+    float: left;
+    font-size: 25px;
+    margin-top: 8px;
+    color: $theme_color;
+    z-index: 1;
+    position: relative;
+    &:hover{
+      cursor: pointer;
+    }
+  }
+  .cart-badge {
+    position: absolute;
+    font-style: normal;
+    right: 165px;
+    display: block;
+    background-color: $theme_color;
+    color: #fff;
+    font-size: 12px;
+    width: 17px;
+    height: 17px;
+    border-radius: 10px;
+    line-height: 17px;
+    text-align: center;
+    z-index: 5;
+    top: 3px;
+  }
+</style>
diff --git a/buyer/src/components/indexDecorate/modelForm.vue b/buyer/src/components/indexDecorate/modelForm.vue
new file mode 100644
index 00000000..192f93f8
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelForm.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="model-form">
+    <div class="model-content">
+      <template v-for="(element, index) in data.list">
+        <model-form-item
+          v-if="element && element.key"
+          :key="element.key"
+          :element="element"
+          :index="index"
+          :data="data"
+        ></model-form-item>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import ModelFormItem from './modelFormItem.vue';
+export default {
+  name: 'modelForm',
+  components: {
+    ModelFormItem
+  },
+  props: ['data']
+};
+</script>
+<style lang="scss" scoped>
+.model-content {
+  width: 1200px;
+  margin: 0 auto;
+  background: #fff;
+  min-height: 1200px;
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelFormItem.vue b/buyer/src/components/indexDecorate/modelFormItem.vue
new file mode 100644
index 00000000..0d76d6fa
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelFormItem.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="model-item" v-if="element && element.key">
+    <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
+    <template v-if="element.type == 'carousel'">
+      <model-carousel :data="element"></model-carousel>
+    </template>
+    <!-- 热门广告 -->
+    <template v-if="element.type == 'hotAdvert'">
+      <div>
+        <img
+          style="display: block"
+          class="hover-pointer"
+          :src="element.options.list[0].img"
+          @click="linkTo(element.options.list[0].url)"
+          width="1200"
+          alt=""
+        />
+      </div>
+      <ul class="advert-list">
+        <template v-for="(item, index) in element.options.list">
+          <li
+            v-if="index !== 0"
+            @click="linkTo(item.url)"
+            class="hover-pointer"
+            :key="index"
+          >
+            <img :src="item.img" width="230" height="190" alt="" />
+          </li>
+        </template>
+      </ul>
+    </template>
+    <!-- 限时秒杀 待完善 -->
+    <!-- <template v-if="element.type == 'seckill'">
+      <seckill :data="element"></seckill>
+    </template> -->
+    <!-- 折扣广告 -->
+    <template v-if="element.type == 'discountAdvert'">
+      <div
+        class="discountAdvert"
+        :style="{
+          'background-image': 'url(' + element.options.bgImg.img + ')',
+        }"
+      >
+        <img
+          @click="linkTo(item.url)"
+          class="hover-pointer"
+          v-for="(item, index) in element.options.classification"
+          :key="index"
+          :src="item.img"
+          width="190"
+          height="210"
+          alt=""
+        />
+        <img
+          @click="linkTo(item.url)"
+          class="hover-pointer"
+          v-for="(item, index) in element.options.brandList"
+          :key="'discount' + index"
+          :src="item.img"
+          width="240"
+          height="105"
+          alt=""
+        />
+      </div>
+    </template>
+
+    <!-- 好货推荐 -->
+    <template v-if="element.type == 'recommend'">
+      <recommend :data="element"></recommend>
+    </template>
+    <!-- 新品排行 -->
+    <template v-if="element.type == 'newGoodsSort'">
+      <new-goods-sort :data="element"></new-goods-sort>
+    </template>
+    <!-- 首页广告 -->
+    <template v-if="element.type == 'firstAdvert'">
+      <first-page-advert :data="element"></first-page-advert>
+    </template>
+    <!-- 横幅广告 -->
+    <template v-if="element.type == 'bannerAdvert'">
+      <img
+        width="1200"
+        class="hover-pointer"
+        @click="linkTo(element.options.url)"
+        :src="element.options.img"
+        alt=""
+      />
+    </template>
+    <template v-if="element.type == 'notEnough'">
+      <not-enough :data="element"></not-enough>
+    </template>
+  </div>
+</template>
+
+<script>
+import ModelCarousel from './modelList/carousel.vue';
+import FirstPageAdvert from './modelList/firstPageAdvert.vue';
+import NewGoodsSort from './modelList/newGoodsSort.vue';
+import Recommend from './modelList/recommend.vue';
+import NotEnough from './modelList/notEnough.vue';
+import Seckill from './modelList/seckill.vue';
+
+export default {
+  name: 'modelFormItem',
+  props: ['element', 'select', 'index', 'data'],
+  components: {
+    ModelCarousel,
+    Recommend,
+    NewGoodsSort,
+    FirstPageAdvert,
+    NotEnough,
+    Seckill
+  },
+  data () {
+    return {
+      showModal: false, // 控制模态框显隐
+      selected: {} // 已选数据
+    };
+  }
+};
+</script>
+<style lang="scss" scoped>
+.model-item {
+  position: relative;
+  margin-bottom: 20px;
+  &:hover {
+    .del-btn {
+      display: block;
+    }
+  }
+}
+.del-btn {
+  width: 100px;
+  height: 100px;
+  display: none;
+  position: absolute;
+  right: -100px;
+  top: 0;
+  &:hover {
+    display: block;
+  }
+}
+
+/** 热门广告 */
+.advert-list {
+  background: $theme_color;
+  height: 200px;
+  display: flex;
+  justify-content: space-around;
+  padding: 3px 10px;
+  > li {
+    img {
+      cursor: pointer;
+      border-radius: 10px;
+      transition: all 150ms ease-in-out;
+      &:hover {
+        transform: translateY(-3px);
+        box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
+      }
+    }
+  }
+}
+/** 限时秒杀 */
+.limit-img {
+  display: flex;
+  flex-direction: row;
+  img {
+    width: 300px;
+    height: 100px;
+  }
+}
+/** 折扣广告 */
+.discountAdvert {
+  height: 566px;
+  background-repeat: no-repeat;
+  margin-left: -97px;
+  position: relative;
+  padding-left: 295px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: start;
+  img {
+    margin-top: 10px;
+    margin-right: 10px;
+    transition: all 150ms ease-in-out;
+    &:hover {
+      box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
+      transform: translateY(-2px);
+    }
+  }
+}
+/** 首页品牌 */
+.brand {
+  .brand-view {
+    display: flex;
+    margin-top: 10px;
+    .brand-view-content {
+      width: 470px;
+      margin-left: 10px;
+      img {
+        width: 100%;
+        height: 316px;
+      }
+      .brand-view-title {
+        height: 50px;
+        padding: 0 5px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+    }
+    .brand-view-content:first-child {
+      width: 240px;
+      margin-left: 0;
+    }
+  }
+  .brand-list {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    li {
+      width: 121px;
+      height: 112px;
+      position: relative;
+      overflow: hidden;
+      border: 1px solid #f5f5f5;
+      margin: -1px -1px 0 0;
+      &:hover {
+        .brand-mash {
+          display: flex;
+        }
+      }
+      .brand-img {
+        text-align: center;
+        margin-top: 30px;
+        img {
+          width: 100px;
+          height: auto;
+        }
+      }
+      .brand-mash {
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: rgba(0, 0, 0, 0.5);
+        width: inherit;
+        height: inherit;
+        font-size: 12px;
+        font-weight: bold;
+        .ivu-icon {
+          position: absolute;
+          right: 10px;
+          top: 10px;
+          font-size: 15px;
+        }
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        color: #fff;
+        cursor: pointer;
+        div:last-child {
+          background-color: $theme_color;
+          border-radius: 9px;
+          padding: 0 10px;
+          margin-top: 5px;
+        }
+      }
+    }
+    .refresh {
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+      .ivu-icon {
+        font-size: 18px;
+        transition: all 0.3s ease-out;
+      }
+      &:hover {
+        background-color: $theme_color;
+        color: #fff;
+        .ivu-icon {
+          transform: rotateZ(360deg);
+        }
+      }
+    }
+  }
+}
+
+/** 装修模态框 内部样式start */
+.modal-top-advert {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  > * {
+    margin-bottom: 10px;
+  }
+}
+</style>
+
diff --git a/buyer/src/components/indexDecorate/modelList/carousel.vue b/buyer/src/components/indexDecorate/modelList/carousel.vue
new file mode 100644
index 00000000..0c737399
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/carousel.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="model-carousel">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航占位 -->
+      <div class="nav-side"></div>
+      <div class="nav-content">
+        <!-- 轮播图 -->
+        <Carousel autoplay>
+          <CarouselItem v-for="(item, index) in data.options.list" :key="index">
+            <div style="overflow: hidden">
+              <img
+                :src="item.img"
+                width="790"
+                @click="linkTo(item.url)"
+                height="340"
+                class="hover-pointer"
+              />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+      <div class="nav-right">
+        <div class="person-msg">
+          <img :src="userInfo.face" v-if="userInfo.face" alt />
+          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
+          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div v-if="userInfo.id">
+            <Button type="error" shape="circle" @click="$router.push('home')">会员中心</Button>
+          </div>
+          <div v-else>
+            <Button type="error" @click="$router.push('login')" shape="circle"
+              >请登录</Button
+            >
+          </div>
+        </div>
+        <div class="shop-msg">
+          <div>
+            <span>常见问题</span>
+            <ul class="article-list">
+              <li class="ellipsis" :alt="article.title" v-for="(article, index) in articleList" :key="index" @click="goArticle(article.id)">
+                {{article.title}}
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {articleList} from '@/api/common.js'
+import storage from '@/plugins/storage';
+export default {
+  name: 'modelCarousel',
+  props: ['data'],
+  data () {
+    return {
+      userInfo: {}, // 用户信息
+      articleList: [], // 常见问题
+      params: { // 请求常见问题参数
+        pageNumber: 1,
+        pageSize: 5,
+        type: 'ANNOUNCEMENT',
+        sort: 'sort'
+      }
+    };
+  },
+  methods: {
+    getArticleList () {
+      articleList(this.params).then(res => {
+        if (res.success) {
+          this.articleList = res.result.records
+        }
+      })
+    },
+    goArticle (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/article',
+        query: {id}
+      });
+      window.open(routeUrl.href, '_blank');
+    }
+  },
+  mounted () {
+    if (storage.getItem('userInfo')) this.userInfo = JSON.parse(storage.getItem('userInfo'));
+    this.getArticleList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.model-carousel {
+  width: 1200px;
+  height: 340px;
+  overflow: hidden;
+}
+
+/* 导航主体 */
+.nav-body {
+  width: 1200px;
+  height: 340px;
+  margin: 0px auto;
+}
+
+.nav-side {
+  height: 100%;
+  width: 200px;
+  float: left;
+  padding: 0px;
+  color: #fff;
+  background-color: #6e6568;
+}
+
+/*导航内容*/
+.nav-content {
+  width: 790px;
+  overflow: hidden;
+  float: left;
+  position: relative;
+}
+.nav-right {
+  float: left;
+  width: 210px;
+  .person-msg {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    margin: 20px auto;
+    button {
+      height: 25px !important;
+      margin-top: 10px;
+    }
+    .ivu-btn-default {
+      color: $theme_color;
+      border-color: $theme_color;
+    }
+    img {
+      margin-bottom: 10px;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+  }
+  .shop-msg {
+    div {
+      width: 100%;
+      margin: 10px 27px;
+      span {
+        cursor: pointer;
+        text-align: center;
+        font-weight: bold;
+        margin-left: 5px;
+      }
+      span:nth-child(1) {
+        @include content_color($theme_color);
+        margin-left: 0;
+      }
+      span:nth-child(2) {
+        font-weight: normal;
+      }
+      span:nth-child(3):hover {
+        color: $theme_color;
+      }
+    }
+    ul {
+      li {
+        cursor: pointer;
+        margin: 5px 0;
+        color: #999395;
+        width: 150px;
+        font-size: 12px;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
new file mode 100644
index 00000000..270e6377
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="first-page-advert">
+    <div
+      class="item hover-pointer"
+      @click="linkTo(item.url)"
+      :style="{
+        backgroundImage: `linear-gradient(to right, ${item.fromColor}, ${item.toColor})`,
+      }"
+      v-for="(item, index) in options.list"
+      :key="index"
+    >
+      <div>
+        <span class="line top-line"></span>
+        <p>{{ item.name }}</p>
+        <span class="line btm-line"></span>
+        <p>{{ item.describe }}</p>
+      </div>
+      <img :src="item.img" width="170" height="170" alt="" />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      options: this.data.options // 装修数据
+    };
+  },
+  methods: {}
+};
+</script>
+<style lang="scss" scoped>
+.first-page-advert {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  // margin-top: -10px;
+  .item {
+    width: 393px;
+    height: 170px;
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    img {
+      margin-left: 20px;
+      transition: transform 0.5s, -webkit-transform 0.5s, -moz-transform 0.5s;
+      &:hover {
+        transform: translateX(-5px);
+      }
+    }
+
+    &:nth-of-type(1),
+    &:nth-of-type(2),
+    &:nth-of-type(3) {
+      margin-top: 0;
+    }
+
+    p:nth-of-type(1) {
+      margin: 3px 0;
+      font-size: 18px;
+      color: #fff;
+    }
+    p:nth-of-type(2) {
+      margin-top: 3px;
+      color: #fff;
+    }
+  }
+  .line {
+    position: relative;
+    display: block;
+    height: 2px;
+    background: url(../../../assets/images/festival_icon.png);
+    z-index: 1;
+  }
+  .top-line {
+    width: 78px;
+    background-position: -1px -3px;
+  }
+  .btm-line {
+    background-position: 0 -11px;
+    width: 154px;
+  }
+}
+.modal-top-advert {
+  align-items: start;
+  padding: 0 30px;
+  .exhibition {
+    width: 300px;
+    height: 50px;
+  }
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue b/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue
new file mode 100644
index 00000000..0508d78c
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/newGoodsSort.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="new-goods">
+    <div class="left">
+      <div class="top-header" :style="{ background: options.left.bgColor }">
+        <span>{{ options.left.title }}</span>
+        <span @click="linkTo(options.left.url)" class="hover-pointer"
+          >{{ options.left.secondTitle }} &gt;</span
+        >
+      </div>
+      <div class="content">
+        <div
+          class="con-item hover-pointer"
+          v-for="(item, index) in options.left.list"
+          :key="index"
+          @click="linkTo(item.url)"
+        >
+          <div>
+            <p>{{ item.name }}</p>
+            <p class="describe">{{ item.describe }}</p>
+          </div>
+          <img :src="item.img" alt="" />
+        </div>
+      </div>
+    </div>
+
+    <div class="middle">
+      <div class="top-header" :style="{ background: options.middle.bgColor }">
+        <span>{{ options.middle.title }}</span>
+        <span class="hover-pointer" @click="linkTo(options.middle.url)"
+          >{{ options.middle.secondTitle }} &gt;</span
+        >
+      </div>
+      <div class="content">
+        <div
+          class="con-item hover-pointer"
+          v-for="(item, index) in options.middle.list"
+          :key="index"
+          @click="linkTo(item.url)"
+        >
+          <div>
+            <p>{{ item.name }}</p>
+            <p class="describe">{{ item.describe }}</p>
+          </div>
+          <img :src="item.img" alt="" />
+        </div>
+      </div>
+    </div>
+
+    <div class="right">
+      <div class="top-header" :style="{ background: options.right.bgColor }">
+        <span>{{ options.right.title }}</span>
+        <span @click="linkTo(options.right.url)" class="hover-pointer"
+          >{{ options.right.secondTitle }} &gt;</span
+        >
+      </div>
+      <div class="content">
+        <div
+          v-for="(item, index) in options.right.list"
+          :key="index"
+          class="hover-pointer"
+          @click="linkTo(item.url)"
+        >
+          <img :src="item.img" alt="" />
+          <p>{{ item.name }}</p>
+          <p>{{ item.price | unitPrice("￥") }}</p>
+          <div class="jiaobiao" :class="'jiaobiao' + (index + 1)">
+            {{ index + 1 }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      options: this.data.options // 装修数据
+    };
+  },
+  methods: {}
+};
+</script>
+<style lang="scss" scoped>
+.new-goods {
+  display: flex;
+  justify-content: space-between;
+  > div {
+    width: 393px;
+    height: 440px;
+  }
+
+  .left > .content {
+    > div:nth-child(1) {
+      height: 240px;
+      flex-direction: column;
+      border: 1px solid #eee;
+      border-top: none;
+      border-left: none;
+      justify-content: space-between;
+      img {
+        width: 160px;
+        height: 160px;
+      }
+      .describe {
+        margin-top: 10px;
+      }
+    }
+    > div:nth-child(2) {
+      border-right: 1px solid #eee;
+    }
+    > div:nth-child(3),
+    > div:nth-child(4) {
+      border-bottom: 1px solid #eee;
+    }
+  }
+
+  .middle > .content {
+    > div {
+      border-style: solid;
+      border-color: #eee;
+      border-width: 0;
+      border-bottom-width: 1px;
+    }
+    > div:nth-child(1),
+    > div:nth-child(2),
+    > div:nth-child(3) {
+      border-right-width: 1px;
+    }
+    > div:nth-child(6),
+    > div:nth-child(3) {
+      border-bottom-width: 0;
+    }
+  }
+
+  .right > .content {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    font-size: 12px;
+    > div {
+      position: relative;
+      width: 120px;
+      padding: 5px 10px 0 10px;
+      img {
+        width: 100px;
+        height: 100px;
+      }
+      border-bottom: 1px solid #eee;
+      :nth-child(2) {
+        height: 38px;
+        overflow: hidden;
+      }
+      :nth-child(3) {
+        color: $theme_color;
+        margin-top: 5px;
+      }
+      .jiaobiao {
+        position: absolute;
+        width: 23px;
+        height: 23px;
+        top: 10px;
+        right: 16px;
+        background: url(../../../assets/images/festival_icon.png);
+        color: #fff;
+        text-align: center;
+      }
+      .jiaobiao1,
+      .jiaobiao4 {
+        background-position: -2px -30px;
+      }
+      .jiaobiao2,
+      .jiaobiao5 {
+        background-position: -31px -30px;
+      }
+      .jiaobiao3,
+      .jiaobiao6 {
+        background-position: -60px -30px;
+      }
+    }
+    > div:nth-child(4),
+    > div:nth-child(5),
+    > div:nth-child(6) {
+      border: none;
+    }
+  }
+
+  .top-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 50px;
+    padding: 0 10px;
+    background: #c43d7e;
+    color: #fff;
+    span:nth-child(1) {
+      font-size: 20px;
+    }
+    span:nth-child(2) {
+      font-size: 12px;
+    }
+  }
+  .content {
+    padding: 10px 12px 0;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: column;
+    height: 370px;
+  }
+  .con-item {
+    width: 185px;
+    height: 120px;
+    display: flex;
+    padding-left: 10px;
+    padding-top: 10px;
+    img {
+      width: 90px;
+      height: 90px;
+      margin-top: 10px;
+    }
+  }
+  .describe {
+    color: #999;
+    font-size: 12px;
+    margin-top: 15px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/buyer/src/components/indexDecorate/modelList/notEnough.vue b/buyer/src/components/indexDecorate/modelList/notEnough.vue
new file mode 100644
index 00000000..4a5cb6ff
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/notEnough.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="not-enough">
+    <ul class="nav-bar">
+      <li
+        v-for="(item, index) in conData.options.navList"
+        :class="currentIndex === index ? 'curr' : ''"
+        @click="changeCurr(index)"
+        :key="index"
+      >
+        <p>{{ item.title }}</p>
+        <p>{{ item.desc }}</p>
+      </li>
+    </ul>
+    <div class="content" v-if="showContent">
+      <div
+        v-for="(item, index) in conData.options.list[currentIndex]"
+        :key="index"
+        class="hover-pointer"
+        @click="linkTo(item.url)"
+      >
+        <img :src="item.img" width="210" height="210" :alt="item.name" />
+        <p>{{ item.name }}</p>
+        <p>
+          <span>{{ Number(item.price) | unitPrice("￥") }}</span>
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      currentIndex: 0, // 当前分类下标
+      conData: this.data, // 装修数据
+      showContent: true // 是否展示内容
+    };
+  },
+  watch: {
+    data: function (val) {
+      this.conData = val;
+    },
+    conData: function (val) {
+      this.$emit('content', val);
+    }
+  },
+  mounted () {},
+  methods: {
+    changeCurr (index) {
+      this.currentIndex = index;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.nav-bar {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  margin-bottom: 10px;
+  background-color: rgb(218, 217, 217);
+  height: 60px;
+  align-items: center;
+  position: relative;
+  li {
+    padding: 0 30px;
+    text-align: center;
+    p:nth-child(1) {
+      font-size: 16px;
+      border-radius: 50px;
+      padding: 0 7px;
+    }
+
+    p:nth-child(2) {
+      font-size: 14px;
+      color: #999;
+    }
+
+    &:hover {
+      p {
+        color: $theme_color;
+      }
+      cursor: pointer;
+    }
+    border-right: 1px solid #eee;
+  }
+  li:last-of-type {
+    border: none;
+  }
+
+  .curr {
+    p:nth-child(1) {
+      background-color: $theme_color;
+
+      color: #fff;
+    }
+    p:nth-child(2) {
+      color: $theme_color;
+    }
+  }
+}
+
+.content {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  > div {
+    padding: 10px;
+    box-sizing: border-box;
+    border: 1px solid #eee;
+    margin-bottom: 10px;
+
+    &:hover {
+      border-color: $theme_color;
+      color: $theme_color;
+    }
+
+    p:nth-of-type(1) {
+      overflow: hidden;
+      width: 210px;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin: 10px 0 5px 0;
+    }
+    p:nth-of-type(2) {
+      color: $theme_color;
+      font-size: 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      span:nth-child(2) {
+        text-decoration: line-through;
+        font-size: 12px;
+        color: #999;
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelList/recommend.vue b/buyer/src/components/indexDecorate/modelList/recommend.vue
new file mode 100644
index 00000000..eefa0aa3
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/recommend.vue
@@ -0,0 +1,217 @@
+<template>
+  <div class="recommend">
+    <div class="recommend-left">
+      <div class="head-recommend" :style="{ background: msgLeft.bgColor }">
+        <span>{{ msgLeft.title }}</span>
+        <span class="hover-pointer" @click="linkTo(msgLeft.url)">{{ msgLeft.secondTitle }}&gt;</span>
+      </div>
+      <div class="content-left">
+        <div>
+          <img class="hover-pointer"  @click="linkTo(msgLeft.list[0].url)" :src="msgLeft.list[0].img" width="160" height="160" alt="" />
+          <div class="margin-left">{{ msgLeft.list[0].name }}</div>
+          <div class="margin-left">{{ msgLeft.list[0].describe }}</div>
+          <Button
+            size="small"
+            :style="{ background: msgLeft.bgColor }"
+            @click="linkTo(msgLeft.list[0].url)"
+            class="fz_12 view-btn"
+            >点击查看</Button
+          >
+        </div>
+        <div>
+          <template v-for="(item, index) in msgLeft.list">
+            <div v-if="index != 0" :key="index" @click="linkTo(item.url)" class="hover-pointer">
+              <img :src="item.img" width="80" height="80" alt="" />
+              <div>
+                <div>{{ item.name }}</div>
+                <div>{{ item.describe }}</div>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+    </div>
+
+    <div class="recommend-right">
+      <div class="head-recommend" :style="{ background: msgRight.bgColor }">
+        <span>{{ msgRight.title }}</span>
+        <span @click="linkTo(msgRight.url)" class="hover-pointer"
+          >{{ msgRight.secondTitle }}&gt;</span
+        >
+      </div>
+      <div class="content-right">
+        <div
+          v-for="(item, index) in msgRight.list"
+          :key="index"
+          @click="linkTo(item.url)" class="hover-pointer"
+        >
+          <div class="right-item" :style="{'border': index===2 || index===3 ?'none': ''}">
+            <div>
+              <span :style="{ background: msgRight.bgColor }">{{item.name}}</span>
+              <span>{{ item.describe }}</span>
+            </div>
+            <div class="right-img">
+              <img :src="item.img" alt="" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  data () {
+    return {
+      msgLeft: this.data.options.contentLeft, // 左侧数据
+      msgRight: this.data.options.contentRight // 右侧数据
+    };
+  },
+  methods: {}
+};
+</script>
+<style lang="scss" scoped>
+.recommend {
+  display: flex;
+  justify-content: space-between;
+  .recommend-left {
+    width: 595px;
+    .content-left {
+      display: flex;
+      padding-top: 10px;
+      font-size: 12px;
+      > div:nth-child(1) {
+        width: 189px;
+        border-right: 1px solid #eee;
+        height: 360px;
+        img {
+          margin: 40px 0 0 15px;
+        }
+        .margin-left {
+          margin-left: 15px;
+          width: 145px;
+        }
+        div:nth-of-type(1) {
+          font-weight: bold;
+          border-top: 1px solid #eee;
+          padding-top: 10px;
+          padding-bottom: 10px;
+        }
+        div:nth-of-type(2) {
+          color: #999;
+        }
+        .view-btn {
+          margin-left: 15px;
+          margin-top: 10px;
+          color: #fff;
+        }
+      }
+      > div:nth-child(2) {
+        width: 405px;
+        display: flex;
+        flex-wrap: wrap;
+        > div {
+          display: flex;
+          align-items: center;
+          width: 200px;
+          height: 120px;
+          img {
+            margin: 0 10px;
+          }
+          > div:nth-child(2) {
+            :nth-child(2) {
+              color: #449dae;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .recommend-right {
+    width: 595px;
+    height: 360px;
+    .head-recommend {
+      background: #a25684;
+    }
+    .content-right {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: center;
+      padding-top: 10px;
+      > div {
+        width: 50%;
+        text-align: center;
+        height: 180px;
+        padding-top: 10px;
+        .right-item {
+          border-bottom: 1px solid #eee;
+          display: flex;
+          margin-top: 30px;
+          margin-left: 5px;
+          margin-right: 5px;
+          height: 150px;
+          padding: 0 10px;
+          font-size: 12px;
+          >div:nth-child(1) {
+            width: 130px;
+            margin-top: 30px;
+            span:nth-child(1){
+                color: #fff;
+                border-radius: 10px;
+                padding: 0 5px;
+                background-color: #a25684;
+                display: block;
+                width: 120px;
+                overflow: hidden;
+                white-space: nowrap;
+                margin: 0 10px 10px 0;
+            }
+            span:nth-child(2) {
+                font-size: 12px;
+                color: #666;
+                display: block;
+            }
+          }
+          .right-img {
+            width: 100;
+            height: 100px;
+            text-align: center;
+            margin: 0 auto;
+            img{
+                max-height: 100px;
+                max-width: 100px;
+            }
+          }
+        }
+      }
+      > div:nth-child(n + 1) {
+        border-right: 1px solid #eee;
+      }
+    }
+  }
+
+  .head-recommend {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 50px;
+    padding: 0 10px;
+    background: #449dae;
+    color: #fff;
+    span:nth-child(1) {
+      font-size: 20px;
+    }
+    span:nth-child(2) {
+      font-size: 12px;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/components/indexDecorate/modelList/seckill.vue b/buyer/src/components/indexDecorate/modelList/seckill.vue
new file mode 100644
index 00000000..2eb8c351
--- /dev/null
+++ b/buyer/src/components/indexDecorate/modelList/seckill.vue
@@ -0,0 +1,289 @@
+<template>
+  <div class="seckill">
+    <div class="aside hover-pointer" @click="goPromotion">
+      <div class="title">{{ actName }}</div>
+      <div class="hour">
+        <span>{{ currHour }}:00</span>点场 倒计时
+      </div>
+      <div class="count-down" v-if="actStatus === 1">
+        <span>{{ hours }}</span
+        ><span>{{ minutes }}</span
+        ><span>{{ seconds }}</span>
+      </div>
+      <div class="act-status" v-else>
+        {{ actStatus == 0 ? "未开始" : "已结束" }}
+      </div>
+    </div>
+    <div class="section">
+      <swiper ref="mySwiper" :options="swiperOptions">
+        <swiper-slide
+          v-for="(item, index) in options.list[0].goodsList"
+          :key="index"
+          class="swiper-slide"
+        >
+          <div class="content hover-pointer" @click="goPromotion">
+            <img :src="item.img" width="140" height="140" :alt="item.name" />
+            <div class="ellipsis">{{ item.name }}</div>
+            <div>
+              <span>{{ item.price | unitPrice("￥") }}</span>
+              <span>{{ item.originalPrice | unitPrice("￥") }}</span>
+            </div>
+          </div>
+        </swiper-slide>
+      </swiper>
+    </div>
+  </div>
+</template>
+<script>
+import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper';
+import 'swiper/swiper-bundle.css';
+export default {
+  components: {
+    Swiper,
+    SwiperSlide
+  },
+  directives: {
+    swiper: directive
+  },
+  props: {
+    data: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      options: this.data.options, // 装修数据
+      actStatus: 0, // 0 未开始  1 进行中   2 已结束
+      actName: '限时秒杀', // 活动名称
+      currHour: '00', // 当前秒杀场
+      diffSeconds: 0, // 倒计时秒数
+      days: 0, // 天
+      hours: 0, // 小时
+      minutes: 0, // 分钟
+      seconds: 0, // 秒
+      interval: undefined, // 定时器
+      swiperOptions: { // 轮播图参数
+        slidesPerView: 5,
+        autoplay: true,
+        loop: true
+      }
+    };
+  },
+  watch: {
+    diffSeconds (val) {
+      const hours = Math.floor(val / 3600);
+      // 当前秒数 / 60，向下取整
+      // 获取到所有分钟数 3600 / 60 = 60分钟
+      // 对60取模，超过小时数的分钟数
+      const minutes = Math.floor(val / 60) % 60;
+      // 当前的秒数 % 60，获取到 超过小时数、分钟数的秒数（秒数）
+      const seconds = val % 60;
+      this.hours = hours < 10 ? '0' + hours : hours;
+      this.minutes = minutes < 10 ? '0' + minutes : minutes;
+      this.seconds = seconds < 10 ? '0' + seconds : seconds;
+
+      if (val === 0) {
+        clearInterval(this.interval);
+        this.hours = 0;
+        this.minutes = 0;
+        this.seconds = 0;
+        this.countDown(this.options.list);
+      }
+    }
+  },
+  mounted () {
+    this.countDown(this.options.list);
+  },
+  beforeDestroy () {
+    clearInterval(this.interval);
+  },
+  methods: {
+    // 倒计时
+    countDown (list) {
+      /**
+       * 默认倒计时两小时
+       * 如果没有开始，则显示未开始
+       * 进行中显示倒计时 + 时间
+       * 今天的秒杀结束则显示已结束
+       */
+      let nowHour = new Date().getHours();
+      if (nowHour < Number(list[0].time)) {
+        // 活动未开始
+        this.currHour = list[0].time;
+        this.actStatus = 0;
+      } else if (nowHour >= Number(list[list.length - 1].time + 2)) {
+        // 活动已结束
+        this.actStatus = 2;
+        this.currHour = list[list.length - 1].time;
+      } else {
+        // 活动进行中
+        this.actStatus = 1;
+        for (let i = 0; i < list.length; i++) {
+          if (nowHour === Number(list[i].time)) {
+            this.currHour = list[i].time;
+          }
+          if (
+            nowHour > Number(list[i].time) &&
+            nowHour < Number(list[i].time + 2)
+          ) {
+            this.currHour = list[i].time;
+          }
+        }
+        // 当前0点时间戳
+        let zeroTime = new Date(new Date().toLocaleDateString()).getTime();
+        // 活动倒计时
+        this.diffSeconds = Math.floor((zeroTime + 3600 * 1000 * (this.currHour + 2) - new Date().getTime()) / 1000);
+        this.interval = setInterval(() => {
+          this.diffSeconds--;
+        }, 1000);
+      }
+    },
+    goPromotion () {
+      let routeUrl = this.$router.resolve({
+        path: '/seckill'
+      });
+      window.open(routeUrl.href, '_blank');
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.seckill {
+  width: 100%;
+  height: 260px;
+  display: flex;
+  .aside {
+    overflow: hidden;
+    width: 190px;
+    height: 100%;
+    color: #fff;
+    background-image: url("../../../assets/images/seckillBg.png");
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 28px;
+      margin-top: 31px;
+    }
+
+    .hour {
+      margin-top: 90px;
+      text-align: center;
+      span {
+        font-size: 18px;
+      }
+    }
+
+    .count-down {
+      margin: 10px 0 0 30px;
+      > span {
+        position: relative;
+        float: left;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        background-color: #2f3430;
+        margin-right: 20px;
+        color: white;
+        font-size: 20px;
+        &::after {
+          content: ":";
+          display: block;
+          position: absolute;
+          right: -20px;
+          font-weight: bolder;
+          font-size: 18px;
+          width: 20px;
+          height: 100%;
+          top: 0;
+        }
+      }
+      > span:last-child::after {
+        content: "";
+      }
+    }
+
+    .act-status {
+      margin: 10px 0 0 65px;
+      font-size: 20px;
+    }
+  }
+
+  .section {
+    width: 1000px;
+    // background: #efefef;
+    .swiper-slide {
+      height: 260px;
+      .content {
+        width: 200px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        position: relative;
+        &::after {
+          content: "";
+          display: block;
+          position: absolute;
+          top: 50%;
+          right: 0;
+          width: 1px;
+          height: 200px;
+          transform: translateY(-50%);
+          background: linear-gradient(180deg, white, #eeeeee, white);
+        }
+        img {
+          margin-top: 30px;
+        }
+        > div {
+          width: 160px;
+          margin-top: 10px;
+          font-size: 12px;
+          position: relative;
+        }
+        > div:nth-of-type(1):hover {
+          color: $theme_color;
+          cursor: pointer;
+        }
+        > div:nth-of-type(2) {
+          border: 1px solid $theme_color;
+          line-height: 24px;
+          display: flex;
+          text-align: center;
+
+          span:nth-child(1) {
+            color: #fff;
+            font-size: 16px;
+            width: 92px;
+            background-color: $theme_color;
+            position: relative;
+            &::before {
+              content: " ";
+              width: 0;
+              height: 0;
+              border-color: transparent white transparent transparent;
+              border-style: solid;
+              border-width: 24px 8px 0 0;
+              position: absolute;
+              top: 0;
+              left: 84px;
+            }
+          }
+
+          span:nth-child(2) {
+            color: #999;
+            width: 66px;
+            text-decoration: line-through;
+          }
+        }
+      }
+    }
+  }
+}
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>
diff --git a/buyer/src/components/invoiceModal/README.md b/buyer/src/components/invoiceModal/README.md
new file mode 100644
index 00000000..3abb8783
--- /dev/null
+++ b/buyer/src/components/invoiceModal/README.md
@@ -0,0 +1,3 @@
+## 此组件为结算页面修改发票信息使用 后续可以复用到个人信息添加发票页面
+
+### 目前没有参数，之后会设置一个参数接收历史的单位发票数据
\ No newline at end of file
diff --git a/buyer/src/components/invoiceModal/index.vue b/buyer/src/components/invoiceModal/index.vue
new file mode 100644
index 00000000..608ac538
--- /dev/null
+++ b/buyer/src/components/invoiceModal/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="invoice-modal">
+    <Modal v-model="invoiceAvailable" width="600" footer-hide>
+      <p slot="header">
+        <span>发票信息</span>
+      </p>
+      <!-- <div>
+                <div>为响应环保，自营全面启用电子普通发票，非自营发票由第三方商家实际开具。</div>
+                <div>电子普通发票是税务机关认可的有效收付款凭证，与纸质普通发票具有同等法律效力，可用于报销入账、售后维权等。</div>
+                <div>如商品由第三方卖家销售，发票类型及内容将由该卖家决定。</div>
+            </div> -->
+      <!-- 普通发票 -->
+      <div class="nav-content">
+        <Form
+          :model="invoiceForm"
+          ref="form"
+          label-position="left"
+          :rules="ruleInline"
+          :label-width="110"
+        >
+          <FormItem label="发票类型">
+            <RadioGroup v-model="invoiceForm.type">
+              <Radio :label="1">个人</Radio>
+              <Radio :label="2">单位</Radio>
+            </RadioGroup>
+          </FormItem>
+          <FormItem
+            label="发票抬头"
+            v-if="invoiceForm.type == 2"
+            prop="receiptTitle"
+          >
+            <i-input v-model="invoiceForm.receiptTitle"></i-input>
+          </FormItem>
+          <FormItem
+            label="纳税人识别号"
+            v-if="invoiceForm.type == 2"
+            prop="taxpayerId"
+          >
+            <i-input v-model="invoiceForm.taxpayerId"></i-input>
+          </FormItem>
+          <FormItem label="发票内容">
+            <RadioGroup v-model="invoiceForm.receiptContent">
+              <Radio label="不开发票">不开发票</Radio>
+              <Radio label="商品明细">商品明细</Radio>
+            </RadioGroup>
+          </FormItem>
+        </Form>
+        <div style="text-align: center">
+          <Button type="primary" :loading="loading" @click="save">保存发票信息</Button>
+          <Button type="default" @click="invoiceAvailable = false">取消</Button>
+        </div>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import { saveReceipt } from '@/api/member.js';
+import { TINumber } from '@/plugins/RegExp.js';
+export default {
+  name: 'invoiceModal',
+  data () {
+    return {
+      invoiceAvailable: false, // 模态框显隐
+      loading: false, // 提交状态
+      invoiceForm: { // 发票表单
+        // 普票表单
+        receiptTitle: '', // 发票抬头
+        taxpayerId: '', // 纳税人识别号
+        receiptContent: '不开发票', // 发票内容
+        type: 1 // 1 个人 2 单位
+      },
+      ruleInline: {
+        receiptTitle: [{ required: true, message: '请填写公司名称' }],
+        taxpayerId: [
+          { required: true, message: '请填写纳税人识别号' },
+          { pattern: TINumber, message: '请填写正确的纳税人识别号' }
+        ]
+      }
+    };
+  },
+  methods: {
+    save () {
+      if (this.invoiceForm.type === 1) {
+        // 个人
+        let flag = true;
+        this.receiptItems.forEach((e) => {
+          if (
+            e.receiptTitle === '个人' &&
+            e.receiptContent === this.invoiceForm.receiptContent
+          ) {
+            this.$emit('change', e);
+            flag = false;
+            this.invoiceAvailable = false;
+          }
+        });
+
+        if (flag) {
+          let params = {
+            receiptTitle: '个人',
+            receiptContent: this.invoiceForm.receiptContent
+          };
+          this.loading = true;
+          saveReceipt(params)
+            .then((res) => {
+              this.loading = false;
+              if (res.success) {
+                this.$emit('change', res.result);
+                this.invoiceAvailable = false;
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+      } else {
+        // 单位
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.loading = true;
+            let params = {
+              receiptTitle: this.invoiceForm.receiptTitle,
+              taxpayerId: this.invoiceForm.taxpayerId,
+              receiptContent: this.invoiceForm.receiptContent
+            };
+            let flag = true;
+            this.receiptItems.forEach((e) => {
+              if (e.taxpayerId === params.taxpayerId) {
+                flag = false;
+              }
+            });
+            if (!flag) {
+              this.$Message.error('已有当前税号的发票信息，请直接选择已有发票');
+            } else {
+              saveReceipt(params)
+                .then((res) => {
+                  this.loading = false;
+                  if (res.success) {
+                    this.$emit('change', res.result);
+                    this.invoiceAvailable = false;
+                  }
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
+            }
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+/** 普票 */
+.inv-type {
+  text-align: center;
+}
+.add-inv {
+  font-size: 12px;
+  color: #438cde;
+  cursor: pointer;
+  &:hover {
+    color: $theme_color;
+  }
+}
+
+.nav-content {
+  width: 500px;
+  margin: 10px auto;
+}
+</style>
diff --git a/buyer/src/components/like/index.vue b/buyer/src/components/like/index.vue
new file mode 100644
index 00000000..c148260b
--- /dev/null
+++ b/buyer/src/components/like/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <div class="wrapper">
+    <card _Title="猜你喜欢" :_Size="16"> </card>
+
+    <Row :gutter="12" class="likeList">
+      <Col
+        :span="4"
+        class="likeItem"
+        v-for="(item, index) in goodsData"
+        :key="index"
+      >
+        <img :src="item.img" alt="" />
+        <div class="likeTitle">{{ item.title }}</div>
+        <div class="likePrice">{{ item.price }}</div>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'like',
+  data () {
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.wrapper {
+  @include white_background_color();
+}
+.likeList {
+  padding: 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+
+  > .likeItem {
+    /*width: 210px;*/
+    /*margin: 10px 5px;*/
+
+    > img {
+      display: block;
+      width: 100%;
+      height: auto;
+    }
+
+    > .likeTitle,
+    .likePrice {
+      margin: 6px 0;
+      text-align: center;
+      display: -webkit-box;
+
+      -webkit-box-orient: vertical;
+
+      -webkit-line-clamp: 2;
+
+      overflow: hidden;
+    }
+
+    > .likePrice {
+      color: $theme_color;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/components/map/index.vue b/buyer/src/components/map/index.vue
new file mode 100644
index 00000000..25ca92c6
--- /dev/null
+++ b/buyer/src/components/map/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="lili-map">
+    <Modal v-model="showMap" title="选择地址" width="800">
+      <div class="address">{{ addrContent.address }}</div>
+      <div id="map-container"></div>
+
+      <div class="search-con">
+        <Input
+          placeholder="输入关键字搜索"
+          id="input-map"
+          v-model="mapSearch"
+        />
+        <ul>
+          <li
+            v-for="(tip, index) in tips"
+            :key="index"
+            @click="selectAddr(tip.location)"
+          >
+            <p>{{ tip.name }}</p>
+            <p>{{ tip.district + tip.address }}</p>
+          </li>
+        </ul>
+      </div>
+      <div slot="footer">
+        <Button type="default" @click="showMap = false">取消</Button>
+        <Button type="primary" :loading="loading" @click="ok">确定</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import AMapLoader from '@amap/amap-jsapi-loader';
+import { handleRegion } from '@/api/address.js';
+export default {
+  name: 'map',
+  props: {
+    useApi: {
+      default: true,
+      type: Boolean
+    }
+  },
+  data () {
+    return {
+      showMap: false, // 展示地图
+      mapSearch: '', // 地图搜索
+      map: null, // 初始化地图
+      autoComplete: null, // 初始化搜索方法
+      geocoder: null, // 初始化地理、坐标转化
+      positionPicker: null, // 地图拖拽选点
+      tips: [], // 搜索关键字列表
+      addrContent: {}, // 回显地址信息
+      loading: false // 加载状态
+    };
+  },
+  watch: {
+    mapSearch: function (val) {
+      this.searchOfMap(val);
+    }
+  },
+  methods: {
+    ok () {
+      // 确定选择
+      this.loading = true;
+      const address = this.addrContent.address;
+      const township = this.addrContent.regeocode.addressComponent.township;
+      const index = address.indexOf(township) + township.length;
+      this.addrContent.detail = address.substring(index);
+      const params = {
+        cityCode: this.addrContent.regeocode.addressComponent.citycode,
+        townName: this.addrContent.regeocode.addressComponent.township
+      };
+      if (this.useApi) {
+        handleRegion(params).then((res) => {
+          this.loading = false;
+          if (res.code === 200) {
+            this.showMap = false;
+            this.addrContent.addr = res.result.name.replace(/,/g, ' ');
+            this.addrContent.addrId = res.result.id;
+            this.$emit('getAddress', this.addrContent);
+          }
+        });
+      } else {
+        this.loading = false;
+        this.showMap = false;
+        this.$emit('getAddress', this.addrContent);
+      }
+    },
+    init () {
+      AMapLoader.load({
+        key: 'b440952723253aa9fe483e698057bf7d', // 申请好的Web端开发者Key，首次调用 load 时必填
+        version: '', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: [
+          'AMap.ToolBar',
+          'AMap.Autocomplete',
+          'AMap.PlaceSearch',
+          'AMap.Geolocation',
+          'AMap.Geocoder'
+        ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          // 是否加载 AMapUI，缺省不加载
+          version: '1.1', // AMapUI 缺省 1.1
+          plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+        }
+      })
+        .then((AMap) => {
+          let that = this;
+          this.map = new AMap.Map('map-container', {
+            zoom: 12
+          });
+          that.map.addControl(new AMap.ToolBar());
+          that.map.addControl(new AMap.Autocomplete());
+          that.map.addControl(new AMap.PlaceSearch());
+          that.map.addControl(new AMap.Geocoder());
+
+          // 实例化Autocomplete
+          let autoOptions = {
+            city: '全国'
+          };
+          that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
+          that.geocoder = new AMap.Geocoder(autoOptions);
+
+          that.positionPicker = new AMapUI.PositionPicker({
+            // 拖拽选点
+            mode: 'dragMap',
+            map: that.map
+          });
+          that.positionPicker.start();
+          /**
+           *
+           * 所有回显数据，都在positionResult里面
+           * 需要字段可以查找
+           *
+           */
+          that.positionPicker.on('success', function (positionResult) {
+            // console.log(positionResult);
+            that.addrContent = positionResult;
+          });
+        })
+        .catch((e) => {});
+    },
+    searchOfMap (val) {
+      // 地图搜索
+      let that = this;
+      this.autoComplete.search(val, function (status, result) {
+        // 搜索成功时，result即是对应的匹配数据
+        if (status === 'complete' && result.info === 'OK') {
+          that.tips = result.tips;
+        } else {
+          that.tips = [];
+        }
+      });
+    },
+    selectAddr (location) {
+      // 选择坐标
+      if (!location) {
+        this.$Message.warning('请选择正确点位');
+        return false;
+      }
+      const lnglat = [location.lng, location.lat];
+      this.positionPicker.start(lnglat);
+    }
+  },
+  mounted () {
+    this.init();
+  }
+};
+</script>
+<style lang="scss" scoped>
+#map-container {
+  width: 500px;
+  height: 400px;
+}
+
+.search-con {
+  position: absolute;
+  right: 20px;
+  top: 64px;
+  width: 260px;
+  ul {
+    width: 260px;
+    height: 400px;
+    overflow: scroll;
+    li {
+      padding: 5px;
+      p:nth-child(2) {
+        color: #999;
+        font-size: 12px;
+      }
+      &:hover {
+        background-color: #eee;
+        cursor: pointer;
+      }
+    }
+  }
+}
+
+.address {
+  margin-bottom: 10px;
+  font-weight: bold;
+}
+</style>
diff --git a/buyer/src/components/map/region.vue b/buyer/src/components/map/region.vue
new file mode 100644
index 00000000..f7682cb2
--- /dev/null
+++ b/buyer/src/components/map/region.vue
@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <Cascader
+      :data="data"
+      :load-data="loadData"
+      v-model="addr"
+      @on-change="change"
+      style="width: 300px"
+    ></Cascader>
+  </div>
+</template>
+<script>
+import {getRegion} from '@/api/common.js';
+export default {
+  data () {
+    return {
+      data: [], // 地区数据
+      addr: [] // 已选数据
+    };
+  },
+  props: ['addressId'],
+  mounted () {},
+  methods: {
+    change (val, selectedData) {
+      /**
+       * @returns [regionId,region]
+       */
+      this.$emit('selected', [
+        val,
+        selectedData[selectedData.length - 1].__label.split('/')
+      ]);
+    },
+    loadData (item, callback) {
+      item.loading = true;
+      getRegion(item.value).then((res) => {
+        if (res.result.length <= 0) {
+          item.loading = false;
+        } else {
+          res.result.forEach((child) => {
+            item.loading = false;
+
+            let data = {
+              value: child.id,
+              label: child.name,
+              loading: false,
+              children: []
+            };
+
+            if (child.level === 'street' || item.label === '香港特别行政区') {
+              item.children.push({
+                value: child.id,
+                label: child.name
+              });
+            } else {
+              item.children.push(data);
+            }
+          });
+          callback();
+        }
+      });
+    },
+    async init () {
+      let data = await getRegion(0);
+      let arr = [];
+      data.result.forEach((item) => {
+        let obj;
+        // 台湾省做处理
+        if (item.name === '台湾省') {
+          obj = {
+            value: item.id,
+            label: item.name
+          };
+        } else {
+          obj = {
+            value: item.id,
+            label: item.name,
+            loading: false,
+            children: []
+          };
+        }
+        arr.push(obj);
+      });
+      this.data = arr;
+      console.warn('init');
+    },
+    async reviewData () {
+      // 数据回显
+      let addr = JSON.parse(JSON.stringify(this.addressId.split(',')));
+      let length = addr.length;
+      let data = await getRegion(0);
+      let arr0 = [];
+      let arr1 = [];
+      let arr2 = [];
+      // 第一级数据
+      data.result.forEach((item) => {
+        let obj;
+        // 台湾省做处理
+        if (item.name === '台湾省') {
+          obj = {
+            value: item.id,
+            label: item.name
+          };
+        } else {
+          obj = {
+            value: item.id,
+            label: item.name,
+            loading: false,
+            children: []
+          };
+        }
+        arr0.push(obj);
+      });
+      // 根据选择的数据来加载数据列表
+      if (length > 0) {
+        let children = await getRegion(addr[0]);
+        children = this.handleData(children.result);
+        arr0.forEach((e) => {
+          if (e.value === addr[0]) {
+            e.children = arr1 = children;
+          }
+        });
+      }
+      if (length > 1) {
+        let children = await getRegion(addr[1]);
+        children = this.handleData(children.result);
+        arr1.forEach((e) => {
+          if (e.value === addr[1]) {
+            e.children = arr2 = children;
+          }
+        });
+      }
+      if (length > 2) {
+        let children = await getRegion(addr[2]);
+        children = this.handleData(children.result);
+        arr2.forEach((e) => {
+          if (e.value === addr[2]) {
+            e.children = children;
+          }
+        });
+      }
+      this.data = arr0;
+      this.addr = addr;
+    },
+    handleData (data) {
+      // 处理接口数据
+      let item = [];
+      data.forEach((child) => {
+        let obj = {
+          value: child.id,
+          label: child.name,
+          loading: false,
+          children: []
+        };
+
+        if (child.level === 'street' || item.label === '香港特别行政区') {
+          item.push({
+            value: child.id,
+            label: child.name
+          });
+        } else {
+          item.push(obj);
+        }
+      });
+      return item;
+    }
+  },
+  watch: {
+    addressId: {
+      handler: function (v) {
+        console.log(v);
+        if (v) {
+          this.reviewData();
+        } else {
+          this.init();
+        }
+      },
+      immediate: true
+    },
+    addr (v) {
+      console.log(v);
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/buyer/src/components/nav/GoodsClassNav.vue b/buyer/src/components/nav/GoodsClassNav.vue
new file mode 100644
index 00000000..267c15ff
--- /dev/null
+++ b/buyer/src/components/nav/GoodsClassNav.vue
@@ -0,0 +1,708 @@
+<template>
+  <div class="item-class-show">
+    <div class="head-bar">
+      <!-- 有商品分类展示商品分类 -->
+      <template v-if="$route.query.categoryId">
+        <!-- 头部展示筛选信息 -->
+        <div @click="cateClick(tabBar,1)">{{ tabBar.name }}</div>
+        <Icon type="ios-arrow-forward" />
+
+        <div class="bar" v-if="tabBar.first">
+          {{ tabBar.first.name }} <Icon type="ios-arrow-down" />
+          <ul>
+            <li v-for="item in tabBar.children" :key="item.id"  @click="cateClick(item,2)">
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+        <Icon type="ios-arrow-forward" v-if="tabBar.first" />
+
+        <div class="bar" v-if="tabBar.second">
+          {{ tabBar.second.name }} <Icon type="ios-arrow-down" />
+          <ul>
+            <li v-for="item in tabBar.first.children" :key="item.id"  @click="cateClick(item,3)">
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+        <Icon type="ios-arrow-forward" v-if="tabBar.second" />
+      </template>
+      <!-- 无商品分类，展示搜索结果 -->
+      <template v-else>
+        <div style="font-size:14px">全部结果</div>
+        <Icon type="ios-arrow-forward" />
+        <div>{{params.keyword}}</div>
+      </template>
+      <!-- 所选分类 -->
+      <a
+        class="selected-item"
+        @click="cancelSelected(item, index)"
+        v-for="(item, index) in selectedItem"
+        :key="index"
+        :title="item.name"
+      >
+        <span>{{ item.type }}：</span><span>{{ item.name }}</span
+        ><Icon type="md-close" />
+      </a>
+    </div>
+
+    <!-- 筛选主体 -->
+    <div class="content">
+      <!-- 品牌， 有图片，独立出来 -->
+      <div class="brand" v-show="tagsContent[0].show && tagsContent[0].values.length">
+        <div>
+          <strong>{{ tagsContent[0].key }}：</strong>
+        </div>
+        <div>
+          <ul :class="{ 'show-more': tagsContent[0].more }">
+            <li
+              @click="selectBrand(item.name, 0)"
+              :class="{ 'border-color': multSelected.includes(item) }"
+              v-for="(item, index) in tagsContent[0].values"
+              :key="index"
+            >
+              <img :src="item.url" alt="" /><span>{{ item.name }}</span>
+              <div
+                class="corner-icon"
+                v-show="multSelected.includes(item.name)"
+              >
+                <div></div>
+                <Icon type="md-checkmark" />
+              </div>
+            </li>
+          </ul>
+
+          <div class="btn" v-show="multiple !== 0">
+            <span @click="moreBrand(0)"
+              >{{ tagsContent[0].more ? "收起" : "更多"
+              }}<Icon
+                :type="tagsContent[0].more ? 'ios-arrow-up' : 'ios-arrow-down'"
+            /></span>
+            <span @click="multSelectBrand(0)"><Icon type="md-add" />多选</span>
+          </div>
+
+          <div class="multBtn" v-show="multiple === 0">
+            <Button
+              type="primary"
+              size="small"
+              :disabled="!multSelected.length"
+              @click="sure(0)"
+              >确定</Button
+            >
+            <Button size="small" @click="cancel">取消</Button>
+          </div>
+        </div>
+      </div>
+
+      <!-- 其他筛选项 -->
+      <template v-for="(tag, tagIndex) in tagsContent">
+        <div class="other" v-if="tag.show && tagIndex !== 0" :key="tagIndex">
+          <div>
+            <strong>{{ tag.key }}：</strong>
+          </div>
+          <div>
+            <ul
+              :class="{ 'show-more': tag.more }"
+              class="list"
+              v-show="multiple !== tagIndex"
+            >
+              <li
+                @click="selectBrand(item, tagIndex)"
+                class="item"
+                v-for="(item, index) in tag.values"
+                :key="index"
+              >
+                {{ item }}
+              </li>
+            </ul>
+
+            <CheckboxGroup
+              :class="{ 'show-more': tag.more }"
+              class="list"
+              v-model="multSelected"
+              v-show="multiple === tagIndex"
+            >
+              <Checkbox
+                class="item"
+                :label="item"
+                v-for="(item, index) in tag.values"
+                :key="index"
+                >{{ item }}</Checkbox
+              >
+            </CheckboxGroup>
+
+            <div class="btn" v-show="multiple !== tagIndex">
+              <span @click="moreBrand(tagIndex)" v-show="tag.values.length > 9"
+                >{{ tag.more ? "收起" : "更多"
+                }}<Icon :type="tag.more ? 'ios-arrow-up' : 'ios-arrow-down'"
+              /></span>
+              <span @click="multSelectBrand(tagIndex)"
+                ><Icon type="md-add" />多选</span
+              >
+            </div>
+
+            <div class="multBtn" v-show="multiple === tagIndex">
+              <Button
+                type="primary"
+                size="small"
+                :disabled="!multSelected.length"
+                @click="sure(tagIndex)"
+                >确定</Button
+              >
+              <Button size="small" @click="cancel">取消</Button>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as APIGoods from '@/api/goods';
+export default {
+  name: 'GoodsClassNav',
+  data () {
+    return {
+      tabBar: { // 分类数据
+        name: '',
+        first: {},
+        second: {}
+      },
+      multiple: false, // 多选
+      tagsContent: [
+        // 标签
+        {
+          key: '品牌',
+          more: false,
+          show: true,
+          values: []
+        }
+      ],
+      multSelected: [], // 多选分类
+      selectedItem: [], // 已选分类集合 顶部展示
+      brandIds: [], // 品牌id合集
+      params: {}, // 请求参数
+      cateList: [] // 全部商品分类
+    };
+  },
+  watch: {
+    selectedItem: {
+      // 监听已选条件，来调用列表接口
+      handler (val) {
+        let classification = [];
+        if (val.length) {
+          val.forEach((item) => {
+            if (item.type === '品牌') {
+              this.params.brandId = this.brandIds.join('@');
+            } else {
+              const nameArr = item.name.split('、');
+              nameArr.forEach((name) => {
+                classification.push(item.type + '_' + name);
+              });
+            }
+          });
+          this.params.prop = classification.join('@');
+        } else {
+          this.params.prop = ''
+          this.params.brandId = ''
+        }
+        this.getFilterList(this.params);
+        this.$emit('getParams', this.params);
+      },
+      deep: true
+    },
+    '$route': {
+      handler (val, oVal) {
+        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]
+        } else {
+          Object.assign(this.params, this.$route.query)
+        }
+        this.getFilterList(this.params)
+        this.getNav()
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getNav () { // 获取商品分类，分类下展示
+      if (!this.$route.query.categoryId) return
+
+      this.cateList = JSON.parse(localStorage.getItem('category'))
+      const arr = this.$route.query.categoryId.split(',')
+      if (arr.length > 0) {
+        this.tabBar = this.cateList.filter(e => {
+          return e.id === arr[0]
+        })[0]
+      }
+      if (arr.length > 1) {
+        const first = this.tabBar.children.filter(e => {
+          return e.id === arr[1]
+        })[0]
+        this.$set(this.tabBar, 'first', first)
+      }
+      if (arr.length > 2) {
+        const second = this.tabBar.first.children.filter(e => {
+          return e.id === arr[2]
+        })[0]
+        this.$set(this.tabBar, 'second', second)
+      }
+    },
+    cateClick (item, index) {
+      switch (index) {
+        case 1:
+          this.$router.push({
+            path: '/goodsList',
+            query: {categoryId: item.id}
+          })
+          break;
+        case 2:
+          this.$router.push({
+            path: '/goodsList',
+            query: {categoryId: [item.parentId, item.id].toString()}
+          })
+          break;
+        case 3:
+          this.$router.push({
+            path: '/goodsList',
+            query: {categoryId: [this.tabBar.id, item.parentId, item.id].toString()}
+          })
+          break;
+      }
+    },
+    selectBrand (item, index) {
+      // 选择筛选项
+      if (this.multiple !== false) {
+        // 非多选直接在顶部栏展示，多选则添加选择状态
+
+        let key = this.multSelected.indexOf(item);
+        if (key > -1) {
+          this.multSelected.splice(key, 1);
+        } else {
+          this.multSelected.push(item);
+        }
+      } else {
+        this.selectedItem.push({
+          type: this.tagsContent[index].key,
+          name: item
+        });
+
+        this.tagsContent[index].show = false;
+
+        if (index === 0) {
+          // 如果是品牌，获取品牌id
+
+          let brands = this.tagsContent[0].values;
+
+          brands.forEach((val) => {
+            if (val.name === item) this.brandIds.push(val.value);
+            console.log(this.brandIds);
+          });
+        }
+      }
+    },
+
+    cancelSelected (item, index) {
+      // 顶部栏 取消已选中的项
+      this.selectedItem.splice(index, 1);
+
+      this.tagsContent.forEach((tag, index) => {
+        if (tag.key === item.type) {
+          tag.show = true;
+          tag.more = false;
+        }
+      });
+      if (item.type === '品牌') {
+        this.brandIds = [];
+      }
+    },
+    moreBrand (index) {
+      // 更多按钮
+      const flag = !this.tagsContent[index].more
+      this.$set(this.tagsContent[index], 'more', flag)
+    },
+    multSelectBrand (index) {
+      // 多选按钮
+      this.$set(this.tagsContent[index], 'more', true)
+      this.multiple = index;
+    },
+    sure (index) {
+      // 多选确认按钮
+      this.selectedItem.push({
+        type: this.tagsContent[index].key,
+        name: this.multSelected.join('、')
+      });
+
+      if (index === 0) {
+        // 如果是品牌，获取品牌id
+
+        let brands = this.tagsContent[0].values;
+
+        brands.forEach((val) => {
+          if (this.multSelected.includes(val.name)) this.brandIds.push(val.value);
+        });
+      }
+
+      this.tagsContent[index].show = false;
+      this.cancel();
+    },
+    cancel () {
+      // 多选取消按钮
+      this.multSelected = [];
+      this.tagsContent[0].more = false;
+      this.multiple = false;
+    },
+    getFilterList (params) {
+      // 筛选、分类  列表
+      APIGoods.filterList(params).then((res) => {
+        if (res.code === 200) {
+          const data = res.result;
+          this.tagsContent = [{
+            key: '品牌',
+            more: false,
+            show: true,
+            values: []
+          }]
+          this.tagsContent[0].values = data.brands;
+          this.tagsContent = this.tagsContent.concat(data.paramOptions);
+          this.tagsContent.forEach((item) => {
+            this.$set(item, 'show', true)
+            this.$set(item, 'more', false)
+          });
+        }
+      });
+    }
+  },
+  mounted () {
+    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]
+    } else {
+      Object.assign(this.params, this.$route.query)
+    }
+    this.getFilterList(this.params);
+    this.getNav();
+  }
+}
+</script>
+
+<style scoped lang="scss">
+/** 头部展示筛选项 */
+.head-bar {
+  width: 100%;
+  background: #fff;
+  margin-top: -13px;
+  display: flex;
+  height: 40px;
+  align-items: center;
+  > div:first-child {
+    padding: 0 8px;
+    font-size: 18px;
+    font-weight: bold;
+    &:hover {
+      color: $theme_color;
+      cursor: pointer;
+    }
+  }
+  .bar {
+    font-size: 12px;
+    position: relative;
+    background: #fff;
+    border: 1px solid #999;
+    padding: 0 8px;
+    width: 85px;
+    text-align: center;
+    margin: 0 3px;
+    &:hover {
+      color: $theme_color;
+      border-color: $theme_color;
+      border-bottom-color: #fff;
+      cursor: pointer;
+      ul {
+        display: block;
+      }
+      .ivu-icon {
+        transform: rotate(180deg);
+      }
+    }
+    ul {
+      display: none;
+      position: absolute;
+      top: 18px;
+      left: -1px;
+      width: 300px;
+      padding: 5px 10px;
+      background: #fff;
+      border: 1px solid $theme_color;
+      z-index: 1;
+      &::before {
+        content: "";
+        position: absolute;
+        width: 83px;
+        left: 0;
+        top: -1px;
+        z-index: 2;
+        border-top: 1px solid #fff;
+      }
+
+      &:hover {
+        display: block;
+      }
+      clear: left;
+      li {
+        color: #999;
+        float: left;
+        width: 30%;
+        margin: 3px 0;
+        text-align: left;
+        &:hover {
+          color: $theme_color;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  //所选分类
+  .selected-item {
+    font-size: 12px;
+    color: #000;
+    padding: 2px 22px 2px 8px;
+    margin-right: 5px;
+    max-width: 250px;
+    height: 24px;
+    overflow: hidden;
+    position: relative;
+    background-color: #f3f3f3;
+    border: 1px solid #ddd;
+    &:hover {
+      border-color: $theme_color;
+      background-color: #fff;
+      .ivu-icon {
+        color: #fff;
+        background-color: $theme_color;
+      }
+    }
+
+    span:nth-child(2) {
+      color: $theme_color;
+    }
+
+    .ivu-icon {
+      position: absolute;
+      right: 0;
+      top: 0;
+      color: $theme_color;
+      line-height: 22px;
+      width: 21px;
+      height: 22px;
+      font-size: 14px;
+    }
+  }
+}
+/** 筛选主体 */
+.content {
+  background: #fff;
+  border-top: 1px solid #999;
+  border-bottom: 1px solid #999;
+  margin: 10px 0;
+}
+/** 品牌 start */
+.brand {
+  border-bottom: 1px solid #ddd;
+  display: flex;
+  // min-height: 120px;
+  font-size: 12px;
+  > div:first-child {
+    width: 100px;
+    background: #eee;
+    padding: 10px 0 0 10px;
+  }
+  > div:last-child {
+    width: 1100px;
+    padding: 10px;
+    position: relative;
+    ul {
+      width: 900px;
+      max-height: 100px;
+      overflow: hidden;
+      padding-top: 1px;
+      clear: left;
+      li {
+        width: 100px;
+        height: 50px;
+        float: left;
+        line-height: 50px;
+        border: 1px solid #ddd;
+        margin: -1px -1px 0 0;
+        overflow: hidden;
+        position: relative;
+        padding: 2px;
+        img {
+          width: 100%;
+          height: 100%;
+        }
+
+        &:hover {
+          border-color: $theme_color;
+          top: 0;
+          left: 0;
+          position: relative;
+          z-index: 1;
+          img {
+            display: none;
+          }
+        }
+
+        span {
+          display: inline-block;
+          width: 100%;
+          height: 100%;
+          color: $theme_color;
+          text-align: center;
+          font-size: 12px;
+          cursor: pointer;
+        }
+
+        .corner-icon {
+          position: absolute;
+          right: -1px;
+          bottom: -1px;
+          div {
+            width: 0;
+            border-top: 20px solid transparent;
+            border-right: 20px solid $theme_color;
+          }
+          .ivu-icon {
+            font-size: 12px;
+            position: absolute;
+            bottom: 0;
+            right: 1px;
+            transform: rotate(-15deg);
+            color: #fff;
+          }
+        }
+      }
+      .border-color {
+        border-color: $theme_color;
+        z-index: 1;
+      }
+    }
+    .show-more {
+      height: auto;
+      max-height: 200px;
+      overflow: scroll;
+    }
+    .btn {
+      position: absolute;
+      right: 10px;
+      top: 10px;
+      span {
+        border: 1px solid #ddd;
+        margin-left: 10px;
+        color: #999;
+        display: inline-block;
+        padding: 1px 3px;
+        font-size: 12px;
+        &:hover {
+          cursor: pointer;
+          color: $theme_color;
+          border-color: $theme_color;
+        }
+      }
+    }
+    .multBtn {
+      text-align: center;
+      margin-top: 10px;
+      .ivu-btn {
+        font-size: 12px !important;
+      }
+      .ivu-btn:last-child {
+        margin-left: 10px;
+      }
+    }
+  }
+}
+/** 品牌 end */
+/** 其他筛选项  start */
+.other {
+  border-bottom: 1px solid #ddd;
+  display: flex;
+  min-height: 30px;
+  font-size: 12px;
+  &:last-child {
+    border: none;
+  }
+  > div:first-child {
+    width: 100px;
+    background: #eee;
+    padding: 10px 0 0 10px;
+  }
+  > div:last-child {
+    width: 1100px;
+    padding: 0 10px;
+    position: relative;
+    .list {
+      width: 900px;
+      height: 30px;
+      overflow: hidden;
+      clear: left;
+      .item {
+        width: 100px;
+        height: 30px;
+        float: left;
+        line-height: 30px;
+        color: $primary_color;
+        overflow: hidden;
+        position: relative;
+        font-size: 12px;
+        padding: 2px;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+
+    .show-more {
+      height: auto;
+    }
+
+    .btn {
+      position: absolute;
+      right: 10px;
+      top: 5px;
+      span {
+        border: 1px solid #ddd;
+        margin-left: 10px;
+        color: #999;
+        display: inline-block;
+        padding: 1px 3px;
+        font-size: 12px;
+        &:hover {
+          cursor: pointer;
+          color: $theme_color;
+          border-color: $theme_color;
+        }
+      }
+    }
+
+    .multBtn {
+      text-align: center;
+      margin-top: 10px;
+      margin-bottom: 10px;
+      .ivu-btn {
+        font-size: 12px !important;
+      }
+      .ivu-btn:last-child {
+        margin-left: 10px;
+      }
+    }
+  }
+}
+
+/** 其他筛选项  end */
+</style>
diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue
new file mode 100644
index 00000000..9cdd66c6
--- /dev/null
+++ b/buyer/src/components/nav/cateNav.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="cate-nav">
+    <div class="nav-con">
+      <div class="all-categories hover-pointer" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">全部商品分类</div>
+      <ul class="nav-item" v-if="showNavBar">
+        <li
+          class="hover-color"
+          v-for="(item, index) in navList.list"
+          :key="index"
+          @click="linkTo(item.url)"
+        >
+          {{ item.name }}
+        </li>
+      </ul>
+    </div>
+    <!-- 侧边导航 -->
+    <div class="cate-list" v-show="showAlways || showFirstList" @mouseenter="showFirstList = true" @mouseleave="showFirstList = false">
+      <div class="nav-side">
+        <ul>
+          <li v-for="(item, index) in cateList" :key="index" @mouseenter="showDetail(index)" @mouseleave="panel = false">
+            <span class="nav-side-item" @click="goGoodsList(item.id)">{{item.name}}</span>
+            <span v-for="(second, secIndex) in item.children" :key="secIndex">
+              <span v-if="secIndex < 2" > / </span>
+              <span @click="goGoodsList(second.id, second.parentId)" class="nav-side-item" v-if="secIndex < 2">{{second.name}}</span>
+            </span>
+          </li>
+        </ul>
+      </div>
+      <transition name="fade">
+        <div
+          class="detail-item-panel"
+          :duration="{ enter: 100, leave: 100 }"
+          v-show="panel"
+          @mouseenter="panel = true"
+          ref="itemPanel1"
+          @mouseleave="panel = false"
+        >
+          <div class="nav-detail-item">
+            <template v-for="(item, index) in panelData">
+              <span @click="goGoodsList(item.id, item.parentId)" v-if="index < 8" :key="index">{{ item.name }}<Icon type="ios-arrow-forward" /></span>
+            </template>
+          </div>
+          <ul>
+            <li
+              v-for="(items, index) in panelData"
+              :key="index"
+              class="detail-item-row"
+            >
+              <span class="detail-item-title" @click="goGoodsList(items.id,items.parentId)">
+                {{ items.name }} <Icon type="ios-arrow-forward" />
+                <span class="glyphicon glyphicon-menu-right"></span>
+              </span>
+              <div>
+                <span v-for="(item, subIndex) in items.children" @click="goGoodsList(item.id,items.id,items.parentId)"
+                :key="subIndex" class="detail-item">{{ item.name }}</span>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </transition>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCategory } from '@/api/goods';
+import storage from '@/plugins/storage.js'
+export default {
+  name: 'GoodsListNav',
+  props: {
+    showAlways: { // 总是显示下拉分类
+      default: false,
+      type: Boolean
+    },
+    showNavBar: { // 显示全部商品分类右侧导航条
+      default: true,
+      type: Boolean
+    }
+  },
+  data () {
+    return {
+      cateList: [], // 分类数据
+      panel: false, // 二级分类展示
+      panelData: [], // 二级分类数据
+      showFirstList: false // 始终展示一级列表
+    }
+  },
+  computed: {
+    navList () {
+      return JSON.parse(storage.getItem('navList')) || []
+    }
+  },
+  methods: {
+    getCate () {
+      getCategory(0).then(res => {
+        if (res.success) {
+          this.cateList = res.result;
+          localStorage.setItem('category', JSON.stringify(res.result))
+        }
+      });
+    },
+    showDetail (index) {
+      this.panel = true
+      this.panelData = this.cateList[index].children
+    },
+    goGoodsList (id, secondId, firstId) { // 分类共有三级，传全部分类过去
+      const arr = [firstId, secondId, id]
+      if (!arr[1]) {
+        arr.splice(0, 2)
+      }
+      if (!arr[0]) {
+        arr.shift()
+      }
+      let routerUrl = this.$router.resolve({
+        path: '/goodsList',
+        query: {categoryId: arr.toString()}
+      })
+      window.open(routerUrl.href, '_blank')
+    }
+  },
+  mounted () {
+    if (localStorage.getItem('category')) {
+      this.cateList = JSON.parse(localStorage.getItem('category'))
+    } else {
+      this.getCate()
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.cate-nav{
+  width: 1200px;
+  position: relative;
+  margin: 0 auto;
+}
+/** 商品分类 */
+.nav-con {
+  width: 1200px;
+  height: 40px;
+  // background: #eee;
+  margin: 0 auto;
+  display: flex;
+  .all-categories {
+    width: 200px;
+    line-height: 40px;
+    color: #fff;
+    background-color: $theme_color;
+    text-align: center;
+    font-size: 16px;
+  }
+  .nav-item {
+    width: 1000px;
+    height: 40px;
+    line-height: 40px;
+    overflow: hidden;
+    list-style: none;
+    background-color: #eee;
+    display: flex;
+    li {
+      font-size: 16px;
+      font-weight: bold;
+      margin-left: 20px;
+      color: rgb(89, 88, 88);
+      font-size: 15px;
+      &:hover {
+        color: $theme_color;
+      }
+    }
+  }
+}
+.cate-list{
+  margin: 0 auto;
+  position: absolute;
+  z-index: 1000;
+}
+.nav-item li {
+  float: left;
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 30px;
+}
+.nav-item a {
+  text-decoration: none;
+  color: #555555;
+}
+.nav-item a:hover {
+  color: $theme_color;
+}
+
+.nav-side {
+  width: 200px;
+  float: left;
+  padding: 0px;
+  color: #fff;
+  background-color: #6e6568;
+  height: 335px;
+  overflow: hidden;
+}
+.nav-side ul {
+  width: 100%;
+  padding: 0px;
+  padding-top: 5px;
+  list-style: none;
+}
+.nav-side li {
+  padding: 7.5px 0;
+  padding-left: 12px;
+  font-size: 13px;
+  line-height: 18px;
+}
+.nav-side li:hover {
+  background: #999395;
+}
+.nav-side-item:hover {
+  cursor: pointer;
+  color: $theme_color;
+}
+
+/*显示商品详细信息*/
+.detail-item-panel {
+  width: 815px;
+  min-height: 340px;
+  background-color: #fff;
+  box-shadow: 0px 0px 15px #ccc;
+  position: absolute;
+  top: 0;
+  left: 200px;
+  z-index: 1000;
+  padding: 15px;
+}
+.nav-detail-item {
+  margin-top: 5px;
+  margin-bottom: 15px;
+  cursor: pointer;
+  color: #eee;
+}
+.nav-detail-item span {
+  padding: 6px;
+  padding-left: 12px;
+  margin-right: 15px;
+  font-size: 12px;
+  background-color: #6e6568;
+}
+.nav-detail-item span:hover {
+  background-color: $theme_color;
+}
+.detail-item-panel ul {
+  list-style: none;
+}
+.detail-item-panel li {
+  line-height: 30px;
+  // margin-left: 40px;
+}
+.detail-item-title {
+  font-weight: bold;
+  font-size: 12px;
+  cursor: pointer;
+  color: #555555;
+  padding-right: 10px;
+  width: 81px;
+  text-align: right;
+}
+.detail-item-title:hover {
+  color: $theme_color;
+}
+.detail-item-row  {
+  display: flex;
+  >div{flex: 1;}
+}
+.detail-item {
+  font-size: 12px;
+  padding-left: 8px;
+  padding-right: 8px;
+  cursor: pointer;
+  border-left: 1px solid #ccc;
+  &:first-child{
+    border: none;
+    padding-left: 0;
+  }
+}
+.detail-item:hover {
+  color: $theme_color;
+}
+</style>
diff --git a/buyer/src/components/verify/README.md b/buyer/src/components/verify/README.md
new file mode 100644
index 00000000..ff94a74d
--- /dev/null
+++ b/buyer/src/components/verify/README.md
@@ -0,0 +1,14 @@
+### 滑动拼图验证
+
+### 在页面中引入 .vue文件
+
+#### 参数  
+
+#### 在组件上添加v-if来判断组件显隐 
+
+#### verifyType 验证格式[ 'LOGIN' ,'REGISTER' ]等，详情看接口文档   
+
+#### @change方法  获取回调，参数为对象 {status:false,distance:100}   status 为回调状态，distance为移动距离
+
+
+####    <Verify  class="verify-content" verifyType='LOGIN' @change="verifyChange"></Verify>
\ No newline at end of file
diff --git a/buyer/src/components/verify/index.vue b/buyer/src/components/verify/index.vue
new file mode 100644
index 00000000..2ce1ef45
--- /dev/null
+++ b/buyer/src/components/verify/index.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="verify-content" v-if="show" @mousemove="mouseMove" @mouseup="mouseUp">
+    <div class="imgBox" :style="{width:data.originalWidth+'px',height:data.originalHeight + 'px'}">
+      <img :src="data.backImage" style="width:100%;height:100%" alt="">
+      <img class="slider" :src="data.slidingImage" :style="{left:distance+'px',top:data.randomY+'px'}" :width="data.sliderWidth" :height="data.sliderHeight" alt="">
+      <Icon type="md-refresh" class="refresh" @click="refresh" />
+    </div>
+    <div class="handle" :style="{width:data.originalWidth+'px'}">
+      <span class="bgcolor" :style="{width:distance + 'px',background:bgColor}"></span>
+      <span class="swiper" :style="{left:distance + 'px'}" @mousedown="mouseDown">
+        <Icon type="md-arrow-round-forward" />
+      </span>
+      <span class="text">{{verifyText}}</span>
+    </div>
+  </div>
+</template>
+<script>
+import { getVerifyImg, postVerifyImg } from './verify.js';
+export default {
+  props: {
+    verifyType: {
+      defalut: 'LOGIN',
+      type: String
+    }
+  },
+  data () {
+    return {
+      show: false, // 验证码显隐
+      type: 'LOGIN', // 请求类型
+      data: { // 验证码数据
+        backImage: '',
+        slidingImage: '',
+        originalHeight: 150,
+        originalWidth: 300,
+        sliderWidth: 60,
+        sliderHeight: 60
+      },
+      distance: 0, // 拼图移动距离
+      flag: false, // 判断滑块是否按下
+      downX: 0, // 鼠标按下位置
+      bgColor: 'aqua', // 滑动背景颜色
+      verifyText: '拖动滑块解锁' // 文字提示
+    };
+  },
+  methods: {
+    mouseDown (e) {
+      this.downX = e.clientX;
+      this.flag = true;
+    },
+    mouseMove (e) {
+      if (this.flag) {
+        let offset = e.clientX - this.downX;
+
+        if (offset > this.data.originalWidth - 43) {
+          this.distance = this.data.originalWidth - 43;
+        } else if (offset < 0) {
+          this.distance = 0;
+        } else {
+          this.distance = offset;
+        }
+      }
+    },
+    mouseUp () {
+      if (!this.flag) return false;
+      this.flag = false;
+      let params = {
+        verificationEnums: this.type,
+        xPos: this.distance
+      };
+      postVerifyImg(params).then(res => {
+        if (res.result) {
+          this.bgColor = 'green';
+          this.verifyText = '解锁成功';
+          this.$emit('change', { status: true, distance: this.distance });
+        } else {
+          this.bgColor = 'red';
+          this.verifyText = '解锁失败';
+          let that = this;
+          setTimeout(() => {
+            that.refresh();
+          }, 1000);
+          this.$emit('change', { status: false, distance: this.distance });
+        }
+      });
+    },
+    refresh () {
+      this.flag = false;
+      this.downX = 0;
+      this.distance = 0;
+      this.bgColor = 'aqua';
+      this.verifyText = '拖动滑块解锁';
+      this.getImg();
+    },
+    getImg () {
+      getVerifyImg(this.type).then(res => {
+        this.data = res.result;
+      });
+    }
+  },
+  created () {
+    this.getImg();
+  },
+  watch: {
+    verifyType: {
+      immediate: true,
+      handler: function (v) {
+        this.type = v;
+        this.refresh();
+      }
+    },
+    show (v) {
+      if (v) this.refresh();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.verify-content{
+  padding: 10px;
+  background: #fff;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  box-shadow: 1px 1px 3px #999;
+}
+.imgBox {
+  width: 300px;
+  height: 150px;
+  position: relative;
+  overflow: hidden;
+
+  .slider {
+    position: absolute;
+    cursor: pointer;
+  }
+
+  .refresh {
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.handle {
+  border: 1px solid rgb(134, 134, 134);
+  margin-top: 5px;
+  height: 42px;
+  background: #ddd;
+  position: relative;
+
+  .bgcolor {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 40px;
+    height: 40px;
+    opacity: 0.5;
+    background: aqua;
+  }
+
+  .swiper {
+    position: absolute;
+    width: 40px;
+    height: 40px;
+    background-color: #fff;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .ivu-icon {
+      font-size: 20px;
+    }
+  }
+
+  .text {
+    display: inline-block;
+    width: inherit;
+    text-align: center;
+    line-height: 42px;
+    font-size: 14px;
+    user-select: none;
+  }
+}
+</style>
diff --git a/buyer/src/components/verify/verify.js b/buyer/src/components/verify/verify.js
new file mode 100644
index 00000000..d1651961
--- /dev/null
+++ b/buyer/src/components/verify/verify.js
@@ -0,0 +1,32 @@
+
+import request, {Method, commonUrl} from '@/plugins/request.js';
+import storage from '@/plugins/storage.js';
+
+/**
+ * 获取拼图验证
+ */
+export function getVerifyImg (verificationEnums) {
+  return request({
+    url: `${commonUrl}/common/slider/${verificationEnums}`,
+    method: Method.GET,
+    needToken: false,
+    headers: {uuid: storage.getItem('uuid')}
+  });
+}
+
+/**
+ * 验证码校验
+ */
+export function postVerifyImg (params) {
+  return request({
+    url: `${commonUrl}/common/slider/${params.verificationEnums}`,
+    method: Method.POST,
+    needToken: false,
+    params,
+    headers: {uuid: storage.getItem('uuid')}
+  });
+}
+
+export function mouseup () {
+  console.log(111);
+}
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
new file mode 100644
index 00000000..895a8bbe
--- /dev/null
+++ b/buyer/src/config/index.js
@@ -0,0 +1,48 @@
+export default {
+  /**
+   * @description 配置显示在浏览器标签的title
+   */
+  title: 'Lili电商',
+  /**
+   * @description token在Cookie中存储的天数，默认1天
+   */
+  cookieExpires: 1,
+  /**
+   * @description 是否使用国际化，默认为false
+   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
+   *              用来在菜单中显示文字
+   */
+  useI18n: true,
+  /**
+   * @description api请求基础路径
+   */
+  api_dev: {
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+    // common: 'http://192.168.0.111:9000',
+    // buyer: 'http://192.168.0.103:8888',
+    //  seller: 'https://store-api.pickmall.cn',
+    //  manager: 'https://admin-api.pickmall.cn'
+  },
+  api_prod: {
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+  },
+  /**
+   *  @description api请求基础路径前缀
+   */
+  baseUrlPrefix: '/buyer',
+  /**
+   * @description 需要加载的插件
+   */
+  plugin: {
+    'error-store': {
+      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
+      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
+    }
+  }
+};
diff --git a/buyer/src/main.js b/buyer/src/main.js
new file mode 100644
index 00000000..c2274aa3
--- /dev/null
+++ b/buyer/src/main.js
@@ -0,0 +1,48 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from './App';
+import router from './router';
+import ViewUI from 'view-design';
+import './assets/styles/theme.less';
+import './assets/iconfont/iconfont.css';
+import * as filters from './plugins/filters';
+import store from '@/vuex/store'
+import storage from '@/plugins/storage';
+// 全局引入封装组件
+import {InstallAll} from '@/components/global.js';
+
+Vue.use(ViewUI);
+Vue.use(InstallAll);
+Vue.config.productionTip = false;
+
+Object.keys(filters).forEach(key => {
+  Vue.filter(key, filters[key]);
+});
+
+router.beforeEach((to, from, next) => {
+  ViewUI.LoadingBar.start();
+  window.document.title = to.meta.title === undefined ? 'lili shop' : to.meta.title
+  next();
+});
+
+router.afterEach(route => {
+  ViewUI.LoadingBar.finish();
+});
+
+Vue.prototype.linkTo = function (url) {
+  if (url.substr(0, 1) === '/') { // 非外部链接，没有origin，只有路由地址
+    window.open(location.origin + url, '_blank');
+  } else { // 外部链接，完整的url地址
+    window.open(url, '_blank')
+  }
+}
+Vue.prototype.Cookies = storage
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  template: '<App/>'
+});
diff --git a/buyer/src/pages/AllCategories.vue b/buyer/src/pages/AllCategories.vue
new file mode 100644
index 00000000..9d0f8cda
--- /dev/null
+++ b/buyer/src/pages/AllCategories.vue
@@ -0,0 +1,348 @@
+<template>
+  <div class="template">
+    <BaseHeader></BaseHeader>
+    <div class="wrapper">
+      <!--面包屑-->
+      <Breadcrumb class="mb_20" separator=">">
+        <BreadcrumbItem  to="/">首页</BreadcrumbItem>
+        <BreadcrumbItem  to="/allCategories">全部分类</BreadcrumbItem>
+      </Breadcrumb>
+
+      <Tabs :animated="false">
+        <TabPane class="mt_40"  v-for="(item,index) in mockData" :key="index" :label="item.title">
+          <!-- 分类详情-->
+          <div class="cateBox">
+            <div class="width_800  cateContent" ref="cateContent">
+              <div v-for="(data,i) in item.data" :key="i" class="cateList mb_40">
+                <div class="cateListTitle">
+                  <p class="mb_40">{{data.title}} </p>
+                  <div class="cateList">
+                    <div v-for="(cate,j) in data.List" :key="j" class="cateItem">{{cate.content}}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </TabPane>
+      </Tabs>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "AllCategories",
+  data() {
+    return {
+      mockData: [
+        {
+          title: "图书、电子书",
+          data: [
+            {
+              title: "电子书",
+              List: [
+                {
+                  content: "小说"
+                },
+                {
+                  content: "经典"
+                },
+                {
+                  content: "古装"
+                }
+              ]
+            },
+            {
+              title: "畅销书",
+              List: [
+                {
+                  content: "小说畅销"
+                },
+                {
+                  content: "经典畅销"
+                },
+                {
+                  content: "古装畅销"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: "大牌儿2",
+          data: [
+            {
+              title: "电子书2",
+              List: [
+                {
+                  content: "小说2"
+                },
+                {
+                  content: "经典2"
+                },
+                {
+                  content: "古装2"
+                }
+              ]
+            },
+            {
+              title: "畅销书2",
+              List: [
+                {
+                  content: "小说畅销2"
+                },
+                {
+                  content: "经典畅销2"
+                },
+                {
+                  content: "古装畅销2"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: "大牌儿3",
+          data: [
+            {
+              title: "电子书3",
+              List: [
+                {
+                  content: "小说3"
+                },
+                {
+                  content: "经典3"
+                },
+                {
+                  content: "古装3"
+                }
+              ]
+            },
+            {
+              title: "畅销书3",
+              List: [
+                {
+                  content: "小说畅销3"
+                },
+                {
+                  content: "经典畅销3"
+                },
+                {
+                  content: "古装畅销3"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: "大牌儿",
+          data: [
+            {
+              title: "电子书",
+              List: [
+                {
+                  content: "小说"
+                },
+                {
+                  content: "经典"
+                },
+                {
+                  content: "古装"
+                }
+              ]
+            },
+            {
+              title: "畅销书",
+              List: [
+                {
+                  content: "小说畅销"
+                },
+                {
+                  content: "经典畅销"
+                },
+                {
+                  content: "古装畅销"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: "大牌儿",
+          data: [
+            {
+              title: "电子书",
+              List: [
+                {
+                  content: "小说"
+                },
+                {
+                  content: "经典"
+                },
+                {
+                  content: "古装"
+                }
+              ]
+            },
+            {
+              title: "畅销书",
+              List: [
+                {
+                  content: "小说畅销"
+                },
+                {
+                  content: "经典畅销"
+                },
+                {
+                  content: "古装畅销"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          title: "大牌儿",
+          data: [
+            {
+              title: "电子书",
+              List: [
+                {
+                  content: "小说"
+                },
+                {
+                  content: "经典"
+                },
+                {
+                  content: "古装"
+                }
+              ]
+            },
+            {
+              title: "畅销书",
+              List: [
+                {
+                  content: "小说畅销"
+                },
+                {
+                  content: "经典畅销"
+                },
+                {
+                  content: "古装畅销"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    };
+  },
+  created() {
+    this.windowScroll();
+  },
+  methods: {
+    // 获取每个tab的数据
+    // filterCate(){
+
+    // },
+
+    windowScroll() {
+      let cateWay = [];
+      for (
+        let i = 0;
+        i < document.getElementsByClassName("cateTitle").length;
+        i++
+      ) {
+        let cate = document.getElementsByClassName("cateTitle")[i];
+        cateWay.push(cate.offsetTop);
+      }
+
+      console.log(cateWay);
+
+      window.onscroll = function() {
+        var scrollTop =
+          document.documentElement.scrollTop || document.body.scrollTop;
+        console.log("滚动距离" + scrollTop);
+      };
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.template {
+  width: 100%;
+  @include background_color($light_background_color);
+}
+
+.wrapper {
+  width: 1200px;
+  padding-top: 30px;
+  margin: 0 auto;
+}
+
+.cateContent {
+  overflow: hidden;
+}
+
+.cateBox {
+  
+  min-height: 600px;
+}
+
+.cateTitle {
+  background: $theme_color;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  color: #fff;
+  font-size: 18px;
+}
+
+.cateMenuItem {
+  @include title_color($light_title_color);
+  padding: 8px 0;
+  font-weight: 400 !important;
+}
+
+.cateListTitle {
+  > p {
+    font-size: 14px;
+    font-weight: bold;
+    @include title_color($light_title_color);
+  }
+}
+
+.cateList {
+  display: flex;
+}
+.cateItem {
+  
+  cursor: pointer;
+  display: block;
+  width: 137px;
+  height: 38px;
+  @include background_color($light_background_color);
+  @include content_color($light_title_color);
+  border: 1px dashed $border_color;
+  line-height: 38px;
+  text-align: center;
+  margin-right: -1px;
+  margin-bottom: -1px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  transition: all 0.2s ease-in;
+}
+.cateItem:hover{
+  background: $theme_color;
+  color: #fff;
+}
+.mt_40{
+  margin-top: 40px;
+}
+.mb_40{
+  margin-bottom: 40px;
+}
+</style>
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
new file mode 100644
index 00000000..c4c83995
--- /dev/null
+++ b/buyer/src/pages/Cart.vue
@@ -0,0 +1,718 @@
+<template>
+  <div class="cart" @click="couponAvailable = false">
+    <BaseHeader></BaseHeader>
+    <!-- LOGO 搜索 -->
+    <div class="width_1200 logo">
+      <div>
+        <router-link to="/"><img :src="logoImg" alt="lili shop" title="lilishop" /></router-link>
+        <div>
+          购物车(<span>{{ goodsTotal }}</span>)
+        </div>
+      </div>
+      <Search :showTag="false" :showLogo="false"></Search>
+    </div>
+    <Divider />
+    <!-- 购物车主体 -->
+    <div class="cart-content width_1200 center">
+      <div class="available-area">
+        <div class="cart-steps">
+          <span :class="stepIndex == 0 ? 'active' : ''">1.我的购物车</span>
+          <Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
+          <span :class="stepIndex == 1 ? 'active' : ''">2.填写订单信息</span>
+          <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
+          <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
+        </div>
+      </div>
+      <!-- 购物车商品列表 -->
+      <div class="cart-goods">
+        <div class="cart-goods-title">
+          <div class="width_60">
+            <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')">全选</Checkbox>
+          </div>
+          <div class="goods-title">商品</div>
+          <div class="width_150">单价（元）</div>
+          <div class="width_100">数量</div>
+          <div class="width_150">小计</div>
+          <div class="width_100">操作</div>
+        </div>
+        <div v-if="cartList.length === 0" class="cart-empty">
+          <p>购物车空空如也</p>
+          <router-link to="/">去选购&gt;</router-link>
+        </div>
+        <div v-else class="cart-goods-items" v-for="(shop, index) in cartList" :key="index">
+          <div class="shop-name">
+            <div>
+              <Checkbox v-model="shop.checked" @on-change="changeChecked(shop.checked, 'shop', shop.storeId)"></Checkbox>
+              <span class="go-shop-page" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>
+              <Icon class="customer-service" custom="iconfont icon-kefu" />
+            </div>
+            <span class="shop-coupon" v-if="shop.couponList.length" :class="couponAvailable === index ? 'shop-coupon-show' : ''" @click.stop="showCoupon(shop.id, index)">
+              <!-- 优惠券模态框 -->
+              <div v-if="couponAvailable === index">
+                <div class="coupon-item" v-for="(item, index) in shop.couponList" :key="index">
+                  <span v-if="item.couponType === 'PRICE'">￥{{ item.price }}</span>
+                  <span v-if="item.couponType === 'DISCOUNT'">{{ item.discount }}折</span>
+                  <span>满{{item.consumeThreshold}}元可用</span>
+                  <Button class="coupon-btn" size="small" type="primary" @click="receiveShopCoupon(item)" :disabled="item.disabled">{{ item.disabled ? "已领取" : "领取" }}</Button>
+                </div>
+              </div>
+            </span>
+            <div class="promotion-notice">{{shop.promotionNotice}}</div>
+          </div>
+          <template v-for="(goods, goodsIndex) in shop.skuList">
+            <div class="goods-item"  :key="goodsIndex">
+              <div class="width_60">
+                <Checkbox v-model="goods.checked" @on-change="changeChecked(goods.checked, 'goods', goods.goodsSku.id)"></Checkbox>
+              </div>
+              <div class="goods-title" @click="goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)">
+                <img :src="
+                    goods.goodsSku.thumbnail || '../assets/images/goodsDetail/item-detail-1.jpg'
+                  " />
+                <div>
+                  <p>{{ goods.goodsSku.goodsName }}</p>
+                  <template v-for="(promotion, promotionIndex) in goods.promotions">
+                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'SECKILL'">
+                      <span>秒杀</span>
+                      <promotion :time="promotion.endTime" type="cart"></promotion>
+                    </div>
+                  </template>
+                </div>
+              </div>
+              <div class="width_150">
+                {{ goods.goodsSku.price | unitPrice("￥") }}
+              </div>
+              <div class="width_100">
+                <InputNumber :min="1" size="small" v-model="goods.num" @on-change="changeNum(goods.num, goods.goodsSku.id)"></InputNumber>
+                <div class="fontsize_12">{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</div>
+              </div>
+              <div class="width_150">
+                {{ goods.num * goods.goodsSku.price | unitPrice("￥") }}
+              </div>
+              <div class="width_100">
+                <span class="handle-btn" v-if="!goods.errorMessage" @click="delGoods(goods.goodsSku.id)">删除</span>
+                <span class="handle-btn" v-if="!goods.errorMessage" @click="collectGoods(goods.goodsSku.id)">收藏</span>
+              </div>
+              <div class="error-goods" v-if="goods.errorMessage">
+                <div>{{goods.errorMessage}}</div>
+                <Button type="primary"  @click="delGoods(goods.goodsSku.id)">删除</Button>
+              </div>
+            </div>
+
+          </template>
+        </div>
+        <!-- 底部支付栏 -->
+        <div class="cart-goods-footer">
+          <div>
+            <div class="width_60">
+              <Checkbox v-model="allChecked" @on-change="changeChecked(allChecked, 'all')">全选</Checkbox>
+            </div>
+            <div class="width_100 handle-btn" @click="delGoods">删除选中商品</div>
+            <!-- <div class="width_100 handle-btn" @click="collectGoods">移到我的收藏</div> -->
+            <div class="width_100 handle-btn" @click="clearCart">清空购物车</div>
+          </div>
+          <div>
+            <div class="selected-count">
+              已选择<span>{{ checkedNum }}</span>件商品
+            </div>
+            <div class="ml_20 save-price">
+              已节省<span>{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
+            </div>
+            <div class="ml_20 total-price">
+              总价（不含运费）:<span>{{ priceDetailDTO.billPrice | unitPrice("￥") }}</span>
+            </div>
+            <div class="pay ml_20" @click="pay">去支付</div>
+          </div>
+        </div>
+      </div>
+      <Spin size="large" fix v-if="loading"></Spin>
+    </div>
+    <!-- 猜你喜欢 -->
+    <!-- <div class="like">
+      <div class="likeGoods">
+        <ShowLikeGoods />
+      </div>
+    </div> -->
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+<script>
+import Promotion from '@/components/goodsDetail/Promotion'
+import Search from '@/components/Search';
+import ShowLikeGoods from '@/components/like';
+import * as APICart from '@/api/cart';
+import * as APIMember from '@/api/member';
+import {getLogo} from '@/api/common.js'
+export default {
+  name: 'Cart',
+  beforeRouteEnter (to, from, next) {
+    window.scrollTo(0, 0);
+    next();
+  },
+  components: {
+    Search,
+    ShowLikeGoods,
+    Promotion
+  },
+  data () {
+    return {
+      logoImg: '',
+      couponAvailable: false,
+      stepIndex: 0, // 当前处于哪一步，购物车==0，填写订单信息==1，成功提交订单==2
+      goodsTotal: 1,
+      checkedNum: 0,
+      allChecked: false,
+      loading: false,
+      city: '珠海',
+      cityArr: [
+        ['北京', '上海', '天津', '重庆', '广州'],
+        ['深圳', '河南', '辽宁', '吉林', '江苏'],
+        ['江西', '四川', '海南', '贵州', '云南'],
+        ['西藏', '陕西', '甘肃', '青海', '珠海']
+      ],
+      cartList: [],
+      couponList: [
+        {
+          name: '优惠券',
+          price: '10',
+          activity: '满99减10',
+          useRange: '全品类使用',
+          disabled: true
+        },
+        {
+          name: '优惠券',
+          price: '10',
+          activity: '满99减10',
+          useRange: '全品类使用',
+          disabled: false
+        },
+        {
+          name: '优惠券',
+          price: '10',
+          activity: '满99减10',
+          useRange: '全品类使用',
+          disabled: false
+        }
+      ],
+      priceDetailDTO: {},
+      skuList: []
+    };
+  },
+  computed: {},
+  methods: {
+    // 选择配送区域
+    changeCity (city) {
+      this.city = city;
+    },
+    // 跳转商品详情
+    goGoodsDetail (skuId, goodsId) {
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 跳转店铺首页
+    goShopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: { id }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 收藏商品
+    collectGoods (id) {
+      this.$Modal.confirm({
+        title: '收藏',
+        content: '<p>商品收藏后可在个人中心我的收藏查看</p>',
+        onOk: () => {
+          APIMember.collectGoods('GOODS', id).then((res) => {
+            if (res.success) {
+              this.$Message.success('收藏商品成功');
+              this.getCartList();
+            }
+          });
+        },
+        onCancel: () => { }
+      });
+    },
+    // 删除商品
+    delGoods (id) {
+      const idArr = [];
+      if (!id) {
+        const list = this.cartList;
+        list.forEach((shop) => {
+          shop.skuList.forEach((goods) => {
+            idArr.push(goods.goodsSku.id);
+          });
+        });
+      } else {
+        idArr.push(id);
+      }
+      this.$Modal.confirm({
+        title: '删除',
+        content: '<p>确定要删除该商品吗？</p>',
+        onOk: () => {
+          APICart.delCartGoods({ skuIds: idArr.toString() }).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success('删除成功');
+              this.getCartList();
+            } else {
+              this.$Message.error(res.message);
+            }
+          });
+        }
+      });
+    },
+    clearCart () { // 清空购物车
+      this.$Modal.confirm({
+        title: '提示',
+        content: '<p>确定要清空购物车吗？清空后不可恢复</p>',
+        onOk: () => {
+          APICart.clearCart().then((res) => {
+            if (res.code === 200) {
+              this.$Message.success('清空购物车成功');
+              this.getCartList();
+            } else {
+              this.$Message.error(res.message);
+            }
+          });
+        }
+      });
+    },
+    // 跳转支付页面
+    pay () {
+      if (this.checkedNum) {
+        this.$router.push({ path: '/pay', query: { way: 'CART' } });
+      } else {
+        this.$Message.warning('请至少选择一件商品');
+      }
+    },
+    // 展示优惠券
+    showCoupon (storeId, index) {
+      this.couponAvailable = index;
+    },
+    changeNum (val, id) {
+      // 设置购买数量
+      console.log(val, id);
+      APICart.setCartGoodsNum({ skuId: id, num: val }).then((res) => {
+        console.log(res);
+        if (res.code === 200) {
+          this.getCartList();
+        }
+      });
+    },
+    async changeChecked (status, type, id) {
+      // 设置商品选中状态
+      const check = status ? 1 : 0;
+      if (type === 'all') {
+        // 全选
+        await APICart.setCheckedAll({ checked: check });
+      } else if (type === 'shop') {
+        // 选中店铺所有商品
+        await APICart.setCheckedSeller({ checked: check, storeId: id });
+      } else {
+        // 单个商品
+        await APICart.setCheckedGoods({ checked: check, skuId: id });
+      }
+
+      this.getCartList();
+    },
+
+    async receiveShopCoupon (item) { // 领取优惠券
+      let res = await APIMember.receiveCoupon(item.id)
+      if (res.code === 200) {
+        this.$set(item, 'disabled', true)
+        this.$Message.success('领取成功')
+      } else {
+        this.$Message.error(res.message)
+      }
+    },
+    async getCartList () {
+      // 购物车列表
+      this.loading = true;
+      try {
+        let res = await APICart.cartGoodsAll();
+        this.loading = false;
+        if (res.code === 200) {
+          this.cartList = res.result.cartList;
+          this.priceDetailDTO = res.result.priceDetailDTO;
+          this.skuList = res.result.skuList;
+          this.checkedNum = 0;
+          let allChecked = true;
+          for (let k = 0; k < this.cartList.length; k++) {
+            let shop = this.cartList[k]
+            let list = await APIMember.couponList({storeId: shop.storeId})
+            shop.couponList.push(...list.result.records)
+          }
+          for (let i = 0; i < this.skuList.length; i++) {
+            if (this.skuList[i].checked) {
+              this.checkedNum += this.skuList[i].num;
+            } else {
+              allChecked = false;
+            }
+          }
+          this.$forceUpdate()
+          this.allChecked = allChecked;
+        }
+      } catch (error) {
+        this.loading = false;
+      }
+    }
+  },
+  mounted () {
+    this.getCartList();
+    APICart.cartCount().then(res => { // 购物车商品数量
+      if (res.success) this.goodsTotal = res.result;
+    });
+    if (!this.Cookies.getItem('logo')) {
+      getLogo().then(res => {
+        if (res.success) {
+          let logoObj = JSON.parse(res.result.settingValue)
+          this.Cookies.setItem('logo', logoObj.buyerSideLogo)
+        }
+      })
+    } else {
+      this.logoImg = this.Cookies.getItem('logo')
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/** logo 搜索 start **/
+.logo {
+  height: 40px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 20px auto 0;
+  div:nth-child(1) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    img {
+      width: 150px;
+      height: auto;
+      cursor: pointer;
+    }
+    div:nth-child(2) {
+      width: 200px;
+      color: #999;
+      font-size: 16px;
+      margin: 0 20px;
+      span {
+        color: $theme_color;
+      }
+    }
+  }
+}
+.cart-content {
+  margin: 0 auto;
+  width: 1200px;
+  position: relative;
+}
+/** logo end */
+/** step步骤条 */
+.cart-steps {
+  height: 30px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  span {
+    @include content_color($light_content_color);
+    height: 30px;
+    text-align: center;
+    line-height: 30px;
+    display: inline-block;
+    padding: 0 15px;
+  }
+
+  .ivu-icon {
+    @include content_color($light_content_color);
+    font-size: 20px;
+    margin: 0 15px;
+  }
+
+  .active {
+    border-radius: 50px;
+    background-color: #ff8f23;
+    color: #fff;
+  }
+
+  .active-arrow {
+    color: #ff8f23;
+  }
+}
+/** 步骤条和配送区域总体 */
+.available-area {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 15px;
+}
+.city {
+  padding: 10px 15px;
+}
+.city-item {
+  font-weight: bold;
+  cursor: pointer;
+  padding: 5px;
+}
+.city-item:hover {
+  color: $theme_color;
+}
+/** 商品列表 */
+.cart-goods {
+  &-title {
+    height: 50px;
+    @include background_color($light_white_background_color);
+    @include title_color($title_color);
+    display: flex;
+    align-items: center;
+    padding: 0 20px;
+    div {
+      text-align: center;
+    }
+    .goods-title {
+      flex: 1;
+    }
+  }
+  .cart-empty {
+    width: 100%;
+    text-align: center;
+    height: 300px;
+    padding-top: 100px;
+  }
+  &-items {
+    .shop-name {
+      height: 50px;
+      display: flex;
+      align-items: center;
+      padding: 0 20px;
+      position: relative;
+      @include title_color($light_title_color);
+      > * {
+        width: 50%;
+      }
+      .go-shop-page:hover {
+        color: $theme_color;
+        cursor: pointer;
+      }
+      .customer-service {
+        margin-left: 5px;
+        color: #fcc217;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+      /** 优惠券 */
+      .shop-coupon {
+        width: 80px;
+        height: 24px;
+        position: relative;
+        background: url(../assets/images/cart-coupon-icons02.png) 0 0 no-repeat;
+        > div {
+          position: absolute;
+          top: 35px;
+          left: 0;
+          width: 300px;
+          height: 300px;
+          background-color: #fff;
+          border: 1px solid $theme_color;
+          // border-radius: 3px;
+          z-index: 1;
+          padding: 10px 20px;
+          &::before {
+            content: "";
+            display: block;
+            background: url(../assets/images/cart-coupon-icons02.png) 0 -58px no-repeat;
+            width: 80px;
+            height: 12px;
+            position: absolute;
+            top: -12px;
+            left: 0;
+          }
+          .coupon-item {
+            margin-bottom: 10px;
+            span:nth-child(1) {
+              border: 1px solid #e33937;
+              display: inline-block;
+              padding: 3px 10px;
+              color: $theme_color;
+              border-radius: 3px;
+            }
+            span:nth-child(2) {
+              font-size: 12px;
+              margin-left: 5px;
+              color: #999;
+            }
+            .coupon-btn {
+              height: 26px;
+              float: right;
+              font-size: 12px;
+            }
+            &::after {
+              display: block;
+              content: "";
+              clear: right;
+            }
+          }
+        }
+      }
+      .promotion-notice {
+        text-align: right;
+        font-size: 12px;
+      }
+      .shop-coupon-show {
+        background-position-y: -34px;
+      }
+    }
+    .goods-item {
+      position: relative;
+      @extend .cart-goods-title;
+      @include background_color($light_white_background_color);
+      padding: 10px 20px;
+      height: auto;
+      > div:nth-child(1) {
+        padding-left: 15px;
+        width: 30px;
+      }
+      > div:nth-child(2) {
+        cursor: pointer;
+        display: flex;
+        box-sizing: border-box;
+        padding-left: 20px;
+        position: relative;
+        img {
+          width: 70px;
+          height: 70px;
+        }
+        >div>p {
+          @include content_color($light_content_color);
+          font-size: 13px;
+          text-align: left;
+          margin-left: 10px;
+          &:hover {
+            color: $theme_color;
+          }
+        }
+      }
+      > div:nth-child(5) {
+        font-weight: bold;
+      }
+      .num-input {
+        width: 60px;
+        border: 1px solid #999;
+        border-radius: 5px;
+        padding: 0 5px;
+        &:focus {
+          outline-color: $theme_color;
+        }
+      }
+    }
+    .error-goods{
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      margin-left: -20px;
+      background-color: rgba($color: #999, $alpha: .5);
+      z-index: 10;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-left: 150px;
+      color: #000;
+      padding-right: 30px;
+    }
+  }
+  &-footer {
+    @extend .cart-goods-title;
+    position: sticky;
+    bottom: 0;
+    border-top: 1px solid #ddd;
+    margin-top: 10px;
+    padding: 0 0 0 20px;
+    line-height: 50px;
+    justify-content: space-between;
+    > div {
+      display: flex;
+    }
+    .selected-count {
+      span {
+        color: $theme_color;
+      }
+    }
+
+    .save-price span {
+      color: #000;
+    }
+    .total-price span {
+      color: $theme_color;
+      font-size: 20px;
+    }
+    .pay {
+      background-color: $theme_color;
+      width: 150px;
+      font-size: 20px;
+      color: #fff;
+      height: 100%;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+  .handle-btn {
+    font-size: 12px;
+    color: $handle-btn-color;
+    cursor: pointer;
+    &:hover {
+      color: $theme_color;
+    }
+  }
+}
+.like {
+  width: 1200px;
+  margin: 10px auto;
+  // padding: 20px 0;
+  @include white_background_color();
+}
+.likeGoods,
+.shop-nav-container {
+  width: 1200px;
+  margin: 0 auto;
+}
+.ivu-divider {
+  background: $theme_color;
+  height: 2px;
+}
+.width_150 {
+  width: 150px;
+}
+.width_60 {
+  width: 60px;
+}
+.promotion {
+  display: flex;
+  margin-top: 5px;
+  margin-left: 5px;
+  >span{
+    border: 1px solid $theme_color;
+    color: $theme_color;
+    font-size: 12px;
+    border-radius: 2px;
+    padding: 0 2px;
+  }
+  >p{
+    font-size: 12px;
+    margin-left: 10px;
+    color: #999;
+  }
+}
+
+</style>
+<style>
+  .ivu-input-number-input {
+    text-align: center;
+  }
+</style>
diff --git a/buyer/src/pages/Feedback.vue b/buyer/src/pages/Feedback.vue
new file mode 100644
index 00000000..a1077dce
--- /dev/null
+++ b/buyer/src/pages/Feedback.vue
@@ -0,0 +1,89 @@
+<template>
+    <div>
+        <div class="feedback-container">
+            <div class="feedback-img-box">
+                <img src="../assets/images/feedback.png" />
+            </div>
+            <div class="feedback-box-border">
+                <div class="feedback-box">
+                    <div class="feedback-title">
+                        <h1>意见反馈</h1>
+                        <h2>感谢你的反馈，我们会积极改善，做出更好的服务的</h2>
+                    </div>
+                    <div class="feedback-content">
+                        <div class="feedback-form">
+                            <Form :model="formItem" :label-width="80">
+                                <FormItem label="标题">
+                                    <i-input v-model="formItem.title" placeholder="请输入标题"></i-input>
+                                </FormItem>
+                                <FormItem label="反馈信息">
+                                    <i-input
+                                        v-model="formItem.content"
+                                        type="textarea"
+                                        :autosize="{minRows: 8,maxRows: 10}"
+                                        placeholder="请输入反馈信息"
+                                    ></i-input>
+                                </FormItem>
+                                <FormItem>
+                                    <Button type="primary">提交</Button>
+                                    <Button type="ghost">清空信息</Button>
+                                </FormItem>
+                            </Form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "Feedback",
+    data() {
+        return {
+            formItem: {
+                title: "",
+                content: "",
+            },
+        };
+    },
+};
+</script>
+
+<style scoped>
+.feedback-container {
+    margin: 15px auto;
+    width: 80%;
+    height: 600px;
+    display: flex;
+    align-items: center;
+    /* background-color: #ccc; */
+}
+.feedback-img-box {
+    width: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.feedback-img-box img {
+    width: 80%;
+}
+.feedback-box-border {
+    width: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.feedback-box {
+    width: 480px;
+}
+.feedback-content {
+    margin: 15px auto;
+    border: 1px #ccc dotted;
+}
+.feedback-form {
+    margin: 30px auto;
+    width: 90%;
+}
+</style>
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
new file mode 100644
index 00000000..30338eef
--- /dev/null
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -0,0 +1,170 @@
+<template>
+  <div style="background:#fff;">
+    <BaseHeader></BaseHeader>
+    <Search></Search>
+    <drawer></drawer>
+    <ShopHeader v-if="goodsMsg.data" :detail="goodsMsg.data"></ShopHeader>
+    <div class="shop-item-path">
+      <div class="shop-nav-container">
+        <Breadcrumb>
+          <BreadcrumbItem to="/">首页</BreadcrumbItem>
+          <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">{{item.name}}</BreadcrumbItem>
+        </Breadcrumb>
+        <div class="store-collect">
+          <span class="mr_10"><router-link :to="'Merchant?id='+goodsMsg.data.storeId">{{goodsMsg.data.storeName}}</router-link></span>
+          <span @click="collect" ><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
+        </div>
+      </div>
+    </div>
+    <!-- 商品信息展示 -->
+    <ShowGoods v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoods>
+    <!-- 商品详细展示 -->
+    <ShowGoodsDetail v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoodsDetail>
+
+    <!--    猜你喜欢-->
+    <!-- <div class="like">
+      <div class="likeGoods">
+        <ShowLikeGoods/>
+      </div>
+    </div> -->
+    <Spin size="large" fix v-if="isLoading"></Spin>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+<script>
+import Search from '@/components/Search';
+import ShopHeader from '@/components/header/ShopHeader';
+import ShowGoods from '@/components/goodsDetail/ShowGoods';
+import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
+import ShowLikeGoods from '@/components/like';
+import { goodsSkuDetail } from '@/api/goods';
+import { cancelCollect, collectGoods, isCollection } from '@/api/member';
+export default {
+  name: 'GoodsDetail',
+  beforeRouteEnter (to, from, next) {
+    window.scrollTo(0, 0);
+    next();
+  },
+  created () {
+    this.getGoodsDetail();
+    if (this.Cookies.getItem('userInfo')) {
+      isCollection('STORE', this.goodsMsg.data.storeId).then(res => {
+        if (res.success && res.result) {
+          this.storeCollected = true;
+        }
+      })
+    }
+  },
+  mounted () {
+    
+  },
+  data () {
+    return {
+      tagsColor: ['blue', 'green', 'red', 'yellow'],
+      goodsMsg: {},
+      isLoading: false,
+      categoryBar: [],
+      storeCollected: false
+    };
+  },
+  methods: {
+    getGoodsDetail () {
+      this.isLoading = true;
+      const params = this.$route.query
+      goodsSkuDetail(params).then((res) => {
+        this.isLoading = false;
+        if (res.code === 200) {
+          const result = res.result;
+          const cateName = res.result.categoryName;
+          const cateId = result.data.categoryPath.split(',');
+          const cateArr = [];
+          cateId.forEach((e, index) => { // 插入分类id和name
+            cateArr.push({
+              id: e,
+              name: cateName[index]
+            });
+          });
+          this.categoryBar = cateArr;
+          this.goodsMsg = res.result;
+        } else {
+          this.$Message.error(res.message)
+          this.$router.push('/')
+        }
+      }).catch(() => {
+        this.$router.push('/')
+      });
+    },
+    goGoodsList (currIndex) {
+      const arr = []
+      this.categoryBar.forEach((e, index) => {
+        if (index <= currIndex) {
+          arr.push(e.id)
+        }
+      })
+      return location.origin + '/goodsList?categoryId=' + arr.toString()
+    },
+    async collect () { // 收藏店铺
+      if (this.storeCollected) {
+        let cancel = await cancelCollect('STORE', this.goodsMsg.data.storeId)
+        if (cancel.success) {
+          this.$Message.success('已取消收藏')
+          this.storeCollected = false;
+        }
+      } else {
+        let collect = await collectGoods('STORE', this.goodsMsg.data.storeId);
+        if (collect.code === 200) {
+          this.storeCollected = true;
+          this.$Message.success('收藏店铺成功,可以前往个人中心我的收藏查看');
+        }
+      }
+    }
+  },
+  watch: {
+    '$route.query.skuId': function (val) {
+      location.reload();
+    }
+  },
+  computed: {
+  },
+  components: {
+    Search,
+    ShopHeader,
+    ShowGoods,
+    ShowGoodsDetail,
+    ShowLikeGoods
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.shop-item-path {
+  height: 38px;
+  @include background_color($light_background_color);
+  line-height: 38px;
+  color: #2c2c2c;
+}
+
+.like {
+  width: 100%;
+  padding: 20px 0;
+  @include white_background_color();
+}
+.shop-nav-container {
+  width: 1200px;
+  margin: 0 auto;
+  position: relative;
+  .store-collect {
+    position: absolute;
+    right: 20px;
+    top: 0;
+    color: #999;
+    span{
+      &:hover{
+        cursor: pointer;
+        color: $theme_color;
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
new file mode 100644
index 00000000..49a5cb83
--- /dev/null
+++ b/buyer/src/pages/GoodsList.vue
@@ -0,0 +1,339 @@
+<template>
+  <div>
+    <BaseHeader></BaseHeader>
+    <Search @search="handleSearch"></Search>
+    <drawer></drawer>
+    <cateNav></cateNav>
+    <div class="container">
+      <!-- 商品筛选栏 -->
+      <GoodsClassNav @getParams="getParams"></GoodsClassNav>
+
+      <!-- 商品展示容器 -->
+      <div class="goods-box">
+        <!-- 商品列表 -->
+        <div class="goods-list-box">
+          <!-- 排序 -->
+          <div class="goods-list-tool">
+            <ul>
+              <li
+                v-for="(item, index) in goodsTool"
+                :key="index"
+                @click="orderBy(item.en, index)"
+              >
+                <span :class="{ 'goods-list-tool-active': index === sortIndex }"
+                  >{{ item.title }}<Icon type="ios-arrow-round-down"
+                /></span>
+              </li>
+              <li @click="orderBy('price', 5, 'up')" class="price-sort">
+                <span :class="{ 'goods-list-tool-active': 5 === sortIndex }">
+                  价格
+                  <div>
+                    <Icon
+                      type="md-arrow-dropup"
+                      :class="{ 'price-color': sortPriceIndex == 'desc' }"
+                    />
+                    <Icon
+                      type="md-arrow-dropdown"
+                      :class="{ 'price-color': sortPriceIndex == 'asc' }"
+                    />
+                  </div>
+                </span>
+              </li>
+            </ul>
+          </div>
+          <!-- 列表 -->
+          <div class="goods-list">
+            <empty v-if="goodsList.length === 0" />
+            <div
+              v-else
+              class="goods-show-info"
+              v-for="(item, index) in goodsList"
+              :key="index"
+              @click="goGoodsDetail(item.id, item.goodsId)"
+            >
+              <div class="goods-show-img">
+                <img width="220" height="220" :src="item.thumbnail" />
+              </div>
+              <div class="goods-show-price">
+                <span>
+                  <span class="seckill-price text-danger">{{
+                    item.price | unitPrice("￥")
+                  }}</span>
+                </span>
+              </div>
+              <div class="goods-show-detail">
+                <span>{{ item.goodsName }}</span>
+              </div>
+              <div class="goods-show-num">
+                已有<span>{{ item.commentNum || 0 }}</span
+                >人评价
+              </div>
+              <div class="goods-show-seller">
+                <span>{{ item.storeName }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="goods-page">
+        <Page
+          show-sizer
+          @on-change="changePageNum"
+          @on-page-size-change="changePageSize"
+          :total="total"
+          :page-size="params.pageSize"
+        ></Page>
+      </div>
+    </div>
+    <Spin size="large" fix v-if="loading"></Spin>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+<script>
+import GoodsClassNav from '@/components/nav/GoodsClassNav';
+import * as apiGoods from '@/api/goods';
+export default {
+  name: 'GoodsList',
+  beforeRouteEnter (to, from, next) {
+    window.scrollTo(0, 0);
+    next();
+  },
+  data () {
+    return {
+      sortIndex: 0,
+      sortPriceIndex: false, // 判断价格升序还是降序
+      goodsTool: [
+        { title: '综合', en: '' },
+        { title: '销量', en: 'buyCount' },
+        { title: '评论数', en: 'commentNum' },
+        { title: '新品', en: 'releaseTime' }
+      ],
+      goodsList: [],
+      loading: false,
+      total: 0,
+      params: {
+        pageNumber: 0,
+        pageSize: 20,
+        categoryId: ''
+      }
+    };
+  },
+  watch: {
+    $route () {
+      const keyword = this.$route.query.keyword
+      this.handleSearch(keyword)
+    }
+  },
+  methods: {
+    handleSearch (key) {
+      this.params.keyword = key
+      this.params.pageNumber = 0
+      this.getGoodsList()
+    },
+    orderBy (data, index) {
+      // 排序
+      this.sortIndex = index;
+      this.params.sort = data;
+      this.params.order = 'desc';
+      if (data === 'price') {
+        if (!this.sortPriceIndex) {
+          this.sortPriceIndex = 'asc';
+        } else {
+          this.sortPriceIndex === 'desc' ? (this.sortPriceIndex = 'asc') : (this.sortPriceIndex = 'desc');
+        }
+        this.params.order = this.sortPriceIndex
+      } else {
+        this.sortPriceIndex = false
+      }
+      this.getGoodsList();
+    },
+    goGoodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val - 1;
+      this.getGoodsList();
+    },
+    changePageSize (val) {
+      this.params.pageNumber = 0;
+      this.params.pageSize = val;
+      this.getGoodsList();
+    },
+    getGoodsList () {
+      this.loading = true;
+      apiGoods.goodsList(this.params)
+        .then((res) => {
+          this.loading = false;
+          if (res.code === 200) {
+            this.goodsList = res.result.content;
+            this.total = res.result.totalElements;
+          }
+        }).catch(() => {
+          this.loading = false;
+        });
+    },
+    getParams (val) {
+      // 筛选条件回显
+      Object.assign(this.params, val)
+      this.getGoodsList()
+    }
+  },
+  created () {
+    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]
+    } else {
+      Object.assign(this.params, this.$route.query)
+    }
+    this.getGoodsList()
+  },
+  mounted () {},
+  components: {
+    GoodsClassNav
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '../assets/styles/goodsList.scss';
+.container {
+  margin: 15px auto;
+  width: 1200px;
+  min-width: 1000px;
+  position: relative;
+}
+.goods-box {
+  display: flex;
+}
+/* ---------------侧边广告栏开始------------------- */
+.as-box {
+  width: 200px;
+  border: 1px solid #ccc;
+}
+.item-as-title {
+  width: 100%;
+  height: 36px;
+  color: $theme_color;
+  line-height: 36px;
+  font-size: 18px;
+}
+.item-as-title span:first-child {
+  margin-left: 20px;
+}
+.item-as-title span:last-child {
+  float: right;
+  margin-right: 15px;
+  font-size: 10px;
+  color: #ccc;
+}
+.item-as {
+  width: 160px;
+  margin: 18px auto;
+}
+.item-as-img {
+  width: 160px;
+  height: 160px;
+  margin: 0px auto;
+}
+.item-as-price span {
+  font-size: 18px;
+}
+.item-as-intro {
+  margin-top: 5px;
+  font-size: 12px;
+}
+.item-as-selled {
+  margin-top: 5px;
+  font-size: 12px;
+}
+.item-as-selled span {
+  color: #005aa0;
+}
+/* ---------------侧边广告栏结束------------------- */
+
+/* ---------------商品栏开始------------------- */
+.goods-list-box {
+  position: relative;
+  width: 100%;
+  // margin-left: 15px;
+  // width: calc(100% - 215px);
+}
+.goods-list-tool {
+  width: 100%;
+  height: 38px;
+  border: 1px solid #ccc;
+  background-color: #f1f1f1;
+}
+.goods-list-tool ul {
+  padding-left: 15px;
+  font-size: 12px;
+  margin-top: 10px;
+  &::after {
+    content: "";
+    display: block;
+    clear: left;
+  }
+  .price-sort {
+    span {
+      display: inline-block;
+      vertical-align: middle;
+      width: 50px;
+      height: 22px;
+      position: relative;
+      line-height: 15px;
+      top: -2px;
+      left: 0;
+    }
+    span > div {
+      display: inline-block;
+      .ivu-icon {
+        font-size: 12px;
+        position: absolute;
+        &:nth-child(1) {
+          top: 1px;
+        }
+        &:nth-child(2) {
+          top: 7px;
+        }
+      }
+      .price-color {
+        color: #b3b3b3;
+      }
+    }
+  }
+}
+.goods-list-tool li {
+  cursor: pointer;
+  float: left;
+}
+.goods-list-tool span {
+  padding: 3px 5px;
+  border: 1px solid #ccc;
+  margin-left: -1px;
+  background-color: #fff;
+}
+.goods-list-tool span:hover {
+  border-color: $theme_color;
+  position: relative;
+  text-decoration: none;
+  z-index: 1;
+}
+.goods-list-tool .ivu-icon {
+  font-weight: bold;
+  font-size: 16px;
+}
+.goods-list-tool-active {
+  color: #fff;
+  border-left: 1px solid #ccc;
+  background-color: $theme_color !important;
+}
+
+/* ---------------商品栏结束------------------- */
+</style>
diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue
new file mode 100644
index 00000000..a1de498d
--- /dev/null
+++ b/buyer/src/pages/Index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="container">
+    <drawer></drawer>
+    <!-- 固定头部 -->
+    <hover-search class="hover-search" :class="{show: topSearchShow}"></hover-search>
+
+    <!-- 顶部广告 -->
+    <FixedTopPage :data="topAdvert"></FixedTopPage>
+    <!-- 头部 包括登录，我的订单等 -->
+    <BaseHeader></BaseHeader>
+    <!-- 搜索框、logo -->
+    <Search></Search>
+    <!-- 商品分类 -->
+    <cateNav :showAlways="true" v-if="showNav"></cateNav>
+    <!-- 楼层装修部分 -->
+    <model-form ref="modelForm" :data="modelForm"></model-form>
+    <!-- 底部栏 -->
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+<script>
+import Search from '@/components/Search';
+import ModelForm from '@/components/indexDecorate/modelForm';
+import HoverSearch from '@/components/header/hoverSearch';
+import storage from '@/plugins/storage';
+import { indexData } from '@/api/index.js';
+export default {
+  name: 'Index',
+  mounted () {
+    this.getIndexData();
+    let that = this;
+    window.onscroll = function () {
+      let top = document.documentElement.scrollTop || document.body.scrollTop;
+      if (top > 300) {
+        that.topSearchShow = true;
+      } else {
+        that.topSearchShow = false;
+      }
+    };
+  },
+  data () {
+    return {
+      modelForm: { list: [] }, // 楼层装修数据
+      topAdvert: {}, // 顶部广告
+      showNav: false, // 是否展示分类栏
+      topSearchShow: false // 滚动后顶部搜索栏展示
+    };
+  },
+  methods: {
+    getIndexData () {
+      // 获取首页装修数据
+      indexData({ clientType: 'PC' }).then((res) => {
+        if (res.success) {
+          let dataJson = JSON.parse(res.result.pageData);
+          this.modelForm = dataJson;
+          storage.setItem('navList', dataJson.list[1])
+          this.showNav = true
+          this.topAdvert = dataJson.list[0];
+        }
+      });
+    }
+  },
+  components: {
+    Search,
+    ModelForm,
+    HoverSearch
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.container {
+  @include sub_background_color($light_background_color);
+}
+/** 商品分类 */
+.nav-con {
+  width: 1200px;
+  height: 40px;
+  background: #eee;
+  margin: 0 auto;
+  display: flex;
+  .all-categories {
+    width: 200px;
+    line-height: 40px;
+    color: #fff;
+    background-color: $theme_color;
+    text-align: center;
+    font-size: 16px;
+  }
+  .nav-item {
+    width: 1000px;
+    height: 40px;
+    line-height: 40px;
+    overflow: hidden;
+    list-style: none;
+    background-color: #eee;
+    display: flex;
+    li {
+      width: 50px;
+      font-size: 16px;
+      font-weight: bold;
+      margin-left: 15px;
+      color: rgb(89, 88, 88);
+      font-size: 15px;
+      &:hover {
+        color: $theme_color;
+      }
+    }
+  }
+}
+</style>
+<style>
+.hover-search {
+  width: 100%;
+  height: 60px;
+  transform: translateY(-200px);
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  z-index: 3000;
+  box-shadow:0 0 10px 2px rgb(90 90 90 / 60%);
+  transition: 0.35s;
+}
+.show {
+  transform: translateY(0);
+  -webkit-transform: translateZ(0);
+  -moz-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  -o-transform: translateZ(0);
+  transform: translateZ(0);
+  top: 0;
+}
+</style>
diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
new file mode 100644
index 00000000..4dd46f34
--- /dev/null
+++ b/buyer/src/pages/Login.vue
@@ -0,0 +1,484 @@
+<template>
+  <div class="login" @keyup.enter="handleSubmit('formInline')">
+    <!-- 顶部logo -->
+    <div class="top-content">
+      <div class="logo-box">
+        <img
+          :src="logoImg"
+          @click="$router.push('/')"
+        />
+        <div>欢迎登录</div>
+      </div>
+    </div>
+    <!-- 登录主体 包含轮播图 登录模块 -->
+    <div class="login-container">
+      <!-- 轮播 -->
+      <Carousel loop :autoplay-speed="5000" class="login-carousel" arrow="never">
+        <CarouselItem>
+          <div class="demo-carousel">
+            <img
+              src="https://wanmi-b2b.oss-cn-shanghai.aliyuncs.com/201811141632252680"
+            />
+          </div>
+        </CarouselItem>
+      </Carousel>
+      <!-- 登录模块 -->
+      <div class="form-box">
+        <div class="account-number">
+          <div class="tab-switch">
+            <span>{{type?'账号登录':'验证码登录'}}</span>
+            <span @click="type = !type">{{type?'验证码登录':'账号登录'}}</span>
+          </div>
+          <div @click="$router.push('signUp')">立即注册</div>
+        </div>
+        <!-- 账号密码登录 -->
+        <Form
+          ref="formInline"
+          :model="formData"
+          :rules="ruleInline"
+          v-show="type === true"
+        >
+          <FormItem prop="username">
+            <i-input
+              type="text"
+              v-model="formData.username"
+              clearable
+              placeholder="用户名"
+            >
+              <Icon type="md-person" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="formData.password"
+              clearable
+              placeholder="密码"
+            >
+              <Icon type="md-lock" slot="prepend"> </Icon>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button
+              type="error"
+              @click.stop="handleSubmit('formInline')"
+              long
+              >登录</Button>
+          </FormItem>
+        </Form>
+        <!-- 验证码登录 -->
+        <Form
+          ref="formSms"
+          :model="formSms"
+          :rules="ruleInline"
+          v-show="type === false"
+        >
+          <FormItem prop="mobile">
+            <i-input
+              type="text"
+              v-model="formSms.mobile"
+              clearable
+              placeholder="手机号"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="code">
+            <i-input
+              type="text"
+              v-model="formSms.code"
+              placeholder="手机验证码"
+            >
+              <Icon
+                type="ios-text-outline"
+                style="font-weight: bold"
+                slot="prepend"
+              />
+              <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button @click.stop="verifyBtnClick" long :type="verifyStatus?'success':'default'">{{verifyStatus?'验证通过':'点击完成安全验证'}}</Button>
+          </FormItem>
+          <FormItem>
+            <Button
+              type="error"
+              @click="handleSubmit('formSms')"
+              long
+              >登录</Button>
+          </FormItem>
+        </Form>
+        <div class="regist">
+          <span @click="$router.push('forgetPassword')">忘记密码</span>
+        </div>
+        <div class="other-login">
+          <Icon custom="iconfont icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
+          <Icon custom="iconfont icon-weixin" color="" class="icon-hover"  @click="handleWebLogin('WECHAT_PC')"/>
+          <!-- <Icon custom="iconfont icon-zhifubao" color="" class="icon-hover" @click="handleWebLogin('ALIPAY')"/> -->
+          <!-- <Icon custom="iconfont icon-weibo" color="" class="icon-hover" @click="handleWebLogin('WEIBO')"/> -->
+        </div>
+      </div>
+      <!-- 拼图验证码 -->
+      <verify
+        ref="verify"
+        class="verify-con"
+        verifyType="LOGIN"
+        @change="verifyChange"
+      ></verify>
+    </div>
+    <div class="foot">
+      <Row type="flex" justify="space-around" class="help">
+        <router-link to="/article" class="item" target="_blank">帮助</router-link>
+        <router-link to="/article?id=1371779927900160000" class="item" target="_blank">隐私</router-link>
+        <router-link to="/article?id=1371992704333905920" class="item" target="_blank">条款</router-link>
+      </Row>
+      <Row type="flex" justify="center" class="copyright">
+        Copyright © 2021 - Present
+        <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as RegExp from '@/plugins/RegExp.js';
+import { md5 } from '@/plugins/md5.js';
+import * as apiLogin from '@/api/login.js';
+import { sendSms } from '@/api/common.js';
+import { webLogin, loginCallback } from '@/api/login.js';
+import storage from '@/plugins/storage.js';
+import verify from '@/components/verify';
+
+export default {
+  name: 'Login',
+  components: {
+    verify
+  },
+  data () {
+    return {
+      type: true, // true 账号登录  false 验证码登录
+      formData: {
+        // 登录表单
+        username: '',
+        password: ''
+      },
+      formSms: {
+        code: '',
+        mobile: ''
+      },
+      verifyStatus: false,
+      ruleInline: {
+        // 验证规则
+        username: [{ required: true, message: '请输入用户名' }],
+        password: [
+          { required: true, message: '请输入密码' },
+          { type: 'string', min: 6, message: '密码不能少于6位' }
+        ],
+        mobile: [
+          { required: true, message: '请输入手机号码' },
+          {
+            pattern: RegExp.mobile,
+            message: '请输入正确的手机号'
+          }
+        ],
+        code: [{ required: true, message: '请输入手机验证码' }]
+      },
+      codeMsg: '发送验证码',
+      interval: '',
+      time: 60,
+      logoImg: ''
+    };
+  },
+  methods: {
+    // 登录
+    handleSubmit (name) {
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (this.type) {
+            this.$refs.verify.show = true;
+          } else {
+            let data = JSON.parse(JSON.stringify(this.formSms));
+            apiLogin.smsLogin(data).then((res) => {
+              this.$refs.verify.show = false;
+              if (res.code === 200) {
+                this.$Message.success('登录成功');
+                storage.setItem('accessToken', res.result.accessToken);
+                storage.setItem('refreshToken', res.result.refreshToken);
+                apiLogin.getMemberMsg().then((res) => {
+                  if (res.code === 200) {
+                    storage.setItem('userInfo', res.result);
+                    let query = this.$route.query;
+                    if (query.rePath) {
+                      this.$router.push({path: query.rePath, query: JSON.parse(query.query)});
+                    } else {
+                      this.$router.push('/');
+                    }
+                  }
+                });
+              } else {
+                this.$Message.error(res.message);
+              }
+            });
+          }
+        } else {
+          // this.$Message.error('请填写正确的用户名或密码');
+        }
+      });
+    },
+    sendCode () {
+      if (this.time === 60) {
+        if (this.formSms.mobile === '') {
+          this.$Message.warning('请先填写手机号');
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning('请先完成安全验证');
+          return;
+        }
+        let params = {
+          mobile: this.formSms.mobile,
+          verificationEnums: 'LOGIN'
+        };
+        sendSms(params).then(res => {
+          if (res.code === 200) {
+            this.$Message.success('验证码发送成功');
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = '重新发送';
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
+    verifyChange (con) { // 拼图验证码回显
+      if (!con.status) return;
+
+      if (this.type === true) { // 账号密码登录
+        let data = JSON.parse(JSON.stringify(this.formData));
+        data.password = md5(data.password);
+        this.$refs.verify.show = false;
+        this.$Spin.show();
+        apiLogin.login(data).then((res) => {
+          if (res.code === 200) {
+            this.$Message.success('登录成功');
+            storage.setItem('accessToken', res.result.accessToken);
+            storage.setItem('refreshToken', res.result.refreshToken);
+            apiLogin.getMemberMsg().then((res) => {
+              this.$Spin.hide();
+              if (res.code === 200) {
+                storage.setItem('userInfo', res.result);
+                let query = this.$route.query;
+                if (query.rePath) {
+                  this.$router.push({path: query.rePath, query: JSON.parse(query.query)});
+                } else {
+                  this.$router.push('/');
+                }
+              }
+            });
+          } else {
+            this.$Spin.hide();
+            this.$Message.error(res.message);
+          }
+        }).catch(() => {
+          this.$Spin.hide()
+        });
+      } else {
+        this.verifyStatus = true;
+        this.$refs.verify.show = false;
+      }
+    },
+    verifyBtnClick () {
+      if (!this.verifyStatus) {
+        this.$refs.verify.show = true;
+      }
+    },
+    handleWebLogin (type) { // 第三方登录
+      webLogin(type);
+    }
+  },
+  mounted () {
+    let uuid = this.$route.query.state;
+    if (uuid) {
+      storage.setItem('uuid', uuid);
+      loginCallback(uuid).then(res => {
+        if (res.code === 200) {
+          const result = res.result;
+          storage.setItem('accessToken', result.accessToken);
+          storage.setItem('refreshToken', result.refreshToken);
+          apiLogin.getMemberMsg().then((res) => {
+            if (res.code === 200) {
+              storage.setItem('userInfo', res.result);
+              let query = this.$route.query;
+              if (query.rePath) {
+                this.$router.push({path: query.rePath, query: JSON.parse(query.query)});
+              } else {
+                this.$router.push('/');
+              }
+            }
+          });
+        }
+      });
+    }
+    this.logoImg = this.Cookies.getItem('logo')
+  },
+  watch: {
+    type (v) {
+      if (v) {
+        this.$refs.formInline.resetFields();
+      } else {
+        this.$refs.formSms.resetFields();
+      }
+      this.verifyStatus = false;
+      this.$refs.verify.show = false;
+      clearInterval(this.interval);
+      this.codeMsg = '发送验证码';
+      this.time = 60;
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.login {
+  height: 100%;
+  background-color: #f0f2f5;
+}
+.top-content {
+  width: 100%;
+  height: 80px;
+  position: relative;
+  z-index: 1;
+
+  box-shadow: 0 1px 1px #ddd;
+  background-color: #fff;
+
+  .logo-box {
+    width: 80%;
+    max-width: 1200px;
+    height: 80px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    img {
+      width: 150px;
+      cursor: pointer;
+    }
+    div {
+      font-size: 20px;
+      margin-top: 10px;
+    }
+  }
+}
+.login-carousel {
+  width: 100%;
+  height: 550px;
+  .demo-carousel {
+    height: 550px;
+    width: inherit;
+    display: flex;
+    justify-content: center;
+  }
+}
+
+.login-container {
+  position: relative;
+  width: 100%;
+  height: 550px;
+}
+
+.form-box {
+  width: 350px;
+  box-sizing: border-box;
+  position: absolute;
+  top: 80px;
+  right: 15%;
+  padding: 20px;
+  background:rgba(255,255,255,.8);
+  .account-number{
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    font-weight: bold;
+    >div:nth-child(2){
+      color: $theme_color;
+      cursor: pointer;
+    }
+    .tab-switch{
+      height: 40px;
+      font-size: 14px;
+
+      span:nth-child(1){
+        font-size: 16px;
+        border-right: 1px solid #ddd;
+        padding-right: 10px;
+      }
+
+      span:nth-child(2){
+        cursor: pointer;
+        padding-left: 10px;
+        &:hover{
+          color: $theme_color;
+        }
+      }
+    }
+  }
+}
+
+.verify-con{
+  position: absolute;
+  right: 16%;
+  top: 90px;
+  z-index: 10;
+}
+
+.other-login {
+  margin: 0 auto;
+  .ivu-icon {
+    font-size: 24px;
+  }
+}
+.regist {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -10px;
+  span {
+    margin-left: 10px;
+    &:hover {
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  left: calc(50% - 184px);
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+.icon-hover{
+  cursor: pointer;
+}
+</style>
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
new file mode 100644
index 00000000..91491574
--- /dev/null
+++ b/buyer/src/pages/Merchant.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="merchant">
+    <BaseHeader />
+    <!-- 搜索栏 -->
+    <Search :store="true" @search="search"></Search>
+    <!-- 店铺logo -->
+    <div class="shop-logo">
+      <div>
+        <img :src="storeMsg.storeLogo" height="50" alt="">
+        <div>
+          <p>{{storeMsg.storeName || 'xx店铺'}}</p>
+          <p>{{storeMsg.storeDesc || 'xx店铺描述'}}</p>
+        </div>
+        <div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div>
+      </div>
+    </div>
+    <div  class="store-category">
+      <ul>
+        <li @click="searchByCate({id:'', labelName: '店铺推荐'})">首页</li>
+        <li v-for="(cate, index) in cateList" :key="index" @click="searchByCate(cate)">
+          {{cate.labelName}}
+        </li>
+      </ul>
+    </div>
+
+    <div class="promotion-decorate">{{cateName}}</div>
+
+    <div class="goods-list">
+      <empty v-if="goodsList.length === 0" />
+      <div
+        v-else
+        class="goods-show-info"
+        v-for="(item, index) in goodsList"
+        :key="index"
+        @click="goGoodsDetail(item.id, item.goodsId)"
+      >
+        <div class="goods-show-img">
+          <img width="220" height="220" :src="item.thumbnail" />
+        </div>
+        <div class="goods-show-price">
+          <span>
+            <span class="seckill-price text-danger">{{
+              item.price | unitPrice("￥")
+            }}</span>
+          </span>
+        </div>
+        <div class="goods-show-detail">
+          <span>{{ item.goodsName }}</span>
+        </div>
+        <div class="goods-show-num">
+          已有<span>{{ item.commentNum || 0 }}</span>人评价
+        </div>
+      </div>
+    </div>
+    <div class="goods-page">
+      <Page
+        show-sizer
+        @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :total="total"
+        :page-size="params.pageSize"
+      ></Page>
+    </div>
+    <BaseFooter />
+  </div>
+</template>
+
+<script>
+import {getDetailById, getCateById} from '@/api/shopentry'
+import { cancelCollect, collectGoods, isCollection } from '@/api/member';
+import {goodsList} from '@/api/goods';
+export default {
+  name: 'Merchant',
+  data () {
+    return {
+      storeMsg: {},
+      cateList: [],
+      goodsList: [],
+      total: 0,
+      params: {
+        pageNumber: 1,
+        pageSize: 20,
+        keyword: '',
+        storeId: this.$route.query.id,
+        storeCatId: ''
+      },
+      cateName: '店铺推荐',
+      storeCollected: false
+    }
+  },
+  created () {
+    this.getStoreMsg()
+    this.getCateList()
+    this.getGoodsList()
+  },
+  mounted () {
+    if (this.Cookies.getItem('userInfo')) {
+      isCollection('STORE', this.soterMsg.storeId).then(res => {
+        if (res.success && res.result) {
+          this.storeCollected = true;
+        }
+      })
+    }
+  },
+  methods: {
+    getStoreMsg () { // 店铺信息
+      getDetailById(this.$route.query.id).then(res => {
+        if (res.success) {
+          this.storeMsg = res.result
+          document.title = this.storeMsg.storeName
+        }
+      })
+    },
+    getCateList () { // 店铺分类
+      getCateById(this.$route.query.id).then(res => {
+        if (res.success) {
+          this.cateList = res.result
+        }
+      })
+    },
+    getGoodsList () { // 商品信息
+      goodsList(this.params).then((res) => {
+        if (res.code === 200) {
+          this.goodsList = res.result.content;
+          this.total = res.result.totalElements;
+        }
+      }).catch(() => {
+      });
+    },
+    goGoodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    search (val) { // 搜索本店商品
+      console.log(val);
+      this.params.keyword = val
+      this.getGoodsList()
+    },
+    searchByCate (cate) { // 搜索同分类下商品
+      this.params.storeCatId = cate.id
+      this.cateName = cate.labelName
+      this.getGoodsList()
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val - 1;
+      this.getGoodsList();
+    },
+    changePageSize (val) {
+      this.params.pageNumber = 0;
+      this.params.pageSize = val;
+      this.getGoodsList();
+    },
+    async collect () { // 收藏店铺
+      if (this.storeCollected) {
+        let cancel = await cancelCollect('STORE', this.storeMsg.storeId)
+        if (cancel.success) {
+          this.$Message.success('已取消收藏')
+          this.storeCollected = false;
+        }
+      } else {
+        let collect = await collectGoods('STORE', this.storeMsg.storeId);
+        if (collect.code === 200) {
+          this.storeCollected = true;
+          this.$Message.success('收藏店铺成功,可以前往个人中心我的收藏查看');
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '../assets/styles/goodsList.scss';
+.merchant {
+  margin: 0 auto;
+}
+.shop-logo {
+  position: relative;
+  width: 100%;
+  background-color: #666;
+  padding: 10px;
+  color: #fff;
+  >div{
+    display: flex;
+    width: 1200px;
+    margin: 0 auto;
+    align-items: center;
+    >div{
+      margin-left: 10px;
+    }
+  }
+  img {
+    height: 80px;
+  }
+  p:nth-child(1) {
+    font-size: 20px;
+  }
+  p:nth-child(2){
+    font-size: 14px;
+  }
+}
+.store-collect{
+  margin-left: 20px!important;
+  &:hover{
+    cursor: pointer;
+  }
+}
+.store-category {
+  background-color: #005aa0;
+  color: #fff;
+  ul{
+    width: 1200px;
+    margin: 0 auto 10px;
+    padding: 3px 0;
+    display: flex;
+    li {
+      margin-right: 25px;
+    }
+    li:hover{
+      cursor: pointer;
+    }
+  }
+}
+.promotion-decorate::before,.promotion-decorate::after{
+  background-image: url('../../static/sprite@2x.png');
+}
+</style>
diff --git a/buyer/src/pages/ShoppingCart.vue b/buyer/src/pages/ShoppingCart.vue
new file mode 100644
index 00000000..2c7cc2ad
--- /dev/null
+++ b/buyer/src/pages/ShoppingCart.vue
@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <BaseHeader></BaseHeader>
+    <Search></Search>
+    <cateNav></cateNav>
+    <!-- 添加成功提示 -->
+    <div class="add-info-box-container">
+      <div class="add-info-box">
+        <div class="add-info-detail">
+          <div class="add-info-title">
+            <p>
+              <i class="fa fa-check-circle"></i> 商品已成功加入购物车！</p>
+          </div>
+          <div class="add-info-box-row">
+            <div class="add-info-img">
+              <img :src="this.detail.thumbnail" alt="">
+            </div>
+            <div class="add-info-intro">
+              <p>{{detail.goodsName}}</p>
+              <p class="add-info-intro-detail">数量：{{$route.query.count}}</p>
+            </div>
+          </div>
+        </div>
+        <div class="car-btn-group">
+          <div></div>
+          <div class="car-btn-row">
+            <router-link :to="`/goodsDetail?skuId=${detail.id}&goodsId=${detail.goodsId}`">
+              <button class="btn-car hover-pointer btn-car-to-detail">查看商品详情</button>
+            </router-link>
+            <router-link to="/cart">
+              <button class="btn-car hover-pointer btn-car-to-pay">去购物车结算></button>
+            </router-link>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="other-user-buy-box">
+      <div class="other-user-buy-title">
+        <p>可以顺便看下其他商品哦 ~</p>
+      </div>
+      <div class="other-user-buy-row" v-for="(items,index1) in recommend" :key="index1">
+        <div class="other-user-buy-item-box" v-for="(item,index2) in items" :key="index2">
+          <div class="other-user-buy-item-img">
+            <a href="item_detail.html"><img :src="item.img" alt=""></a>
+          </div>
+          <div class="other-buy-detail-box">
+            <div class="other-buy-title">
+              <a href="item_detail.html">
+                <p>{{item.intro}}</p>
+              </a>
+            </div>
+            <div class="other-buy-price">
+              <p>￥{{item.price}}</p>
+            </div>
+            <div class="other-buy-btn-box">
+              <router-link to="/goodsDetail">
+                <button class="other-buy-btn"><Icon type="ios-cart"></Icon> 加入购物车</button>
+              </router-link>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div> -->
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ShoppingCart',
+  beforeRouteEnter (to, from, next) {
+    window.scrollTo(0, 0);
+    next();
+  },
+  data () {
+    return {
+      detail: {}
+    };
+  },
+  mounted () {
+    let detail = this.$route.query.detail;
+    if (detail) this.detail = detail;
+  },
+  methods: {
+
+  }
+};
+</script>
+
+<style scoped lang="scss">
+/****************************加入购物车页面开始*****************************/
+.add-info-box-container{
+  width: 100%;
+  background-color: #F5F5F5;
+}
+.add-info-box{
+  width: 1200px;
+  margin: 0px auto;
+  padding: 15px 0px;
+  display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+.add-info-detail{
+  display: flex;
+    flex-direction: column;
+}
+.add-info-title{
+  font-size: 25px;
+  color: #71b247;
+}
+.add-info-box-row{
+  display: flex;
+    flex-direction: row;
+    margin-top: 15px;
+}
+.add-info-img{
+  width: 56px;
+  height: 56px;
+  margin-right: 15px;
+}
+.add-info-img img{
+  width: 100%;
+}
+.add-info-intro{
+  display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.add-info-intro-detail{
+  font-size: 12px;
+  color: #999999;
+}
+.car-btn-group{
+  display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+/*按钮*/
+.btn-car{
+  padding: 8px 10px;
+  font-size: 16px;
+  border-radius: 0px;
+  border:none;
+  margin-right: 15px;
+}
+.btn-car-to-detail{
+  background-color: #fff;
+  color: $theme_color;
+  border:1px solid #fff;
+}
+.btn-car-to-detail:hover{
+border:1px solid $theme_color;
+}
+.btn-car-to-pay{
+  background-color: $theme_color;
+  color: #fff;
+  border:1px solid $theme_color;
+}
+.btn-car-to-pay:hover{
+  background-color: $theme_color;
+  border:1px solid $theme_color;
+}
+/*其他用户购买*/
+.other-user-buy-box{
+  width: 90%;
+  margin: 0px auto;
+  display: flex;
+    flex-direction: column;
+}
+.other-user-buy-title{
+  margin-top: 25px;
+  font-size: 14px;
+  color: #666;
+  font-weight: bold;
+}
+.other-user-buy-row{
+  margin-top: 25px;
+  display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+.other-user-buy-item-box{
+  display: flex;
+    flex-direction: row;
+}
+.other-user-buy-item-img{
+  width: 96px;
+  height: 96px;
+}
+.other-user-buy-item-img img{
+  width: 100%;
+}
+.other-buy-detail-box{
+  width: 160px;
+  margin-left: 15px;
+  display: flex;
+    flex-direction: column;
+}
+.other-buy-title{
+  font-size: 12px;
+}
+.other-buy-title a{
+  color: #2c2c2c;
+  text-decoration: none;
+}
+.other-buy-price{
+  font-size: 12px;
+  font-weight: bold;
+  color: $theme_color;
+}
+.other-buy-btn{
+  padding: 3px 10px;
+  color: $theme_color;
+  font-size: 12px;
+  border: 1px solid $theme_color;
+  border-radius: 0px;
+  background-color: #fff;
+}
+.other-buy-btn:hover{
+  color: $theme_color;
+  border: 1px solid $theme_color;
+}
+/****************************加入购物车页面结束*****************************/
+</style>
diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue
new file mode 100644
index 00000000..7e24619d
--- /dev/null
+++ b/buyer/src/pages/SignUp.vue
@@ -0,0 +1,294 @@
+<template>
+  <div class="login">
+    <div style="height:50px;"></div>
+    <div class="logo-box">
+      <img
+        width="150"
+        :src="logoImg"
+        @click="$router.push('/')"
+      />
+      <div>注册</div>
+    </div>
+    <div class="login-container">
+      
+        <!-- 注册 -->
+        <Form
+          ref="formRegist"
+          :model="formRegist"
+          :rules="ruleInline"
+          style="width:300px;"
+        >
+          <FormItem prop="username">
+            <i-input
+              type="text"
+              v-model="formRegist.username"
+              clearable
+              placeholder="用户名"
+            >
+              <Icon type="md-person" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="formRegist.password"
+              clearable
+              placeholder="请输入大于6位密码"
+            >
+              <Icon type="md-lock" slot="prepend"> </Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="mobilePhone">
+            <i-input
+              type="text"
+              v-model="formRegist.mobilePhone"
+              clearable
+              placeholder="手机号"
+            >
+              <Icon type="md-phone-portrait" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="code">
+            <i-input
+              type="text"
+              v-model="formRegist.code"
+              clearable
+              placeholder="手机验证码"
+            >
+              <Icon
+                type="ios-text-outline"
+                style="font-weight: bold"
+                slot="prepend"
+              />
+              <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button @click="verifyBtnClick" long :type="verifyStatus?'success':'default'">{{verifyStatus?'验证通过':'点击完成安全验证'}}</Button>
+          </FormItem>
+          <FormItem>
+            <Button type="error" size="large" @click="handleRegist" long
+              >注册</Button
+            >
+          </FormItem>
+          <FormItem><span class="color999 ml_20">点击注册，表示您同意《<router-link to="/article?id=1371992704333905920" target="_blank">商城用户协议</router-link>》</span></FormItem>
+        </Form>
+        <!-- 拼图验证码 -->
+        <Verify
+          ref="verify"
+          class="verify-con"
+          :verifyType="verifyType"
+          @change="verifyChange"
+        ></Verify>
+        <div class="login-btn">已有账号？<a @click="$router.push('login')">立即登录</a></div>
+    </div>
+    <div class="foot">
+      <Row type="flex" justify="space-around" class="help">
+        <router-link to="/article" class="item" target="_blank">帮助</router-link>
+        <router-link to="/article?id=1371779927900160000" class="item" target="_blank">隐私</router-link>
+        <router-link to="/article?id=1371992704333905920" class="item" target="_blank">条款</router-link>
+      </Row>
+      <Row type="flex" justify="center" class="copyright">
+        Copyright © 2021 - Present
+        <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">lili-shop</a>
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as RegExp from '@/plugins/RegExp.js';
+import { md5 } from '@/plugins/md5.js';
+import * as apiLogin from '@/api/login.js';
+import { sendSms } from '@/api/common.js';
+import Verify from '@/components/verify';
+export default {
+  name: 'Login',
+  components: { Verify },
+  data () {
+    return {
+      formRegist: {
+        // 注册表单
+        mobilePhone: '',
+        code: '',
+        username: '',
+        password: ''
+      },
+      ruleInline: {
+        // 验证规则
+        username: [{ required: true, message: '请输入用户名' }],
+        password: [
+          { required: true, message: '请输入密码' },
+          { type: 'string', min: 6, message: '密码不能少于6位' }
+        ],
+        mobilePhone: [
+          { required: true, message: '请输入手机号码' },
+          {
+            pattern: RegExp.mobile,
+            trigger: 'blur',
+            message: '请输入正确的手机号'
+          }
+        ],
+        code: [{ required: true, message: '请输入手机验证码' }]
+      },
+      verifyStatus: false,
+      verifyType: 'REGISTER',
+      codeMsg: '发送验证码',
+      interval: '',
+      time: 60,
+      logoImg: ''
+    };
+  },
+  methods: {
+    // 注册
+    handleRegist () {
+      this.$refs.formRegist.validate((valid) => {
+        if (valid) {
+          let data = JSON.parse(JSON.stringify(this.formRegist));
+          data.password = md5(data.password);
+          apiLogin.regist(data).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success('注册成功!');
+              this.$router.push('login');
+            } else {
+              this.$Message.warning(res.message);
+            }
+          });
+        } else {}
+      });
+    },
+    sendCode () {
+      if (this.time === 60) {
+        if (this.formRegist.mobilePhone === '') {
+          this.$Message.warning('请先填写手机号');
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning('请先完成安全验证');
+          return;
+        }
+        let params = {
+          mobile: this.formRegist.mobilePhone,
+          verificationEnums: 'REGISTER'
+        };
+        sendSms(params).then(res => {
+          if (res.code === 200) {
+            this.$Message.success('验证码发送成功');
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = '重新发送';
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
+    handleCancel () {
+      this.$refs.formRegist.resetFields();
+    },
+    verifyChange (con) {
+      if (!con.status) return;
+      this.$refs.verify.show = false;
+      this.verifyStatus = true;
+    },
+    verifyBtnClick () {
+      if (!this.verifyStatus) {
+        this.$refs.verify.show = true;
+      }
+    }
+  },
+  mounted () {
+    this.$refs.formRegist.resetFields();
+    this.logoImg = this.Cookies.getItem('logo')
+  },
+  watch: {
+  }
+};
+</script>
+<style scoped lang="scss">
+
+.logo-box {
+  width: 600px;
+  height: 80px;
+  margin: 0 auto;
+  display: flex;
+  align-items: center;
+  img {
+    width: 150px;
+    cursor: pointer;
+  }
+  div {
+    font-size: 20px;
+    margin-top: 10px;
+  }
+}
+
+.login-container {
+  border-top: 2px solid $theme_color;
+  position: relative;
+  margin: 0 auto;
+  width: 600px;
+  background-color: #fff;
+  padding: 20px 150px;
+  .login-btn{
+    position: absolute;
+    right: 20px;
+    top: -45px;
+  }
+}
+
+.verify-con{
+  position: absolute;
+  left: 140px;
+  top: 80px;
+  z-index: 10;
+}
+
+.other-login {
+  margin: 0 auto;
+  .ivu-icon {
+    font-size: 24px;
+  }
+}
+.regist {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -10px;
+  span {
+    margin-left: 10px;
+    &:hover {
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  left: calc(50% - 184px);
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/article/index.vue b/buyer/src/pages/article/index.vue
new file mode 100644
index 00000000..ee314193
--- /dev/null
+++ b/buyer/src/pages/article/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <BaseHeader></BaseHeader>
+    <Search></Search>
+    <cateNav></cateNav>
+    <div class="title-bg"><p>文章帮助中心</p></div>
+    <div class="container width_1200">
+      <Layout class="layoutAll">
+        <Sider class="side-bar" ref="side" :collapsed-width="78">
+          <div class="article-cate">文章分类列表</div>
+          <Menu
+            class="side-menu"
+            theme="light"
+            width="auto"
+            ref='menu'
+            :active-name="activeName"
+            :open-names="openName"
+            @on-select="onSelect"
+          >
+            <!--   循环导航栏       -->
+            <Submenu
+              v-show="menu.children"
+              v-for="(menu, index) in list"
+              :key="index"
+              :name="menu.articleCategoryName"
+            >
+              <template slot="title">
+                <span>{{ menu.articleCategoryName }}</span>
+              </template>
+              <MenuItem
+                v-for="(chlidren, i) in menu.children"
+                :key="i"
+                :name="chlidren.id"
+                >{{ chlidren.articleCategoryName }}</MenuItem
+              >
+            </Submenu>
+
+          </Menu>
+        </Sider>
+        <Layout class="layout ml_10">
+          <Content class="content">
+            <ul class="article-list" v-show="showList">
+              <li v-for="(article, index) in articleList" :key="index" @click="getDetail(article.id)">
+                {{article.title}}
+              </li>
+            </ul>
+            <transition mode="out-in">
+              <div v-show="!showList">
+                <a class="back-btn" @click="showList = true">&lt;返回上一级</a>
+                <h2 class="mt_10 mb_10">{{detail.title}}</h2>
+                <div class="mt_10 mb_10" v-html="detail.content"></div>
+              </div>
+            </transition>
+          </Content>
+        </Layout>
+      </Layout>
+    </div>
+  </div>
+</template>
+
+<script>
+import {articleCateList, articleDetail, articleList} from '@/api/common.js'
+export default {
+  name: 'Home',
+  data () {
+    return {
+      list: [], // 分类列表
+      detail: '', // 文章详情
+      articleList: [], // 分类下的文章列表
+      activeName: '1347456734864367616', // 左侧激活项
+      openName: [], // 展开的名称
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 100,
+        categoryId: '',
+        sort: 'sort'
+      },
+      showList: true // 展示文章列表
+    };
+  },
+  methods: {
+    // 每次点击左侧bar的callback
+    onSelect (id) {
+      this.getList(id)
+      this.detail = ''
+      this.showList = true
+    },
+    getCateList () { // 文章分类列表
+      articleCateList().then(res => {
+        if (res.success) {
+          this.list = res.result
+          if (this.$route.query.id) {
+            this.activeName = this.detail.categoryId
+            this.list.forEach(e => {
+              if (e.children.length) {
+                e.children.forEach(i => {
+                  if (i.id === this.detail.categoryId) {
+                    this.openName.push(e.articleCategoryName)
+                  }
+                })
+              } else {
+                delete e.children
+              }
+            })
+          } else {
+            this.activeName = this.list[0].children[0].id
+            this.openName.push(this.list[0].articleCategoryName)
+          }
+          this.$nextTick(() => {
+            this.$refs.menu.updateOpened()
+            this.$refs.menu.updateActiveName()
+          })
+          this.getList(this.activeName)
+        }
+      })
+    },
+    getList (id) { // 文章列表
+      this.params.categoryId = id
+      articleList(this.params).then(res => {
+        if (res.success) {
+          this.articleList = res.result.records
+        }
+      })
+    },
+    async getDetail (id) { // 文章详情
+      await articleDetail(id).then(res => {
+        if (res.success) {
+          this.detail = res.result
+          this.showList = false
+        }
+      })
+    }
+  },
+  async mounted () {
+    const articleId = this.$route.query.id
+    if (articleId) {
+      await this.getDetail(articleId)
+    }
+    this.getCateList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.content {
+  padding: 15px 50px;
+}
+
+.header {
+  @include background_color($light_background_color);
+}
+
+.side-menu,
+.side-bar,
+.content {
+  @include white_background_color();
+  @include title_color($light_title_color);
+}
+
+.side-bar {
+  min-height: 600px;
+  height: auto;
+}
+
+.layoutAll {
+  min-height: 1200px;
+  @include background_color($light_background_color);
+}
+
+.container {
+  margin: 0 auto;
+  padding: 20px 0;
+}
+
+.side-bar a {
+  @include title_color($light_title_color);
+}
+
+.layout-footer-center {
+  padding: 0px 15px;
+
+  padding-bottom: 15px;
+  text-align: center;
+}
+.title-bg{
+  border-top: 3px solid $theme_color;
+  height: 100px;
+  width: 100%;
+  background-color: #7b7b7b;
+  p{
+    width: 1200px;
+    font-size: 30px;
+    height: 100px;
+    line-height: 100px;
+    color: #fff;
+    line-height: 100px;
+    margin: 0 auto;
+    padding-left: 10px;
+  }
+}
+.article-cate{
+  width: 200px;
+  height: 30px;
+  color: #fff;
+  line-height: 30px;
+  text-align: center;
+  font-size: 18px;
+  background-color: #666;
+}
+.article-list {
+  li{
+    margin: 10px 0;
+    color: #2D8CF0;
+    &:hover{
+      cursor: pointer;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue
new file mode 100644
index 00000000..8a00ec91
--- /dev/null
+++ b/buyer/src/pages/couponCenter.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="coupon-center">
+    <BaseHeader></BaseHeader>
+    <div class="content">
+      <div>
+        <div class="coupon-title">
+          <router-link to="/">
+            <img src="../assets/images/logo.png" width="120" alt="">
+          </router-link>
+          <p>领券中心</p>
+          <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />
+        </div>
+
+        <div class="fontsize_18 recommend">推荐好券</div>
+
+        <empty v-if="list.length===0" />
+        <ul class="coupon-list" v-else>
+          <li v-for="(item, index) in list" class="coupon-item" :key="index">
+            <div class="c-left">
+              <div>
+                <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
+                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+                <span class="describe">满{{item.consumeThreshold}}元可用</span>
+              </div>
+              <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
+              <p>有效期：{{item.endTime}}</p>
+            </div>
+            <b></b>
+            <a class="c-right" @click="receive(item)">立即领取</a>
+            <i class="circle-top"></i>
+            <i class="circle-bottom"></i>
+          </li>
+        </ul>
+        <Page :total="total" @on-change="changePageNum"
+          v-if="list.length && total > params.pageNumber"
+          class="pageration"
+          @on-page-size-change="changePageSize"
+          :page-size="params.pageSize"
+          show-sizer>
+        </Page>
+      </div>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import {couponList, receiveCoupon} from '@/api/member.js'
+export default {
+  data () {
+    return {
+      list: [],
+      total: 0,
+      params: {
+        pageNumber: 1,
+        pageSize: 20
+      }
+    }
+  },
+  methods: {
+    search (item) {
+      this.params.couponName = item
+      this.params.pageNumber = 1
+      this.getList()
+    },
+    getList () {
+      this.$Spin.show()
+      couponList(this.params).then(res => {
+        this.$Spin.hide()
+        this.loading = false
+        if (res.success) {
+          this.list = res.result.records
+          this.total = res.result.total
+        }
+      }).catch(() => { this.$Spin.hide() })
+    },
+
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+
+    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}可用`
+    }
+  },
+  mounted () {
+    this.getList()
+  }
+}
+</script>
+<style lang="scss" scoped>
+  @import '../assets/styles/coupon.scss';
+  .content{
+    width: 100%;
+    background-color: #fff;
+
+    > div {
+      margin: 10px auto;
+      width: 1200px;
+    }
+  }
+  .coupon-title {
+    display: flex;
+    align-items: center;
+
+    p{
+      font-size: 18px;
+      margin-right: 500px;
+    }
+    border-bottom: 2px solid $theme_color;
+  }
+  .recommend {
+    margin: 20px auto;
+    font-weight: bold;
+    width: 200px;
+    text-align: center;
+  }
+  .coupon-item {
+    b{
+      background: url('../assets/images/small-circle.png') top left repeat-y;
+    }
+  }
+  .pageration {
+    text-align: right;
+    padding-bottom: 10px;
+  }
+</style>
diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
new file mode 100644
index 00000000..d9cf49f2
--- /dev/null
+++ b/buyer/src/pages/forgetPassword.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="login">
+    <!-- 顶部logo -->
+    <div class="top-content">
+      <div class="logo-box">
+        <img
+          src="../assets/images/logo1.png"
+          @click="$router.push('/')"
+        />
+        <div>修改密码</div>
+      </div>
+    </div>
+    <div class="login-container">
+        <!-- 验证手机号 -->
+        <Form
+          ref="formFirst"
+          :model="formFirst"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 0"
+        >
+          <FormItem prop="mobile">
+            <i-input
+              type="text"
+              v-model="formFirst.mobile"
+              clearable
+              placeholder="手机号"
+            >
+              <Icon type="md-phone-portrait" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="code">
+            <i-input
+              type="text"
+              v-model="formFirst.code"
+              clearable
+              placeholder="手机验证码"
+            >
+              <Icon
+                type="ios-text-outline"
+                style="font-weight: bold"
+                slot="prepend"
+              />
+              <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button @click="verifyBtnClick" long :type="verifyStatus?'success':'default'">{{verifyStatus?'验证通过':'点击完成安全验证'}}</Button>
+          </FormItem>
+          <FormItem>
+            <Button type="error" @click="next" :loading="loading" long>下一步</Button>
+          </FormItem>
+        </Form>
+        <Form
+          ref="form"
+          :model="form"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 1"
+        >
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.password"
+              clearable
+              placeholder="请输入至少六位密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.oncePasd"
+              clearable
+              placeholder="请再次输入密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button type="error" size="large" @click="handleSubmit" :loading="loading1" long>提交</Button>
+          </FormItem>
+        </Form>
+        <!-- 拼图验证码 -->
+        <Verify
+          ref="verify"
+          class="verify-con"
+          :verifyType="verifyType"
+          @change="verifyChange"
+        ></Verify>
+        <div class="login-btn"><a @click="$router.push('login')">前往登录</a></div>
+    </div>
+    <div class="foot">
+      <Row type="flex" justify="space-around" class="help">
+        <a class="item" href="https://lilishop.com" target="_blank">帮助</a>
+        <a class="item" href="https://lilishop.com" target="_blank">隐私</a>
+        <a class="item" href="https://lilishop.com" target="_blank">条款</a>
+      </Row>
+      <Row type="flex" justify="center" class="copyright">
+        Copyright © 2020 - Present
+        <a href="http://lili.cn" target="_blank" style="margin: 0 5px"
+          >lili-shop</a
+        >
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as RegExp from '@/plugins/RegExp.js';
+import { md5 } from '@/plugins/md5.js';
+import * as apiLogin from '@/api/login.js';
+import { sendSms } from '@/api/common.js';
+import Verify from '@/components/verify';
+export default {
+  name: 'Login',
+  components: { Verify },
+  data () {
+    return {
+      loading: false,
+      loading1: false,
+      formFirst: {
+        // 注册表单
+        mobile: '',
+        code: ''
+      },
+      form: {
+        password: '',
+        oncePasd: ''
+      },
+      step: 0,
+      ruleInline: {
+        // 验证规则
+        mobile: [
+          { required: true, message: '请输入手机号码' },
+          {
+            pattern: RegExp.mobile,
+            trigger: 'blur',
+            message: '请输入正确的手机号'
+          }
+        ],
+        code: [{ required: true, message: '请输入手机验证码' }],
+        password: [{required: true, message: '密码不能为空'}, {pattern: RegExp.password, message: '密码不能少于6位'}]
+      },
+      verifyStatus: false,
+      verifyType: 'FIND_USER',
+      codeMsg: '发送验证码',
+      interval: '',
+      time: 60
+    };
+  },
+  methods: {
+    // 提交短信验证码，修改密码
+    next () {
+      this.$refs.formFirst.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let data = JSON.parse(JSON.stringify(this.formFirst));
+          apiLogin.validateCode(data).then((res) => {
+            this.loading = false;
+            if (res.code === 200) {
+            //   this.$Message.success('');
+              this.step = 1;
+            } else {
+              this.$Message.warning(res.message);
+            }
+          }).catch(() => { this.loading = false; });
+        } else {}
+      });
+    },
+    handleSubmit () { // 提交密码
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.form));
+          if (params.password !== params.oncePasd) {
+            this.$Message.warning('两次输入密码不一致');
+            return;
+          };
+          params.mobile = this.formFirst.mobile;
+          params.password = md5(params.password);
+          delete params.oncePasd;
+          this.loading1 = true;
+
+          apiLogin.resetPassword(params).then(res => {
+            this.loading1 = false;
+            console.log(res);
+            if (res.code === 200) {
+              this.$Message.success('修改密码成功');
+              this.$router.push('login');
+            }
+          }).catch(() => { this.loading = false; });
+        };
+      });
+    },
+    sendCode () { // 发送验证码
+      if (this.time === 60) {
+        if (this.formFirst.mobile === '') {
+          this.$Message.warning('请先填写手机号');
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning('请先完成安全验证');
+          return;
+        }
+        let params = {
+          mobile: this.formFirst.mobile,
+          verificationEnums: 'FIND_USER'
+        };
+        sendSms(params).then(res => {
+          if (res.code === 200) {
+            this.$Message.success('验证码发送成功');
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = '重新发送';
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
+    verifyChange (con) { // 验证通过
+      if (!con.status) return;
+      this.$refs.verify.show = false;
+      this.verifyStatus = true;
+    },
+    verifyBtnClick () {
+      if (!this.verifyStatus) {
+        this.$refs.verify.show = true;
+      }
+    }
+  },
+  mounted () {
+    this.$refs.formFirst.resetFields();
+  },
+  watch: {
+  }
+};
+</script>
+<style scoped lang="scss">
+.login {
+  height: 100%;
+}
+.top-content {
+  width: 100%;
+  height: 80px;
+  position: relative;
+  z-index: 1;
+  box-shadow: 0 1px 1px #ddd;
+  background-color: #fff;
+
+  .logo-box {
+    width: 80%;
+    max-width: 1200px;
+    height: 80px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    img {
+      width: 200px;
+      cursor: pointer;
+    }
+  }
+  div {
+    font-size: 20px;
+    margin-top: 10px;
+  }
+}
+
+.login-container {
+  position: relative;
+  margin: 10px auto;
+  width: 1200px;
+  background-color: #fff;
+  padding: 20px;
+  .login-btn{
+    position: absolute;
+    right: 20px;
+    top: 20px;
+  }
+}
+
+.verify-con{
+  position: absolute;
+  left: 400px;
+  top: 50px;
+  z-index: 10;
+}
+
+.other-login {
+  margin: 0 auto;
+  .ivu-icon {
+    font-size: 24px;
+  }
+}
+.regist {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -10px;
+  span {
+    margin-left: 10px;
+    &:hover {
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  left: calc(50% - 184px);
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/Main.vue b/buyer/src/pages/home/Main.vue
new file mode 100644
index 00000000..3c508218
--- /dev/null
+++ b/buyer/src/pages/home/Main.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="wrapper">
+    <div class="orderBox">
+      <!-- <ul class="orderUl">
+        <li>
+          <div class="circle">
+            <Icon size="50" type="ios-card" />
+          </div>
+          <div class="info">
+            <Badge :count="0"> 代付款 </Badge>
+          </div>
+        </li>
+        <li>
+          <div class="circle">
+            <Icon size="50" type="ios-card" />
+          </div>
+          <div class="info">
+            <Badge :count="0"> 待收货 </Badge>
+          </div>
+        </li>
+        <li>
+          <div class="circle">
+            <Icon size="50" type="ios-card" />
+          </div>
+          <div class="info">
+            <Badge :count="0"> 待评价 </Badge>
+          </div>
+        </li>
+      </ul> -->
+      <div class="userBox">
+        <div class="box">
+          <!-- 我的订单组件 -->
+          <myOrderPage :paging="false" :homePage="true" />
+        </div>
+        <div class="box">
+          <!-- 近期收藏 -->
+          <myFavorites :paging="false" :homePage="true" />
+        </div>
+        <div class="box">
+          <!-- 猜你喜欢 -->
+          <!-- <myLike /> -->
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import myOrderPage from '@/pages/home/orderCenter/MyOrder'
+import myFavorites from '@/pages/home/memberCenter/Favorites'
+// import myLike from '@/components/like'
+
+export default {
+  name: 'main',
+  components: {
+    myOrderPage,
+    myFavorites
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.circle {
+  width: 70px;
+  height: 70px;
+  border-radius: 50%;
+  overflow: hidden;
+  background: $success_color;
+  margin: 0 auto;
+  text-align: center;
+  color: #fff;
+
+  > i {
+    line-height: 70px;
+  }
+}
+
+.info {
+  text-align: center;
+  font-size: 18px;
+  margin: 10px 0;
+}
+
+.orderUl {
+  overflow: hidden;
+
+  > li {
+    cursor: pointer;
+    border-radius: 0.4em;
+    float: left;
+    padding: 10px 0;
+    margin: 0 11px;
+    width: 200px;
+    text-align: center;
+
+    @include background_color($light_background_color);
+  }
+}
+.userBox {
+  padding: 0 0 20px 0;
+}
+</style>
diff --git a/buyer/src/pages/home/MyShoppingCart.vue b/buyer/src/pages/home/MyShoppingCart.vue
new file mode 100644
index 00000000..0e29dda2
--- /dev/null
+++ b/buyer/src/pages/home/MyShoppingCart.vue
@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买"></Table>
+    <div class="go-to">
+      <Button @click="goTo" type="primary">去付款</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+import store from '@/vuex/store';
+import { mapState, mapActions } from 'vuex';
+export default {
+  name: 'MyShoppingCart',
+  data () {
+    return {
+      columns: [ // 表格表头
+        {
+          type: 'selection',
+          width: 58,
+          align: 'center'
+        },
+        {
+          title: '图片',
+          key: 'img',
+          width: 86,
+          render: (h, params) => {
+            return h('div', [
+              h('img', {
+                attrs: {
+                  src: params.row.img
+                }
+              })
+            ]);
+          },
+          align: 'center'
+        },
+        {
+          title: '标题',
+          key: 'title',
+          align: 'center'
+        },
+        {
+          title: '套餐',
+          width: 198,
+          key: 'package',
+          align: 'center'
+        },
+        {
+          title: '数量',
+          key: 'count',
+          width: 68,
+          align: 'center'
+        },
+        {
+          title: '价格',
+          width: 68,
+          key: 'price',
+          align: 'center'
+        }
+      ]
+    };
+  },
+  created () {
+    this.loadShoppingCart();
+  },
+  computed: {
+    ...mapState(['shoppingCart'])
+  },
+  methods: {
+    ...mapActions(['loadShoppingCart']),
+    goTo () {
+      this.$router.push('/cart');
+    }
+  },
+  store
+};
+</script>
+
+<style scoped>
+.go-to {
+  margin: 15px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/buyer/src/pages/home/enumeration.js b/buyer/src/pages/home/enumeration.js
new file mode 100644
index 00000000..638c6af7
--- /dev/null
+++ b/buyer/src/pages/home/enumeration.js
@@ -0,0 +1,79 @@
+
+// 订单状态
+export const orderStatusList = [
+  {
+    name: '全部',
+    status: 'ALL'
+  },
+  {
+    name: '未付款',
+    status: 'UNPAID'
+  },
+  {
+    name: '已付款',
+    status: 'PAID'
+  },
+  {
+    name: '待发货',
+    status: 'UNDELIVERED'
+  },
+  {
+    name: '已发货',
+    status: 'DELIVERED'
+  },
+  {
+    name: '已完成',
+    status: 'COMPLETED'
+  },
+  {
+    name: '待核验',
+    status: 'TAKE'
+  },
+  {
+    name: '已取消',
+    status: 'CANCELLED'
+  }
+]
+// 订单售后状态
+export const afterSaleStatusList = [
+  {
+    name: '申请中',
+    status: 'APPLY'
+  },
+  {
+    name: '通过',
+    status: 'PASS'
+  },
+  {
+    name: '拒绝',
+    status: 'REFUSE'
+  },
+  {
+    name: '买家退货，待卖家收货',
+    status: 'BUYER_RETURN'
+  },
+  {
+    name: '商家换货/补发',
+    status: 'SELLER_RE_DELIVERY'
+  },
+  {
+    name: '卖家确认收货',
+    status: 'SELLER_CONFIRM'
+  },
+  {
+    name: '卖家终止售后',
+    status: 'SELLER_TERMINATION'
+  },
+  {
+    name: '买家确认收货',
+    status: 'BUYER_CONFIRM'
+  },
+  {
+    name: '买家取消售后',
+    status: 'BUYER_CANCEL'
+  },
+  {
+    name: '完成售后',
+    status: 'COMPLETE'
+  }
+]
diff --git a/buyer/src/pages/home/memberCenter/AccountBind.vue b/buyer/src/pages/home/memberCenter/AccountBind.vue
new file mode 100644
index 00000000..114f7d90
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/AccountBind.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="wrapper">
+    <card _Title="账号绑定"/>
+    <div>
+      <Row class="bindItem">
+        <Col :span="2">
+
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">
+            绑定QQ
+          </div>
+          <div class="setDivItem theme">
+           添加QQ号可以使用QQ登录
+          </div>
+        </Col>
+        <Col :span="4">
+          <Button>添加绑定</Button>
+        </Col>
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AccountBind',
+  data () {
+    return {}
+  },
+  mounted () {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+  .bindItem {
+    border-bottom: 1px solid $border_color;
+    padding: 16px 0;
+    /deep/ .ivu-col {
+      padding: 8px 0;
+    }
+  }
+  .setDivItem {
+    line-height: 1.75;
+  }
+  /deep/ .ivu-col-span-2, .ivu-col-span-4 {
+    text-align: center;
+    color: $theme_color;
+  }
+</style>
diff --git a/buyer/src/pages/home/memberCenter/AccountSafe.vue b/buyer/src/pages/home/memberCenter/AccountSafe.vue
new file mode 100644
index 00000000..b39ff66c
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/AccountSafe.vue
@@ -0,0 +1,177 @@
+<template>
+  <div class="wrapper">
+    <card _Title="账户安全"/>
+
+    <div class="safeList">
+      <!-- 密码 -->
+      <Row class="safeItem">
+        <Col :span="2">
+          <Icon size="40" type="md-key"/>
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">登录密码</div>
+          <div class="setDivItem theme">互联网账号存在被盗风险，建议您定期更改密码以保护账户安全。</div>
+        </Col>
+        <Col :span="4">
+          <Button @click="modifyPwd">修改密码</Button>
+        </Col>
+      </Row>
+      <!-- 邮箱 -->
+      <!-- <Row class="safeItem">
+        <Col :span="2">
+          <Icon size="40" type="md-mail" />
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">
+            邮箱验证
+          </div>
+          <div class="setDivItem " v-if="true">
+            您的验证邮箱：<span>xxxxx</span>
+          </div>
+          <div class="setDivItem " v-else>
+
+          </div>
+        </Col>
+        <Col :span="4">
+          <Button>修改邮箱</Button>
+        </Col>
+      </Row> -->
+      <!-- 手机验证 -->
+      <!-- <Row class="safeItem">
+        <Col :span="2">
+          <Icon size="40" type="ios-phone-portrait" />
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">
+            手机验证
+          </div>
+          <div class="setDivItem " v-if="true">
+            您的手机号：<span>xxxxx</span>
+          </div>
+          <div class="setDivItem " v-else>
+
+          </div>
+        </Col>
+        <Col :span="4">
+          <Button>立即验证</Button>
+        </Col>
+      </Row> -->
+      <!-- 支付密码 -->
+      <!-- <Row class="safeItem">
+        <Col :span="2">
+          <Icon size="40" type="md-lock" />
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">
+            支付密码
+          </div>
+          <div class="setDivItem " v-if="true">
+            安全认证：<span>xxxxx</span>
+          </div>
+          <div class="setDivItem " v-else>
+
+          </div>
+        </Col>
+        <Col :span="4">
+          <Button @click="goModifyPwd" v-if="pwdStatus == '设置密码'" type="error">{{pwdStatus}}</Button>
+          <Dropdown style="margin-left: 20px" v-if="pwdStatus == '修改密码'" @on-click="selectPwd">
+            <Button type="primary">
+              修改密码
+              <Icon type="ios-arrow-down"></Icon>
+            </Button>
+            <DropdownMenu slot="list" on-click="selectPwd">
+              <DropdownItem name = "1">修改密码</DropdownItem>
+              <DropdownItem name = "2">重置密码</DropdownItem>
+            </DropdownMenu>
+          </Dropdown>
+        </Col>
+      </Row> -->
+      <!-- 实名 -->
+      <!-- <Row class="safeItem">
+        <Col :span="2">
+          <Icon size="40" type="md-card" />
+        </Col>
+        <Col :span="16">
+          <div class="setDivItem">
+            实名认证
+          </div>
+          <div class="setDivItem " v-if="true">
+            已认证：<span>xxxxx</span>
+          </div>
+          <div class="setDivItem " v-else>
+            您还未实名认证该账户，立即实名认证可加快提现速度。
+          </div>
+        </Col>
+        <Col :span="4">
+          <Button>立即认证</Button>
+        </Col>
+      </Row> -->
+    </div>
+  </div>
+</template>
+
+<script>
+import card from '@/components/card'
+import {
+  getPwdStatus
+} from '@/api/account';
+export default {
+  name: 'AccountSafe',
+  data () {
+    return {
+      pwdStatus: '' // 密码状态
+    }
+  },
+  components: {card},
+  mounted () {
+    this.getPwdStatus()
+  },
+  methods: {
+    // 设置支付密码
+    goModifyPwd () {
+      this.$router.push({name: 'ModifyPwd', query: { status: 2 }})
+    },
+    selectPwd (value) {
+      this.$router.push({name: 'ModifyPwd', query: { status: value }})
+    },
+    modifyPwd () {
+      this.$router.push({name: 'ModifyPwd', query: { status: 1 }})
+    },
+    // 获取密码状态
+    getPwdStatus () {
+      getPwdStatus().then(res => {
+        if (res) {
+          this.pwdStatus = '修改密码'
+        } else {
+          this.pwdStatus = '设置密码'
+        }
+      });
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  /deep/ .ivu-col-span-2, .ivu-col-span-4 {
+    text-align: center;
+    color: $theme_color;
+  }
+
+  .theme {
+    color: $theme_color;
+  }
+
+  .setDivItem {
+    line-height: 1.75;
+  }
+
+  .safeItem {
+    border-bottom: 1px solid $border_color;
+    padding: 16px 0;
+
+    /deep/ .ivu-col {
+      padding: 8px 0;
+
+    }
+  }
+</style>
diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue
new file mode 100644
index 00000000..5f33c240
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/CommentList.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="wrapper">
+    <card _Title="评论/晒单" />
+
+    <div class="order">
+      <div class="order-title">
+        <Row class="order-row title">
+          <i-col span="12">订单详情</i-col>
+          <i-col span="4">收货人</i-col>
+          <i-col span="4">评价</i-col>
+          <i-col span="6"></i-col>
+        </Row>
+      </div>
+      <empty v-if="list.length === 0" />
+
+      <div class="order-item" v-else v-for="(item, index) in list" :key="index">
+        <div>
+          <div class="title order-item-title">
+            <span>订单号:{{item.orderNo}}</span>
+            <span class="color999 ml_10">{{item.createTime}}</span>
+            <span class="hover-pointer fontsize_12 eval-detail" @click="evaluate(item.id)">评价详情</span>
+          </div>
+          <Row class="order-item-view">
+            <i-col span="12" class="item-view-name">
+              <div class="order-img">
+                <img :src="item.goodsImage" alt="" />
+              </div>
+              <div class="order-name">
+                {{item.goodsName}}
+              </div>
+              <div>
+                x1
+              </div>
+            </i-col>
+            <i-col span="4">{{item.createBy | secrecyMobile}}</i-col>
+            <i-col span="4">
+              {{item.grade==='GOOD'?'好评' : item.grade === 'WORSE'?'差评' : '中评'}}
+            </i-col>
+            <i-col span="4">
+              <Tooltip >
+                  <div class="content">{{item.content}}</div>
+                  <div style="white-space: normal;" slot="content">
+                    {{item.content}}
+                  </div>
+              </Tooltip>
+            </i-col>
+          </Row>
+        </div>
+      </div>
+      <Spin v-if="loading"></Spin>
+    </div>
+    <!-- 分页 -->
+    <div class="page-size">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
+  </div>
+</template>
+
+<script>
+import {evolutionList} from '@/api/order.js';
+export default {
+  name: 'CommentList',
+  data () {
+    return {
+      commentWay: [`待评价`, `待追评`, `已评价`], // 评价分类
+      loading: false, // 加载状态
+      list: [], // 评价列表
+      total: 0, // 评价总数
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10
+      }
+    };
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      evolutionList(this.params).then(res => {
+        if (res.success) {
+          const list = res.result.records;
+          list.forEach(element => {
+            element.descriptionScore = Number(element.descriptionScore)
+          });
+          this.list = list;
+          this.total = res.result.total
+        }
+      })
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    changeIndex (index) {
+      console.log(index);
+    },
+    evaluate (id) {
+      this.$router.push({path: '/home/evalDetail', query: { id }})
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.order-img {
+  > img {
+    width: 60px;
+    height: 60px;
+    border: 1px solid $border_color;
+    box-sizing: border-box;
+  }
+}
+.title {
+  @include background_color($light_background_color);
+}
+.item-view-name {
+  display: flex;
+}
+.order-name {
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2;
+
+  overflow: hidden;
+  text-align: left;
+  padding: 0 10px;
+  font-size: 13px;
+  @include content_color($light_content_color);
+}
+.order-item-title {
+  padding: 5px 20px;
+  text-align: left;
+  font-size: 13px;
+  position: relative;
+}
+.order-item-view {
+  padding: 10px 20px;
+}
+.order-item {
+  text-align: center;
+  border: 1px solid $border_color;
+  margin: 10px 0;
+}
+.order-row {
+  padding: 10px 0;
+  text-align: center;
+}
+.content {
+  color: #999;
+  max-height: 60px;
+  overflow: hidden;
+  word-wrap: break-word;
+}
+
+.eval-detail {
+  position: absolute;
+  right: 20px;
+  &:hover{
+    color: $theme_color;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/ComplainDetail.vue b/buyer/src/pages/home/memberCenter/ComplainDetail.vue
new file mode 100644
index 00000000..682852cf
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/ComplainDetail.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="add-eval">
+    <div class="title">
+      <card _Title="订单投诉" :_Size="16"></card>
+      <p>
+        <span class="fontsize_16 global_color">{{ statusLabel[detail.complainStatus] }}</span>
+        <span class="color999 ml_20">创建时间：</span><span>{{ detail.createTime }}</span>
+        <span class="color999 ml_20">{{ detail.createTime }}</span>
+      </p>
+    </div>
+
+    <Alert class="l_title" show-icon type="warning">我的申诉信息</Alert>
+    <table cellspacing="0" cellpadding='0' border="1">
+      <tr>
+        <td>投诉商品</td>
+        <td><img :src="detail.goodsImage" width="60" alt=""> &nbsp;{{ detail.goodsName }}</td>
+      </tr>
+      <tr>
+        <td>投诉主题</td>
+        <td>{{ detail.complainTopic }}</td>
+      </tr>
+      <tr>
+        <td>投诉内容</td>
+        <td>{{ detail.content }}</td>
+      </tr>
+      <tr>
+        <td>补充内容</td>
+        <td>
+          <div style="display:flex;align-items:center;">
+            <div class="demo-upload-list" v-for="(img, index) in detail.images.split(',')" :key="index">
+              <img :src="img">
+              <div class="demo-upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+              </div>
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+
+    <Alert class="l_title" show-icon type="warning">商家申诉信息</Alert>
+    <table cellspacing="0" cellpadding='0' border="1">
+      <tr>
+        <td>申诉时间</td>
+        <td>{{ detail.appealTime || '暂无' }}</td>
+      </tr>
+      <tr>
+        <td>申诉内容</td>
+        <td>{{ detail.appealContent || '暂无' }}</td>
+      </tr>
+      <tr>
+        <td>申诉凭证</td>
+        <td>
+
+          <div style="display:flex;align-items:center;">
+            <div class="demo-upload-list" v-for="(img, index) in detail.appealImages.split(',')" :key="index">
+              <img :src="img">
+              <div class="demo-upload-list-cover">
+                <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+              </div>
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+
+    <Alert class="l_title" show-icon type="warning">平台仲裁</Alert>
+    <table cellspacing="0" cellpadding='0' border="1">
+      <tr>
+        <td>仲裁意见</td>
+        <td>{{ detail.arbitrationResult || '暂无' }}</td>
+      </tr>
+    </table>
+
+    <Alert class="l_title" show-icon type="warning">对话详情</Alert>
+    <div class="speak-way" v-if="detail.orderComplaintCommunications.length">
+      <div
+        class="speak-msg seller"
+        :class="{'speak-buyer': item.owner == 'BUYER', 'speak-platform': item.owner == 'PLATFORM', 'speak-seller': item.owner == 'STORE',}"
+        :key="i"
+        v-for="(item, i) in detail.orderComplaintCommunications"
+      >
+        {{
+          item.owner == "PLATFORM"
+            ? "平台"
+            : item.owner == "BUYER"
+            ? "买家"
+            : "卖家"
+        }}[{{ item.createTime }}]：
+        <span>{{ item.content }}</span>
+      </div>
+    </div>
+    <div v-else>暂无对话</div>
+    <table cellspacing="0" cellpadding='0' border="1" v-if="detail.complainStatus!='COMPLETE'">
+      <tr>
+        <td>回复：</td>
+        <td><label>
+          <input type="textarea" maxlength="200" :rows="4" clearable
+                 style="width:260px" v-model="params.content"></input>
+        </label></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <Button type="primary"  :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+            回复
+          </Button>
+        </td>
+      </tr>
+    </table>
+
+    <Modal title="View Image" v-model="visible">
+      <img :src="previewImage" v-if="visible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+<script>
+import {getComplainDetail} from '@/api/member.js';
+import {communication} from '@/api/order';
+export default {
+  data () {
+    return {
+      detail: {}, // 评价详情
+      visible: false, // 图片预览
+      previewImage: '', // 预览图片地址
+      loading: false, // 加载状态
+      // 状态
+      statusLabel: {
+        NO_APPLY: '未申请',
+        APPLYING: '申请中',
+        COMPLETE: '已完成',
+        EXPIRED: '已失效',
+        CANCEL: '已取消',
+        NEW: '待审核'
+      },
+      // 商家回复内容
+      params: {
+        content: '',
+        complainId: ''
+      }
+    }
+  },
+  methods: {
+    getDetail () {
+      getComplainDetail(this.$route.query.id).then(res => {
+        if (res.success) this.detail = res.result
+      })
+    },
+    goGoodsDetail (skuId, goodsId) {
+      let routerUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: {skuId, goodsId}
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    handleView (name) {
+      this.previewImage = name;
+      this.visible = true;
+    },
+    // 回复
+    handleSubmit () {
+      if (this.params.content === '') {
+        this.$Message.error('请填写对话内容');
+        return;
+      }
+      this.params.complainId = this.$route.query.id;
+      communication(this.params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success('对话成功');
+          this.params.content = '';
+          this.getDetail();
+        }
+      });
+    }
+  },
+  mounted () {
+    this.getDetail()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.speak-way {
+  background-color: #fff;
+  width: 100%;
+  border: 1px solid #999;
+
+  .speak-seller {
+    background-color: #fff2c6;
+  }
+
+  .speak-platform {
+    background-color: #ffe2d1;
+  }
+
+  .speak-buyer {
+    background-color: #c1d6d5;
+  }
+}
+
+.speak-msg {
+  height: 40px;
+  line-height: 40px;
+  padding: 0 5px;
+  border-radius: 5px;
+  margin: 5px;
+  background-color: #eee;
+}
+
+.demo-upload-list {
+  display: inline-block;
+  width: 100px;
+  height: 100px;
+  text-align: center;
+  line-height: 100px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
+  margin-right: 4px;
+  margin-top: 10px;
+}
+
+.demo-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.demo-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, .6);
+}
+
+.demo-upload-list:hover .demo-upload-list-cover {
+  display: block;
+}
+
+.demo-upload-list-cover i {
+  color: #fff;
+  font-size: 30px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+
+.icon-upload {
+  width: 58px;
+  height: 58px;
+  line-height: 58px;
+  text-align: center;
+  display: inline-block;
+  border: 1px dashed #999;
+  border-radius: 4px;
+  margin-top: 10px;
+
+  &:hover {
+    cursor: pointer;
+    border-color: $theme_color;
+  }
+}
+
+.l_title {
+  margin: 10px 0;
+}
+
+table {
+  width: 100%;
+  border-color: #eee;
+
+  td {
+    padding: 10px;
+
+    &:nth-child(1) {
+      width: 120px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/ComplainList.vue b/buyer/src/pages/home/memberCenter/ComplainList.vue
new file mode 100644
index 00000000..d4cf694b
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/ComplainList.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="wrapper">
+    <card _Title="我的投诉"  />
+
+    <div class="order">
+      <div class="order-title">
+        <Row class="order-row title">
+          <i-col span="12">商品信息</i-col>
+          <i-col span="4">投诉状态</i-col>
+          <i-col span="4">投诉主题</i-col>
+          <i-col span="6"></i-col>
+        </Row>
+      </div>
+      <empty v-if="list.length === 0" />
+
+      <div class="order-item" v-else v-for="(item, index) in list" :key="index">
+        <div>
+          <div class="title order-item-title">
+            <span>投诉单号:{{item.id}}</span>
+            <span class="color999 ml_10">{{item.createTime}}</span>
+            <span class="hover-pointer fontsize_12 eval-detail" @click="detail(item.id)">投诉详情</span>
+            <span class="hover-pointer fontsize_12 eval-detail" style="right: 90px" v-if="item.complainStatus != 'EXPIRED' && item.complainStatus != 'CANCEL'" @click="cancel(item.id)">取消投诉</span>
+          </div>
+          <Row class="order-item-view">
+            <i-col span="12" class="item-view-name">
+              <div class="order-img">
+                <img :src="item.goodsImage" alt="" />
+              </div>
+              <div class="order-name">
+                {{item.goodsName}}
+              </div>
+              <div>
+                x1
+              </div>
+            </i-col>
+            <i-col span="4">{{statusLabel[item.complainStatus]}}</i-col>
+            <i-col span="4">
+              <Tooltip >
+                <div class="content">{{item.content}}</div>
+                <div style="white-space: normal;" slot="content">
+                  {{item.content}}
+                </div>
+              </Tooltip>
+            </i-col>
+            <i-col span="4">
+              <Tooltip >
+                <div class="content">{{item.content}}</div>
+                <div style="white-space: normal;" slot="content">
+                  {{item.content}}
+                </div>
+              </Tooltip>
+            </i-col>
+          </Row>
+        </div>
+      </div>
+      <Spin v-if="loading"></Spin>
+    </div>
+    <!-- 分页 -->
+    <div class="page-size">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
+  </div>
+</template>
+
+<script>
+import {complainList, clearComplain} from '@/api/member.js';
+export default {
+  name: 'ComplainList',
+  data () {
+    return {
+      loading: false, // 加载状态
+      list: [], // 投诉列表
+      statusLabel: { // 投诉状态
+        NO_APPLY: '未申请',
+        APPLYING: '申请中',
+        COMPLETE: '已完成，此时可申请',
+        EXPIRED: '已失效，不可申请',
+        CANCEL: '已取消',
+        NEW: '申请中'
+      },
+      total: 0, // 投诉总数
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10
+      }
+    };
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      complainList(this.params).then(res => {
+        if (res.success) {
+          const list = res.result.records;
+          this.list = list;
+          this.total = res.result.total
+        }
+      })
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    cancel (id) {
+      this.$Modal.confirm({
+        title: '取消投诉',
+        content: '<p>确定取消投诉吗？</p>',
+        onOk: () => {
+          clearComplain(id).then((res) => {
+            if (res.success) {
+              this.$Message.success('取消投诉成功');
+              this.getCartList();
+            }
+          });
+        },
+        onCancel: () => { }
+      });
+    },
+    detail (id) {
+      this.$router.push({path: '/home/complainDetail', query: { id }})
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.order-img {
+  > img {
+    width: 60px;
+    height: 60px;
+    border: 1px solid $border_color;
+    box-sizing: border-box;
+  }
+}
+.title {
+  @include background_color($light_background_color);
+}
+.item-view-name {
+  display: flex;
+}
+.order-name {
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2;
+
+  overflow: hidden;
+  text-align: left;
+  padding: 0 10px;
+  font-size: 13px;
+  @include content_color($light_content_color);
+}
+.order-item-title {
+  padding: 5px 20px;
+  text-align: left;
+  font-size: 13px;
+  position: relative;
+}
+.order-item-view {
+  padding: 10px 20px;
+}
+.order-item {
+  text-align: center;
+  border: 1px solid $border_color;
+  margin: 10px 0;
+}
+.order-row {
+  padding: 10px 0;
+  text-align: center;
+}
+.content {
+  color: #999;
+  max-height: 60px;
+  overflow: hidden;
+  word-wrap: break-word;
+}
+
+.eval-detail {
+  position: absolute;
+  right: 20px;
+  &:hover{
+    color: $theme_color;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
new file mode 100644
index 00000000..3fa853ff
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -0,0 +1,382 @@
+<template>
+    <div class='wrapper'>
+      <card _Title='我的分销'/>
+      <!-- 分销申请 -->
+      <div v-if="status === 0">
+        <Alert type="warning">分销商申请</Alert>
+        <Form ref="form" :model="applyForm" :rules="rules">
+          <FormItem label="姓名" prop="name">
+            <Input v-model="applyForm.name"></Input>
+          </FormItem>
+          <FormItem label="身份证号" prop="idNumber">
+            <Input v-model="applyForm.idNumber"></Input>
+          </FormItem>
+          <FormItem>
+            <Button type="primary" :loading="applyLoading" @click="apply">提交申请</Button>
+          </FormItem>
+          </Form>
+      </div>
+      <!-- 分销审核 -->
+      <div v-if="status === 1">
+        <Alert type="success">
+          您提交的信息正在审核
+          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
+        </Alert>
+      </div>
+      <!-- 分销提现、商品、订单 -->
+      <div v-if="status === 2">
+        <div class="box">
+          <div class="mb_20 account-price">
+            <span class="subTips">可提现金额：</span>
+            <span class="fontsize_48 global_color">￥{{ result.canRebate | unitPrice }}</span>
+            <span class="subTips">冻结金额：</span>
+            <span class="">￥{{ result.commissionFrozen | unitPrice }}</span>
+            <Button type="primary" size="small" class="ml_20" @click="withdrawApplyModal = true">申请提现</Button>
+          </div>
+        </div>
+        <Tabs :value="tabName" @on-click="tabPaneChange">
+          <TabPane label="已选商品" name="goodsChecked">
+            <Table stripe :columns="goodsColumns" :data="goodsData.records">
+              <template slot-scope="{ row }" slot="name">
+                <div class="goods-msg" @click="linkTo(`/goodsDetail?skuId=${row.skuId}&goodsId=${row.id}`)"><img style="vertical-align:top;" :src="row.thumbnail" width="60" height="60" alt="">&nbsp; {{row.goodsName}}</div>
+              </template>
+              <template slot-scope="{ row }" slot="price">
+                <span> ￥{{ row.price | unitPrice }}</span>
+              </template>
+              <template slot-scope="{ row }" slot="commission">
+                <span> ￥{{ row.commission | unitPrice }}</span>
+              </template>
+              <template slot-scope="{ row }" slot="action">
+                <Button type="primary" size="small" style="margin-right: 5px" @click="fenxiao(row)">分销商品</Button>
+              </template>
+            </Table>
+            <div class="page-size">
+              <Page
+                :current="params.pageNumber"
+                :total="goodsData.total"
+                :page-size="params.pageSize"
+                @on-change="changePage"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </div>
+          </TabPane>
+          <TabPane label="未选商品" name="goodsUncheck">
+            <Table stripe :columns="goodsColumns" :data="goodsData.records">
+              <template slot-scope="{ row }" slot="name">
+                <div class="goods-msg" @click="linkTo(`/goodsDetail?skuId=${row.skuId}&goodsId=${row.id}`)"><img style="vertical-align:top;" :src="row.thumbnail" width="60" height="60" alt="">&nbsp; {{row.goodsName}}</div>
+              </template>
+              <template slot-scope="{ row }" slot="price">
+                <span> ￥{{ row.price | unitPrice }}</span>
+              </template>
+              <template slot-scope="{ row }" slot="commission">
+                <span> ￥{{ row.commission | unitPrice }}</span>
+              </template>
+              <template slot-scope="{ row }" slot="action">
+                <Button type="primary" size="small" style="margin-right: 5px" @click="selectGoods(row.id)">选择商品</Button>
+              </template>
+            </Table>
+            <div class="page-size">
+              <Page
+                :current="params.pageNumber"
+                :total="goodsData.total"
+                :page-size="params.pageSize"
+                @on-change="changePage"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </div>
+          </TabPane>
+          <TabPane label="提现记录" name="log">
+            <Table stripe :columns="logColumns" :data="logData.records">
+              <template slot-scope="{ row }" slot="time">
+                <span>{{row.createTime}}</span>
+              </template>
+              <template slot-scope="{ row }" slot="price">
+                <span> +￥{{ row.price | unitPrice }}</span>
+              </template>
+              <template slot-scope="{ row }" slot="status">
+                <span> {{row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "PASS" ? "通过" : "拒绝"}}</span>
+              </template>
+            </Table>
+            <div class="page-size">
+              <Page
+                :current="logParams.pageNumber"
+                :total="logData.total"
+                :page-size="logParams.pageSize"
+                @on-change="changePageLog"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </div>
+          </TabPane>
+        </Tabs>
+      </div>
+      <!-- 未开放 -->
+      <div v-if="status === 3">
+        <Alert type="error">
+          分销功能暂未开启
+          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
+        </Alert>
+      </div>
+
+      <Modal v-model="withdrawApplyModal" width="530">
+        <p slot="header">
+          <Icon type="edit"></Icon>
+          <span>提现金额</span>
+        </p>
+        <div>
+          <Input
+            v-model="withdrawPrice"
+            size="large"
+            number
+            maxlength="9"
+            ><span slot="append">元</span></Input>
+        </div>
+        <div slot="footer" style="text-align: center">
+          <Button type="primary" size="large" @click="withdraw">提现</Button>
+        </div>
+      </Modal>
+      <Modal v-model="qrcodeShow" title="分销商品" width="800">
+        <Alert type="warning">
+          下载二维码或者复制链接分享商品
+        </Alert>
+        <div style="width:200px;height:200px;border:1px solid #eee;">
+          <vue-qr :text="qrcode" :callback="qrcodeData" :margin="0" colorDark="#000" colorLight="#fff" :size="200"></vue-qr>
+          <Button class="download-btn" type="success" @click="downloadQrcode">下载二维码</Button>
+        </div>
+        <div class="mt_10">商品链接：<Input style="width:400px" v-model="qrcode"></Input></div>
+      </Modal>
+    </div>
+</template>
+
+<script>
+import {distribution, applyDistribution, distCash, distCashHistory, getDistOrderList, getDistGoodsList, selectDistGoods} from '@/api/member.js'
+import { IDCard } from '@/plugins/RegExp.js';
+import vueQr from 'vue-qr';
+export default {
+  name: 'Distribution',
+  components: { vueQr },
+  data () {
+    return {
+      status: 0, // 申请状态，0为未申请 1 申请中 2 申请完成 3 功能暂未开启
+      applyForm: {}, // 申请表单
+      rules: { // 验证规则
+        name: [{required: true, message: '请输入真实姓名'}],
+        idNumber: [
+          {required: true, message: '请输入身份证号'},
+          {pattern: IDCard, message: '请输入正确的身份证号'}
+        ]
+      },
+      tabName: 'goodsChecked', // 当前所在tab
+      result: {}, // 审核结果
+      applyLoading: false, // 申请加载状态
+      goodsLoading: false, // 列表加载状态
+      withdrawApplyModal: false, // 提现表单显隐
+      withdrawPrice: 0, // 提现金额
+      goodsData: {}, // 商品数据
+      logData: {}, // 日志数据
+      goodsColumns: [ // 商品表头
+        {title: '商品名称', slot: 'name', width: 400},
+        {title: '商品价格', slot: 'price'},
+        {title: '佣金', slot: 'commission'},
+        {title: '操作', slot: 'action', width: 120}
+      ],
+      logColumns: [ // 日志表头
+        {title: '申请时间', slot: 'time'},
+        {title: '提现金额', slot: 'price'},
+        {title: '提现状态', slot: 'status'}
+      ],
+      params: { // 商品请求参数
+        pageNumber: 1,
+        pageSize: 20,
+        checked: true
+      },
+      orderParams: { // 订单商品请求参数
+        pageNumber: 1,
+        pageSize: 20
+      },
+      logParams: { // 日志参数
+        pageNumber: 1,
+        pageSize: 20
+      },
+      qrcode: '', // 二维码
+      qrcodeShow: false, // 显示二维码
+      base64Img: '', // base64编码
+      goodsNameCurr: ''// 当前分销商品名称
+    }
+  },
+  mounted () {
+    this.distribution()
+  },
+  methods: {
+    apply () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.applyLoading = true
+          applyDistribution(this.form).then(res => {
+            this.applyLoading = false
+            if (res.success) {
+              this.$Message.success('申请已提交，请等待管理员审核')
+              this.status = 1;
+            }
+          })
+        }
+      })
+    },
+    withdraw () { // 申请提现
+      distCash({price: this.withdrawPrice}).then(res => {
+        this.withdrawApplyModal = false
+        this.price = 0;
+        if (res.success) {
+          this.$Message.success('提现成功')
+          this.distribution()
+        } else {
+          this.$Message.error(res.message)
+        }
+      })
+    },
+    qrcodeData (data64) {
+      this.base64Img = data64
+    },
+    downloadQrcode () {
+      let a = document.createElement('a'); // 生成一个a元素
+      let event = new MouseEvent('click'); // 创建一个单击事件
+      a.download = this.goodsNameCurr || 'photo'
+      a.href = this.base64Img; // 将生成的URL设置为a.href属性
+      a.dispatchEvent(event); // 触发a的单击事件
+    },
+    tabPaneChange  (tab) { // tab栏切换
+      if (tab === 'goodsChecked') {
+        this.params.checked = true;
+        this.params.pageNUmber = 1
+        this.getGoodsData()
+      } else if (tab === 'goodsUncheck') {
+        this.params.checked = false
+        this.getGoodsData()
+      } else if (tab === 'order') {
+        this.orderParams.pageNumber = 1
+        this.getOrderData()
+      } else if (tab === 'log') {
+        this.logParams.pageNumber = 1
+        this.getLog()
+      }
+    },
+    changePage (val) {
+      this.params.pageNumber = val;
+      this.getGoodsData()
+    },
+    changePageLog (val) {
+      this.logParams.pageNumber = val;
+      this.getLog()
+    },
+    selectGoods (id) { // 选择商品
+      selectDistGoods(id).then(res => {
+        if (res.success) {
+          this.$Message.success('分销商品选择成功，请在已选商品中查看')
+          this.getGoodsData()
+        }
+      })
+    },
+    fenxiao (row) { // 分销商品
+      this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.id}&distributionId=${this.result.id}`
+      this.goodsNameCurr = row.goodsName
+      this.qrcodeShow = true;
+    },
+    getGoodsData () { // 商品数据
+      getDistGoodsList(this.params).then(res => {
+        if (res.success) this.goodsData = res.result
+      })
+    },
+    getOrderData () { // 订单数据
+      getDistOrderList(this.orderParams).then(res => {
+        if (res.success) this.goodsData = res.result
+      })
+    },
+    getLog () { // 提现历史
+      distCashHistory(this.logParams).then(res => {
+        if (res.success) this.goodsData = res.result
+      })
+    },
+    distribution () { // 获取分销商信息
+      distribution().then((res) => {
+        if (res.result) {
+          this.result = res.result;
+          let type = res.result.distributionStatus;
+
+          if (type === 'PASS') {
+            this.status = 2;
+            this.getGoodsData()
+          } else if (type === 'RETREAT' || type === 'REFUSE') {
+            this.status = 0;
+          } else {
+            this.status = 1;
+          }
+        } else if (!res.data.success && res.data.code === 22000) {
+          this.status = 3;
+        } else {
+          // 没有资格申请 先去实名认证
+          this.status = 0
+        }
+      });
+    }
+  }
+}
+</script>
+
+<style scoped lang='scss'>
+  .afList{
+    display: flex;
+
+  }
+.codeImg{
+
+  display: flex;
+  >img{
+    width: 150px;
+    height: 150px;
+  }
+}
+.mb_40{margin-bottom: 40px;}
+.box {
+  margin: 20px 0;
+}
+.page-size {
+  margin: 15px 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.account-price {
+  font-weight: bold;
+}
+.subTips {
+  @include sub_color($light_sub_color);
+}
+.account-btns {
+  margin: 10px 0;
+}
+.ivu-btn {
+  margin: 0 4px;
+}
+.fontsize_48 {
+  font-size: 48px;
+}
+.goods-msg{
+  display: flex;
+  align-items: center;
+  padding: 3px;
+  &:hover{
+    color: $theme_color;
+    cursor: pointer;
+  }
+}
+.download-btn {
+  position: relative;
+  top: -200px;
+  left: 200px;
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
new file mode 100644
index 00000000..173d699f
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="wrapper">
+    <card _Title="近期收藏" :_Tabs="favoriteWay" @_Change="change" :_Size="16" v-if="!homePage"/>
+    <card _Title="近期收藏" :_Size="16" :_Tabs="favoriteWay" @_Change="change" _More="全部收藏" _Src="/home/Favorites" v-else></card>
+    <div v-if="list.length">
+      <template v-for="(item) in list">
+        <div class="goodsItem" :key="item.skuId">
+          <div class="goodsImg hover-pointer">
+            <img
+              :src="params.type === 'GOODS'? item.image : item.logo"
+              alt=""
+            />
+          </div>
+          <div class="goodsTitle hover-pointer">
+            {{params.type === 'GOODS'? item.goodsName : item.storeName}}
+          </div>
+          <div class="goodsPrice">
+            <span v-if="params.type === 'GOODS'">{{item.price | unitPrice}}</span>
+            <Tag color="error" v-if="item.selfOperated">商家自营</Tag>
+          </div>
+          <div class="goodsBuy">
+            <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)" v-if="params.type === 'GOODS'">立即购买</Button>
+            <Button size="small" type="primary" @click="goShop(item.storeId)" v-else>店铺购买</Button>
+            <Button size="small" type="error" ghost v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
+            <Button size="small" type="error" ghost v-if="params.type === 'SHOP'" @click="cancel(item.storeId)">取消收藏</Button>
+          </div>
+        </div>
+      </template>
+      <Spin size="large" fix v-if="spinShow"></Spin>
+    </div>
+    <empty v-else />
+    <!-- 分页 -->
+    <div class="page-size mt_10" v-if="paging">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
+  </div>
+</template>
+
+<script>
+import { collectList, cancelCollect } from '@/api/member.js'
+export default {
+  name: 'Favorites',
+  props: {
+    paging: {
+      type: Boolean,
+      default: true
+    },
+    homePage: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      favoriteWay: ['收藏商品', '收藏店铺'], // 收藏分类
+      list: [], // 收藏列表
+      total: 0, // 收藏总数
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10,
+        type: 'GOODS'
+      },
+      spinShow: false // 加载状态
+    };
+  },
+  methods: {
+    getList () {
+      this.spinShow = true
+      collectList(this.params).then(res => {
+        this.spinShow = false
+        if (res.success) this.list = res.result.records;
+      })
+    },
+    change (index) {
+      if (index === 0) { this.params.type = 'GOODS' }
+      if (index === 1) { this.params.type = 'SHOP' }
+      this.getList()
+    },
+    cancel (id) {
+      let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
+      this.$Modal.confirm({
+        title: 'Title',
+        content: `<p>确定取消收藏该${typeName}吗？</p>`,
+        onOk: () => {
+          cancelCollect(this.params.type, id).then(res => {
+            if (res.success) {
+              this.getList();
+            }
+          })
+        }
+      });
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    buynow (skuId, goodsId) {
+      let url = this.$router.resolve({
+        path: '/goodsDetail',
+        query: {skuId, goodsId}
+      })
+      window.open(url.href, '_blank')
+    },
+    goShop (id) {
+      let url = this.$router.resolve({
+        path: '/merchant',
+        query: {id}
+      })
+      window.open(url.href, '_blank')
+    }
+  },
+  mounted () {
+    if (this.homePage) this.params.pageSize = 5;
+    this.getList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.goodsShop,
+.goodsImg,
+.goodsPrice,
+.goodsShop,
+.goodsTitle {
+  margin: 0 6px;
+}
+.wrapper {
+  margin-bottom: 40px;
+}
+.goodsItem {
+  display: flex;
+  height: 60px;
+  line-height: 60px;
+  margin-bottom: 10px;
+
+  > .goodsImg {
+    width: 60px;
+    height: 60px;
+    overflow: hidden;
+
+    > img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  > .goodsPrice,
+  .goodsShop {
+    width: 150px;
+    text-align: center;
+  }
+
+  > .goodsTitle {
+    width: 400px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+.goodsBuy {
+  margin-left: 80px;
+}
+.page-size{
+  text-align: right;
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/Invoice.vue b/buyer/src/pages/home/memberCenter/Invoice.vue
new file mode 100644
index 00000000..68bb3122
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/Invoice.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="wrapper">
+    <card _Title="我的发票"></card>
+    <empty v-if="list.length===0" />
+    <div v-else>
+      <Button size="small" @click="invoiceAvailable = true">新增发票</Button>
+      <div class="receipt-item" v-for="(item,index) in list" :key="index">
+        <p><span>发票抬头：</span>{{item.receiptTitle}}</p>
+        <p><span>发票内容：</span> {{item.receiptContent}}</p>
+        <p><span>纳税人识别号：</span> {{item.taxpayerId}}</p>
+      </div>
+    </div>
+    <Modal v-model="invoiceAvailable" width="600" footer-hide>
+        <Form
+          :model="form"
+          ref="form"
+          label-position="left"
+          :rules="ruleInline"
+          :label-width="110"
+        >
+          <FormItem label="发票类型">
+            <RadioGroup v-model="form.type">
+              <Radio :label="2">单位</Radio>
+            </RadioGroup>
+          </FormItem>
+          <FormItem
+            label="发票抬头"
+            prop="receiptTitle"
+          >
+            <i-input v-model="form.receiptTitle"></i-input>
+          </FormItem>
+          <FormItem
+            label="纳税人识别号"
+            prop="taxpayerId"
+          >
+            <i-input v-model="form.taxpayerId"></i-input>
+          </FormItem>
+          <FormItem label="发票内容">
+            <RadioGroup v-model="form.receiptContent">
+              <Radio label="商品明细">商品明细</Radio>
+            </RadioGroup>
+          </FormItem>
+        </Form>
+        <div style="text-align: center">
+          <Button type="primary" :loading="loading" @click="save">保存发票信息</Button>
+          <Button type="default" @click="invoiceAvailable = false">取消</Button>
+        </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { receiptList, saveReceipt } from '@/api/member.js';
+import { TINumber } from '@/plugins/RegExp.js';
+export default {
+  name: 'Invoice',
+  data () {
+    return {
+      list: [], // 发票列表
+      form: { // 添加发票表单
+        type: 2,
+        receiptTitle: '', // 发票抬头
+        taxpayerId: '', // 纳税人识别号
+        receiptContent: '商品明细'
+      },
+      ruleInline: { // 验证规则
+        receiptTitle: [{ required: true, message: '请填写公司名称' }],
+        taxpayerId: [
+          { required: true, message: '请填写纳税人识别号' },
+          { pattern: TINumber, message: '请填写正确的纳税人识别号' }
+        ]
+      },
+      loading: false, // 加载状态
+      invoiceAvailable: false // 添加发票模态框显隐
+    };
+  },
+  mounted () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      receiptList().then(res => {
+        this.list = res.result.records;
+      })
+    },
+    save () {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let params = {
+            receiptTitle: this.form.receiptTitle,
+            taxpayerId: this.form.taxpayerId,
+            receiptContent: this.form.receiptContent
+          };
+          saveReceipt(params).then((res) => {
+            this.loading = false;
+            if (res.success) {
+              this.getList();
+              this.resetData();
+              this.invoiceAvailable = false;
+            }
+          }).catch(() => {
+            this.loading = false;
+          });
+        }
+      });
+    },
+    resetData () {
+      this.$refs.form.resetFields();
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.receipt-item {
+  cursor: pointer;
+  font-size: 14px;
+  border-bottom: 1px solid #eee;
+
+  > p {
+    padding: 12px 0;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/ModifyPwd.vue b/buyer/src/pages/home/memberCenter/ModifyPwd.vue
new file mode 100644
index 00000000..2a50df15
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/ModifyPwd.vue
@@ -0,0 +1,212 @@
+<template>
+  <div class="wrapper">
+    <card _Title="账户安全"/>
+    <!--  手机号验证  -->
+    <Form ref="formData" :model="formData" label-position="left" :label-width="100" :rules="ruleInLines"
+          v-if="(status == 2 || status == 3) && !showPwd">
+      <FormItem label="手机号">
+        <div class="phone">1234567890</div>
+      </FormItem>
+      <FormItem label="图片验证码" prop="picture" style="width: 350px">
+        <i-input v-model="formData.picture" size="large" maxlength="4"></i-input>
+      </FormItem>
+      <FormItem label="短信验证码" prop="msg">
+        <i-input v-model="formData.msg" size="large" maxlength="6" style="width: 250px">
+          <span slot="append">输入验证码</span>
+        </i-input>
+      </FormItem>
+    </Form>
+    <div slot="footer" v-if="(status == 2 || status == 3) && !showPwd" style="text-align: center;width: 50%">
+      <Button type="primary" class="ml_10" @click="submitRegister">下一步</Button>
+    </div>
+
+    <!--  修改  -->
+    <Form ref="formRegister" :model="formRegister" :rules="ruleInline" :label-width="80" v-if="status == 1 && !showPwd">
+      <FormItem label="旧密码" prop="password">
+        <i-input type="password" v-model="formRegister.password" clearable size="large" placeholder="请输入旧密码"
+                 style="width: 300px"
+                 maxlength="12">
+          <Icon type="md-lock" slot="prepend"></Icon>
+        </i-input>
+      </FormItem>
+      <FormItem label="新密码" prop="newPassword">
+        <i-input type="password" v-model="formRegister.newPassword" clearable size="large" placeholder="请输入新密码"
+                 style="width: 300px"
+                 maxlength="12">
+          <Icon type="md-lock" slot="prepend"></Icon>
+        </i-input>
+      </FormItem>
+      <FormItem label="确认密码" prop="againPassword">
+        <i-input type="password" v-model="formRegister.againPassword" clearable size="large" placeholder="请输入确认密码"
+                 style="width: 300px"
+                 maxlength="12">
+          <Icon type="md-lock" slot="prepend"></Icon>
+        </i-input>
+      </FormItem>
+
+    </Form>
+    <div slot="footer" v-if="status == 1 && !showPwd" style="width: 50%;text-align: center">
+      <Button type="primary" class="ml_10" @click="handleRegist">修改</Button>
+    </div>
+    <!-- 设置&修改的第二种情况   -->
+    <Form ref="formDataUpdate" :model="formDataUpdate" label-position="left" :label-width="100" :rules="ruleIn"
+          v-if="showPwd">
+      <FormItem label="新密码" prop="newPassword">
+        <i-input type="password" v-model="formDataUpdate.newPassword" clearable size="large" placeholder="请输入新密码"
+                 style="width: 300px"
+                 maxlength="12">
+          <Icon type="md-lock" slot="prepend"></Icon>
+        </i-input>
+      </FormItem>
+      <FormItem label="确认密码" prop="againPassword">
+        <i-input type="password" v-model="formDataUpdate.againPassword" clearable size="large" placeholder="请输入确认密码"
+                 style="width: 300px"
+                 maxlength="12">
+          <Icon type="md-lock" slot="prepend"></Icon>
+        </i-input>
+      </FormItem>
+    </Form>
+    <div slot="footer" v-if="showPwd" style="text-align: center;width: 50%">
+      <Button type="primary" class="ml_10" @click="setPassword">设置</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  setPwd,
+  editPwd
+} from '@/api/account';
+import {md5} from '@/plugins/md5.js'
+
+export default {
+  name: 'modifyPwd',
+  data () {
+    return {
+      // 1为修改    2为设置     3为提交校验的下一步
+      status: '',
+      showPwd: false, // 显示密码
+      formData: { // 验证表单
+        picture: '',
+        msg: ''
+      },
+      formDataUpdate: { // 直接输入新密码表单
+        newPassword: '',
+        againPassword: ''
+      },
+      formRegister: { // 第三步 新密码表单
+        password: '',
+        againPassword: '',
+        newPassword: ''
+      },
+      ruleInLines: {
+        picture: [
+          {required: true, message: '请输入图片验证码', trigger: 'blur'}
+        ],
+        msg: [
+          {required: true, message: '请输入短信验证码', trigger: 'blur'}
+        ]
+      },
+      ruleIn: {
+        newPassword: [
+          {required: true, message: '请输入新密码', trigger: 'blur'},
+          {type: 'string', min: 6, message: '密码不能少于6位'}
+        ],
+        againPassword: [
+          {required: true, message: '请输入新密码', trigger: 'blur'},
+          {type: 'string', min: 6, message: '密码不能少于6位'}
+        ]
+      },
+      ruleInline: {
+        password: [
+          {required: true, message: '请输入旧密码', trigger: 'blur'}
+        ],
+        newPassword: [
+          {required: true, message: '请输入新密码', trigger: 'blur'},
+          {type: 'string', min: 6, message: '密码不能少于6位'}
+        ],
+        againPassword: [
+          {required: true, message: '请输入新密码', trigger: 'blur'},
+          {type: 'string', min: 6, message: '密码不能少于6位'}
+        ]
+      }
+    }
+  },
+  mounted () {
+    this.status = this.$route.query.status
+  },
+  methods: {
+    // 修改
+    handleRegist () {
+      this.$refs['formRegister'].validate((valid) => {
+        if (valid) {
+          const {newPassword, againPassword, password} = this.formRegister
+          if (newPassword !== againPassword) {
+            this.$Message.error({
+              content: '新旧密码不一致'
+            });
+            return
+          }
+          const params = {newPassword, password}
+          params.newPassword = md5(newPassword)
+          params.password = md5(password)
+          editPwd(params).then(res => {
+            if (res.message === 'success' && res.result) {
+              this.$Message.success('修改密码成功');
+              this.$router.push('/home')
+            }
+          });
+        }
+      })
+    },
+    // 提交验证
+    submitRegister () {
+      this.$refs['formData'].validate((valid) => {
+        if (valid) {
+          this.showPwd = true
+        }
+      })
+    },
+    // 设置密码
+    setPassword () {
+      this.$refs['formDataUpdate'].validate((valid) => {
+        if (valid) {
+          const {newPassword, againPassword} = this.formDataUpdate
+          if (newPassword === '') {
+            this.$Message.error({
+              content: '请输入密码'
+            });
+            return
+          }
+          if (newPassword !== againPassword) {
+            this.$Message.error({
+              content: '新旧密码不一致'
+            });
+            return
+          }
+          const params = {password: newPassword}
+          params.password = md5(newPassword)
+          setPwd(params).then(res => {
+            if (res.message === 'success' && res.result) {
+              this.$Message.success('支付密码设置成功');
+              this.$router.push('/home')
+            }
+          });
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+  .wrapper {
+    text-align: center;
+  }
+
+  .phone {
+    text-align: left;
+  }
+
+</style>
diff --git a/buyer/src/pages/home/memberCenter/Point.vue b/buyer/src/pages/home/memberCenter/Point.vue
new file mode 100644
index 00000000..b266cce7
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/Point.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="point">
+    <card _Title="我的积分" />
+    <div class="point-content">
+      <span>剩余积分：<span>{{pointObj.variablePoint || 0}}</span></span>
+      <span>累计获得：<span>{{pointObj.point || 0}}</span></span>
+    </div>
+    <h3>积分日志</h3>
+    <Table :columns="logColumns" :data="logData.records">
+      <template slot-scope="{ row }" slot="point">
+        <div><span>{{row.pointType == "1" ? '+' : '-'}}</span>{{ row.variablePoint }}</div>
+      </template>
+    </Table>
+    <!-- 分页 -->
+    <Page
+      style="float:right;margin-top:10px"
+      :current="params.pageNumber"
+      :total="logData.total"
+      :page-size="params.pageSize"
+      @on-change="changePage"
+      @on-page-size-change="changePageSize"
+      :page-size-opts="[10, 20, 50]"
+      size="small"
+      show-total
+      show-elevator
+    ></Page>
+  </div>
+</template>
+<script>
+import {memberPoint, memberPointHistory} from '@/api/member.js'
+export default {
+  name: 'Point',
+  data () {
+    return {
+      logData: {}, // 积分日志
+      pointObj: {}, // 积分明细
+      loading: false, // 请求接口加载框
+      params: { // 积分列表请求参数
+        pageNumber: 1,
+        pageSize: 10
+      },
+      logColumns: [ // table展示数据
+        {
+          title: '日志内容',
+          key: 'content',
+          align: 'center'
+        },
+        {
+          title: '时间',
+          key: 'createTime',
+          align: 'center'
+        },
+        {
+          title: '积分明细',
+          slot: 'point',
+          align: 'center'
+        }
+      ]
+    }
+  },
+  mounted () {
+    this.getHistory()
+    this.getPoint()
+  },
+  methods: {
+    getHistory () {
+      memberPointHistory(this.params).then(res => {
+        this.logData = res.result;
+      })
+    },
+    getPoint () { // 获取积分详情
+      memberPoint().then(res => {
+        if (res.success) this.pointObj = res.result
+      })
+    },
+    changePage (val) {
+      this.pageNumber = val
+      this.getHistory()
+    },
+    changePageSize (val) {
+      this.param.pageSize = val
+      this.params.pageNumber = 1
+      this.getHistory()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+h3 {
+  font-size: 16px;
+  margin: 20px 10px;
+}
+.point-content {
+  text-align: center;
+  margin-bottom: 30px;
+  >span{
+    color: #999;
+    margin-right: 100px;
+    span {
+      color: $theme_color;
+      font-size: 24px;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/Profile.vue b/buyer/src/pages/home/memberCenter/Profile.vue
new file mode 100644
index 00000000..63e28f79
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/Profile.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="wrapper">
+    <card _Title="用户信息" />
+    <Form :model="formItem" :rules="rules" ref="form" :label-width="80">
+      <FormItem label="头像">
+        <Avatar v-if="formItem.face" :src="formItem.face" size="80"/>
+        <Avatar v-else icon="ios-person" size="80"/>
+        <Upload
+          :show-upload-list="false"
+          :on-success="handleSuccess"
+          :before-upload="handleBeforeUpload"
+          :format="['jpg','jpeg','png']"
+          :action="action"
+          :headers="accessToken"
+          >
+          <Button class="mt_10">上传头像</Button>
+        </Upload>
+      </FormItem>
+      <FormItem label="昵称" prop="nickName">
+        <Input class="wrapper-user-name" style="width:187px" v-model="formItem.nickName" placeholder="" />
+      </FormItem>
+
+      <FormItem label="生日">
+        <DatePicker type="date" placeholder="选择您的生日" v-model="formItem.birthday"></DatePicker>
+      </FormItem>
+      <FormItem label="性别">
+        <RadioGroup v-model="formItem.sex">
+          <Radio :label="1">男</Radio>
+          <Radio :label="0">女</Radio>
+        </RadioGroup>
+      </FormItem>
+      <FormItem>
+        <Button type="primary" @click="save">确认修改</Button>
+
+      </FormItem>
+    </Form>
+  </div>
+</template>
+
+<script>
+import storage from '@/plugins/storage.js';
+import { editMemberInfo } from '@/api/account.js';
+import { commonUrl } from '@/plugins/request.js';
+export default {
+  name: 'Profile',
+  data () {
+    return {
+      rules: { // 验证规则
+        nickName: [{required: true, message: '用户昵称不能为空'}, { max: 16, message: '用户昵称不能超过15个字符' }]
+      },
+      formItem: {}, // 表单数据
+      action: commonUrl + '/common/upload/file', // 上传接口
+      accessToken: {} // 验证token
+    }
+  },
+  mounted () {
+    this.formItem = JSON.parse(storage.getItem('userInfo'))
+    this.accessToken.accessToken = storage.getItem('accessToken');
+  },
+  methods: {
+    save () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let params = {
+            birthday: this.$options.filters.unixToDate(this.formItem.birthday / 1000, 'yyyy-MM-dd'),
+            face: this.formItem.face,
+            nickName: this.formItem.nickName,
+            sex: this.formItem.sex
+          }
+          editMemberInfo(params).then(res => {
+            if (res.success) {
+              this.$Message.success('修改个人资料成功')
+              storage.setItem('userInfo', res.result)
+            }
+          })
+        }
+      })
+    },
+    handleSuccess (res, file) {
+      this.$set(this.formItem, 'face', res.result)
+    },
+    handleBeforeUpload () {}
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue
new file mode 100644
index 00000000..e538b581
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/evaluation/AddEval.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="add-eval">
+    <div class="title">
+      <card _Title="订单评价" :_Size="16"></card>
+      <p>
+        <span class="color999">订单号：</span><span>{{$route.query.sn}}</span>
+        <span class="color999 ml_20" v-if="order.order">{{order.order.paymentTime}}</span>
+      </p>
+    </div>
+    <!-- 物流评分、服务评分 -->
+    <div class="delivery-rate">
+      <div class="fontsize_16">物流服务评价：</div>
+      <div class="color999">
+        <span>物流评价：<Rate v-model="form.deliveryScore" /></span>
+        <span>服务评价：<Rate v-model="form.serviceScore" /></span>
+        <span>描述评价：<Rate v-model="form.descriptionScore" /></span>
+      </div>
+    </div>
+    <!-- 添加订单评价  左侧商品详情  右侧评价框 -->
+    <ul class="goods-eval">
+      <li >
+        <div class="goods-con">
+          <img :src="orderGoods.image" 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>
+          <p>{{orderGoods.goodsPrice | unitPrice('￥')}}</p>
+        </div>
+
+        <div class="eval-con">
+          <div>
+            <span class="color999">商品评价：</span>
+            <RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade">
+              <Radio label="GOOD">好评</Radio>
+              <Radio label="MODERATE">中评</Radio>
+              <Radio label="WORSE">差评</Radio>
+            </RadioGroup>
+            <Input type="textarea" maxlength="500" show-word-limit :rows="4" v-model="orderGoods.content" />
+          </div>
+          <div style="display:flex;align-items:center;">
+            <div class="demo-upload-list" v-for="(img, index) in orderGoods.uploadList" :key="index">
+              <img :src="img">
+              <div class="demo-upload-list-cover">
+                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+                  <Icon type="ios-trash-outline" @click.native="handleRemove(index)"></Icon>
+              </div>
+            </div>
+            <Upload
+                :show-upload-list="false"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                :format="['jpg','jpeg','png']"
+                :action="action"
+                :headers="accessToken"
+                style="display: inline-block;width:58px;">
+                <div class="hover-pointer icon-upload" style="">
+                  <Icon type="ios-camera" size="20"></Icon>
+                </div>
+            </Upload>
+          </div>
+        </div>
+      </li>
+    </ul>
+    <Button type="primary" class="mt_10" :loading="loading" @click="save">发表</Button>
+    <Modal title="View Image" v-model="visible">
+        <img :src="previewImage" v-if="visible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+<script>
+import { orderDetail } from '@/api/order.js';
+import { addEvaluation } from '@/api/member.js';
+import { commonUrl } from '@/plugins/request.js';
+import storage from '@/plugins/storage';
+export default {
+  data () {
+    return {
+      order: {}, // 订单详情
+      orderGoods: {}, // 订单商品
+      form: { // 评分展示
+        deliveryScore: 5,
+        serviceScore: 5,
+        descriptionScore: 5
+      }, // 表单
+      visible: false, // 图片预览
+      action: commonUrl + '/common/upload/file', // 上传地址
+      accessToken: {}, // 验证token
+      previewImage: '', // 预览图片地址
+      loading: false // 提交加载状态
+    }
+  },
+  methods: {
+    getOrderDetail () {
+      orderDetail(this.$route.query.sn).then(res => {
+        this.order = res.result
+        this.orderGoods = res.result.orderItems[this.$route.query.index]
+        this.$set(this.orderGoods, 'grade', 'GOOD')
+        this.orderGoods.uploadList = []
+      })
+    },
+    save () {
+      if (!this.form.serviceScore || !this.form.deliveryScore) {
+        this.$Message.warning('物流服务评价不能为空')
+        return false;
+      }
+
+      if (!this.form.descriptionScore) {
+        this.$Message.warning('描述评价不能为空')
+      }
+
+      this.loading = true;
+      let goods = this.orderGoods
+      let params = {
+        goodsId: goods.goodsId,
+        orderItemSn: goods.sn,
+        skuId: goods.skuId,
+        descriptionScore: this.form.descriptionScore,
+        serviceScore: this.form.serviceScore,
+        deliveryScore: this.form.deliveryScore,
+        grade: goods.grade,
+        content: goods.content || '',
+        images: goods.uploadList.toString()
+      }
+      addEvaluation(params).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.$Message.success('评价成功')
+          this.$router.push('/home/CommentList')
+        }
+      }).catch(() => {
+        this.loading = false;
+      })
+    },
+    goGoodsDetail (skuId, goodsId) {
+      let routerUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: {skuId, goodsId}
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    handleView (name) {
+      this.previewImage = name;
+      this.visible = true;
+    },
+    handleRemove (index) {
+      this.orderGoods.uploadList.splice(index, 1)
+      this.$forceUpdate()
+    },
+    handleSuccess (res, file) {
+      this.orderGoods.uploadList.push(res.result)
+      this.$forceUpdate()
+    },
+    handleBeforeUpload () {
+      const check = this.orderGoods.uploadList.length < 10;
+      if (!check) {
+        this.$Notice.warning({
+          title: '最多可以上传九张图片'
+        });
+        return check;
+      }
+    }
+  },
+  mounted () {
+    this.accessToken.accessToken = storage.getItem('accessToken');
+    this.getOrderDetail()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.delivery-rate {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  height: 50px;
+  border-bottom: 1px solid #eee;
+  >div:nth-child(1) {
+    width: 120px;
+    font-weight: bold;
+  }
+}
+.goods-eval li{
+  display: flex;
+  border-bottom: 1px solid #eee;
+
+  .goods-con {
+    width: 30%;
+    padding: 20px;
+    text-align: center;
+    p {
+      word-wrap: wrap;
+      &:hover{ color: $theme_color; }
+    }
+  }
+  .eval-con {
+    width: 70%;
+    padding: 20px;
+  }
+}
+
+.demo-upload-list{
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  margin-right: 4px;
+  margin-top: 10px;
+}
+.demo-upload-list img{
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover{
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0,0,0,.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover{
+  display: block;
+}
+.demo-upload-list-cover i{
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.icon-upload {
+  width: 58px;
+  height:58px;
+  line-height: 58px;
+  text-align:center;
+  display: inline-block;
+  border:1px dashed #999;
+  border-radius: 4px;
+  margin-top: 10px;
+  &:hover{
+    cursor: pointer;
+    border-color: $theme_color;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
new file mode 100644
index 00000000..25cff5cb
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="add-eval">
+    <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>
+      </p>
+    </div>
+    <!-- 物流评分、服务评分 -->
+    <div class="delivery-rate">
+      <div class="fontsize_16">物流服务评价：</div>
+      <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>
+      </div>
+    </div>
+    <!-- 添加订单评价  左侧商品详情  右侧评价框 -->
+    <ul class="goods-eval">
+      <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>
+        </div>
+
+        <div class="eval-con">
+          <div>
+            <span class="color999">商品评价：</span>
+            <RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade">
+              <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" />
+          </div>
+          <div style="display:flex;align-items:center;">
+            <template v-if="orderGoods.image">
+              <div class="demo-upload-list"  v-for="(img, index) in orderGoods.image.split(',')" :key="index">
+                <img :src="img">
+                <div class="demo-upload-list-cover">
+                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+      </li>
+    </ul>
+    <Modal title="View Image" v-model="visible">
+        <img :src="previewImage" v-if="visible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+<script>
+import { evaluationDetail } from '@/api/member.js';
+export default {
+  data () {
+    return {
+      order: {}, // 订单详情
+      orderGoods: {}, // 订单商品
+      visible: false, // 图片预览
+      previewImage: '', // 预览图片链接
+      loading: false // 加载状态
+    }
+  },
+  methods: {
+    getDetail () {
+      evaluationDetail(this.$route.query.id).then(res => {
+        if (res.success) this.orderGoods = res.result
+      })
+    },
+    goGoodsDetail (skuId, goodsId) {
+      let routerUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: {skuId, goodsId}
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    handleView (name) {
+      this.previewImage = name;
+      this.visible = true;
+    }
+  },
+  mounted () {
+    this.getDetail()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.delivery-rate {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  height: 50px;
+  border-bottom: 1px solid #eee;
+  >div:nth-child(1) {
+    width: 120px;
+    font-weight: bold;
+  }
+}
+.goods-eval li{
+  display: flex;
+  border-bottom: 1px solid #eee;
+
+  .goods-con {
+    width: 30%;
+    padding: 20px;
+    text-align: center;
+    p {
+      word-wrap: wrap;
+      &:hover{ color: $theme_color; }
+    }
+  }
+  .eval-con {
+    width: 70%;
+    padding: 20px;
+  }
+}
+
+.demo-upload-list{
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  margin-right: 4px;
+  margin-top: 10px;
+}
+.demo-upload-list img{
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover{
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0,0,0,.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover{
+  display: block;
+}
+.demo-upload-list-cover i{
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.icon-upload {
+  width: 58px;
+  height:58px;
+  line-height: 58px;
+  text-align:center;
+  display: inline-block;
+  border:1px dashed #999;
+  border-radius: 4px;
+  margin-top: 10px;
+  &:hover{
+    cursor: pointer;
+    border-color: $theme_color;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/AddAddress.vue b/buyer/src/pages/home/orderCenter/AddAddress.vue
new file mode 100644
index 00000000..b0a6cfe8
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/AddAddress.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <card _Title="收货地址" />
+    <div class="add-box">
+      <Form
+        :model="formData"
+        ref="form"
+        label-position="left"
+        :label-width="100"
+        :rules="ruleInline"
+      >
+        <FormItem label="收件人" prop="name">
+          <i-input v-model="formData.name" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="收件地区" prop="address">
+          <i-input
+            v-model="formData.address"
+            disabled
+            style="width: 600px"
+          ></i-input>
+          <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
+        </FormItem>
+        <FormItem label="详细地址" prop="detail">
+          <i-input v-model="formData.detail" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="手机号码" prop="mobile">
+          <i-input v-model="formData.mobile" style="width: 600px"></i-input>
+        </FormItem>
+        <FormItem label="地址别名">
+          <i-input
+            v-model="formData.alias"
+            length
+            :maxlength="4"
+            placeholder="请输入地址别名，例如公司"
+            style="width: 600px"
+          ></i-input>
+        </FormItem>
+        <FormItem label="默认地址">
+          <i-switch v-model="formData.isDefault" />
+        </FormItem>
+      </Form>
+    </div>
+    <div class="mt_20">
+      <Button type="primary" class="mr_10" :loading="loading" @click="save"
+        >保存收货地址</Button
+      >
+      <Button @click="$router.back()">返回</Button>
+    </div>
+    <lili-map ref="map" @getAddress="getAddress"></lili-map>
+  </div>
+</template>
+
+<script>
+import card from '@/components/card';
+import liliMap from '@/components/map';
+import {
+  newMemberAddress,
+  editMemberAddress,
+  getAddrDetail
+} from '@/api/address';
+export default {
+  name: 'AddAddress',
+  data () {
+    return {
+      formData: { // 添加地址表单
+        isDefault: false
+      },
+      ruleInline: { // 验证规则
+        name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        address: [{ required: true, message: '请输入地址', trigger: 'change' }],
+        detail: [
+          { required: true, message: '请输入详细地址', trigger: 'blur' }
+        ],
+        mobile: [
+        ]
+      },
+      loading: false, // 加载状态
+      mapMsg: {} // 地图信息
+    };
+  },
+  methods: {
+    save () {
+      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.$route.query.id) {
+            editMemberAddress(params).then((res) => {
+              if (res.code === 200) {
+                this.loading = false;
+                this.$router.push('/home/MyAddress');
+              }
+            }).catch(() => { this.loading = false; });
+          } else {
+            newMemberAddress(params).then((res) => {
+              if (res.code === 200) {
+                this.loading = false;
+                this.$router.push('/home/MyAddress');
+              }
+            }).catch(() => { this.loading = false; });
+          }
+        }
+      });
+    },
+    getAddrById (id) {
+      // 获取地址详情
+      getAddrDetail(id).then((res) => {
+        if (res.code === 200) {
+          console.log(res);
+          const data = res.result;
+          data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');
+          this.formData = data;
+        }
+      });
+    },
+    getAddress (item) {
+      // 获取地图选择信息
+      console.log(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;
+    }
+  },
+  mounted () {
+    const id = this.$route.query.id;
+    if (id) this.getAddrById(id);
+  },
+  components: {
+    card,
+    liliMap
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.add-box {
+  margin: 40px 0;
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue
new file mode 100644
index 00000000..e79ed999
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="wrapper">
+    <!-- 卡片组件 -->
+    <card _Title="我的售后" :_Size="16"></card>
+    <!-- 搜索 筛选 -->
+    <div class="mb_20 box">
+      <div class="global_float_right" >
+        <Input
+          class="width_300"
+          search
+          enter-button
+          v-model="params.keywords"
+          @on-search="getList"
+          placeholder="请输入订单号搜索"
+        />
+      </div>
+    </div>
+    <!-- 列表 -->
+    <empty v-if="orderList.length === 0" />
+    <div class="order-content" v-else>
+      <template v-for="(order, onderIndex) in orderList">
+        <div
+          class="order-list"
+          :key="onderIndex"
+        >
+          <div class="order-header">
+            <div>
+              <div v-if="order.serviceStatus">{{filterOrderStatus(order.serviceStatus)}}</div>
+              <div>
+                售后单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{order.createTime}}
+                &nbsp; &nbsp;{{ order.memberName | secrecyMobile }}
+              </div>
+            </div>
+            <div>
+              <span>{{ order.applyRefundPrice | unitPrice("￥") }}</span>
+            </div>
+          </div>
+          <div class="order-body">
+            <div class="goods-list">
+              <img @click="goodsDetail(order.skuId, order.goodsId)" class="hover-color" :src="order.goodsImage" alt="" />
+
+              <div>
+                <div class="hover-color" @click="goodsDetail(order.skuId, order.goodsId)">{{ order.goodsName }}</div>
+                <div class="mt_10">
+                  <span class="global_color"
+                    >{{ order.flowPrice | unitPrice("￥") }} </span
+                  >x {{ order.num }}
+                </div>
+              </div>
+            </div>
+
+            <div>
+              <span @click="shopPage(order.shopId)">{{ order.storeName }}</span>
+            </div>
+            <div>
+              <!-- 订单基础操作 -->
+              <Button @click="goDetail(order.sn)" size="small">售后详情</Button>
+              <Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
+            </div>
+          </div>
+        </div>
+      </template>
+      <Spin size="large" fix v-if="spinShow"></Spin>
+    </div>
+    <!-- 分页 -->
+    <div class="page-size">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
+  </div>
+</template>
+
+<script>
+import { afterSaleList, cancelAfterSale } from '@/api/member.js';
+import { afterSaleStatusList } from '../enumeration.js'
+export default {
+  name: 'AfterSale',
+  data () {
+    return {
+      orderList: [], // 订单列表
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10,
+        keywords: ''
+      },
+      // 状态数组
+      afterSaleStatusList,
+      total: 0, // 订单总数
+      spinShow: false // 加载状态
+    };
+  },
+  mounted () {
+    this.getList();
+  },
+  methods: {
+    goDetail (sn) { // 跳转售后详情
+      this.$router.push({
+        name: 'AfterSaleDetail',
+        query: {sn}
+      })
+    },
+    cancel (sn) { // 取消售后申请
+      this.$Modal.confirm({
+        title: '取消',
+        content: '<p>确定取消此次售后申请吗？</p>',
+        onOk: () => {
+          cancelAfterSale(sn).then(res => {
+            if (res.success) {
+              this.$Message.success('取消售后申请成功')
+              this.getList()
+            }
+          })
+        },
+        onCancel: () => {}
+      });
+    },
+    goodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 跳转店铺首页
+    shopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: { id: id }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    getList () {
+      this.spinShow = true;
+      let params = JSON.parse(JSON.stringify(this.params))
+      afterSaleList(params).then(res => {
+        this.spinShow = false
+        if (res.success) {
+          this.orderList = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    filterOrderStatus (status) { // 获取订单状态中文
+      const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
+      return ob[0].name
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.wrapper {
+  margin-bottom: 40px;
+}
+.box {
+  overflow: hidden;
+}
+.page-size {
+  margin: 15px 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+/** 订单列表 */
+.order-list {
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  margin-bottom: 10px;
+
+  &:hover{
+    .del-btn{visibility: visible;}
+  }
+  .del-btn{
+    visibility: hidden;
+  }
+
+  .order-header {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    justify-content: space-between;
+    border-bottom: 1px solid #ddd;
+    > div:nth-child(1) > div:nth-child(2) {
+      font-size: 12px;
+      color: #999;
+      margin-top: 3px;
+    }
+  }
+  .order-body {
+    display: flex;
+    justify-content: space-between;
+    color: #999;
+    padding: 10px;
+
+    .goods-list {
+      width: 500px;
+      display: flex;
+      margin-bottom: 10px;
+      img {
+        width: 60px;
+        height: 60px;
+        margin-right: 10px;
+      }
+      > div {
+        flex: 1;
+      }
+    }
+
+    > div:nth-child(2) {
+      width: 150px;
+      text-align: center;
+      span {
+        color: #438cde;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+      .ivu-icon {
+        color: #ff8f23;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+
+    > div:nth-child(3) {
+      width: 100px;
+      .ivu-btn {
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
new file mode 100644
index 00000000..1f3a1add
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="order-detail">
+    <card _Title="售后详情" :_Size="16"></card>
+    <div class="order-card">
+      <h3>{{filterOrderStatus(afterSale.serviceStatus)}}</h3>
+      <p class="global_color fontsize_18">{{ afterSale.orderStatusValue }}</p>
+      <p>售后单号：{{ afterSale.sn }} &nbsp;&nbsp;&nbsp;订单号：{{afterSale.orderSn}}</p>
+      <div style="color:#999;" class="operation-time">创建时间：{{afterSale.createTime}}</div>
+      <div class="service-after">
+        <div>
+          本次售后服务由<span>{{afterSale.storeName}}</span>为您提供
+        </div>
+        <div>
+          <img :src="afterSale.goodsImage" alt="" width="60" height="60">
+          <span>{{afterSale.goodsName}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="order-card">
+      <h3>售后进程</h3>
+      <Steps class="progress" :current="logList.length" direction="vertical">
+        <Step
+          :content="'操作人：'+ log.operatorName + '   ' + log.createTime"
+          :title="log.message"
+          v-for="(log, index) in logList"
+          :key="index"
+        ></Step>
+      </Steps>
+    </div>
+    <div class="order-card">
+      <h3 class="mb_10">服务单信息</h3>
+      <table border="1" cellpadding='0' cellspacing="0">
+        <tr>
+          <td>退款方式</td><td>{{afterSale.refundWay == 'ORIGINAL' ? '原路退回' : '账号退款'}}{{afterSale.applyRefundPrice | unitPrice('￥')}}</td>
+        </tr>
+        <tr>
+          <td>商品处理方式</td><td>{{afterSale.serviceType == 'RETURN_MONEY' ? '退款' : '退货'}}</td>
+        </tr>
+        <tr>
+          <td>退款原因</td><td>{{afterSale.reason}}</td>
+        </tr>
+        <tr>
+          <td>问题描述</td><td>{{afterSale.problemDesc}}</td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+<script>
+import { afterSaleDetail, afterSaleReason, afterSaleLog } from '@/api/member.js';
+import { afterSaleStatusList } from '../enumeration.js'
+export default {
+  name: 'aftersale-detail',
+  data () {
+    return {
+      afterSale: {}, // 售后详情数据
+      logList: [], // 日志
+      afterSaleStatusList // 售后状态列表
+
+    };
+  },
+  methods: {
+    getDetail () { // 售后详情
+      afterSaleDetail(this.$route.query.sn).then(res => {
+        if (res.success) {
+          this.afterSale = res.result;
+
+          afterSaleReason(this.afterSale.serviceType).then(res => {
+            res.result.forEach(element => {
+              if (element.id === this.afterSale.reason) {
+                this.$set(this.afterSale, 'reason', element.reason)
+              }
+            });
+          })
+        }
+      })
+    },
+    getLog () {
+      afterSaleLog(this.$route.query.sn).then(res => {
+        this.logList = res.result;
+      })
+    },
+    filterOrderStatus (status) { // 获取订单状态中文
+      const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
+      return ob[0].name
+    }
+  },
+  mounted () {
+    this.getDetail();
+    this.getLog()
+  }
+};
+</script>
+<style lang="scss" scoped>
+.order-card {
+  padding: 10px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #e8eaec;
+  position: relative;
+  .global_color {
+    color: $theme_color;
+  }
+  p {
+    color: #999;
+    margin: 3px;
+  }
+  h3 {
+    font-weight: normal;
+    font-size: 16px;
+  }
+  .operation-time {
+    position: absolute;
+    right: 20px;
+    top: 10px;
+  }
+  &:last-child{
+    border: none;
+  }
+}
+.service-after {
+  border: 1px solid #eee;
+  display: flex;
+  height: 80px;
+  padding: 10px;
+  >div:nth-child(1) {
+    width: 400px;
+    font-size: 15px;
+    font-weight: bold;
+    text-align: center;
+    line-height: 60px;
+    span{color: $theme_color;}
+    border-right: 1px solid #eee;
+  }
+  >div:nth-child(2){
+    padding-left: 15px;
+    img{vertical-align: top;}
+    span{color: #999;}
+  }
+}
+/** 售后进度条 */
+.progress {
+  margin: 15px 0;
+}
+table{
+  border-color: #eee;
+  width: 100%;
+  color: #999;
+  tr{
+    td:nth-child(1){
+      width: 200px;
+    }
+  }
+  td{
+    padding: 5px;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
new file mode 100644
index 00000000..1a37f1ab
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
@@ -0,0 +1,273 @@
+<template>
+  <div class="apply-after-sale">
+    <card _Title="申请售后"></card>
+    <Table
+      border
+      :columns="columns"
+      :data="goodsData"
+    >
+    <template slot-scope="{ row }" slot="goodsName">
+      <div style="padding:5px;display:flex;">
+        <img :src="row.image" style="vertical-align: top;" width="60" alt=""> <span class="ml_10">{{row.goodsName}}</span>
+      </div>
+    </template>
+    <template slot-scope="{ row }" slot="goodsPrice">
+      <div>{{row.goodsPrice | unitPrice('￥')}}</div>
+    </template>
+    </Table>
+    <div>
+      <Form :model="form" ref="form" :rules="rules" :label-width="80">
+        <FormItem label="售后类别">
+          <RadioGroup v-model="form.serviceType" @on-change="changeReason">
+            <Radio label="RETURN_GOODS">退货</Radio>
+            <Radio label="RETURN_MONEY">退款</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="提交数量" prop="num">
+          <Input type="number" v-model="form.num" style="width:260px" />
+        </FormItem>
+        <FormItem label="提交原因" prop="reason">
+          <Select v-model="form.reason" style="width:260px">
+            <Option v-for="item in reasonList" :value="item.id" :key="item.id">{{ item.reason }}</Option>
+          </Select>
+        </FormItem>
+        <FormItem label="问题描述" prop="problemDesc">
+          <Input type="textarea" :rows="4" maxlength="500" style="width:260px" show-word-limit v-model="form.problemDesc" />
+        </FormItem>
+        <FormItem label="图片信息">
+          <div style="display:flex;align-items:center;">
+            <div class="demo-upload-list" v-for="(img, index) in uploadList" :key="index">
+              <img :src="img">
+              <div class="demo-upload-list-cover">
+                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+                  <Icon type="ios-trash-outline" @click.native="handleRemove(index)"></Icon>
+              </div>
+            </div>
+            <Upload
+                :show-upload-list="false"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                :format="['jpg','jpeg','png']"
+                :action="action"
+                :headers="accessToken"
+                style="display: inline-block;width:58px;">
+                <div class="hover-pointer icon-upload" style="">
+                  <Icon type="md-add" size="20"></Icon>
+                </div>
+            </Upload>
+          </div>
+        </FormItem>
+        <FormItem label="退款方式">
+          <div>{{info.refundWay == 'ORIGINAL' ? '原路退回' : '账号退款'}}</div>
+        </FormItem>
+        <template v-if="info.accountType === 'BANK_TRANSFER' && info.applyRefundPrice != 0">
+          <FormItem label="开户行" prop="bankDepositName">
+            <Input v-model="form.bankDepositName" type="text" placeholder="请输入银行开户行" style="width:260px" />
+          </FormItem>
+          <FormItem label="开户名" prop="bankAccountName">
+            <Input v-model="form.bankAccountName" type="text" placeholder="请输入银行开户名" style="width:260px" />
+          </FormItem>
+          <FormItem label="银行账号" prop="bankAccountNumber">
+            <Input v-model="form.bankAccountNumber" type="text" placeholder="请输入银行账号" style="width:260px" />
+          </FormItem>
+        </template>
+        <FormItem label="返回方式">
+          <div>快递至第三方卖家</div>
+        </FormItem>
+        <FormItem>
+          <Button type="primary" @click="apply">提交申请</Button>
+        </FormItem>
+      </Form>
+      <Modal title="View Image" v-model="visible">
+        <img :src="previewImage" v-if="visible" style="width: 100%">
+      </Modal>
+    </div>
+  </div>
+</template>
+<script>
+import { afterSaleReason, afterSaleInfo, applyAfterSale } from '@/api/member.js'
+import { commonUrl } from '@/plugins/request.js';
+import storage from '@/plugins/storage';
+import * as RegExp from '@/plugins/RegExp'
+export default {
+  data () {
+    const checkNum = (rule, value, callback) => {
+      if (value === '') {
+        console.log(RegExp);
+        callback(new Error('请填写提交数量'));
+      } else if (value > this.info.num) {
+        callback(new Error('提交数量不能大于购买数量'));
+      } else if (!RegExp.integer.test(value)) {
+        callback(new Error('提交数量必须为正整数'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      columns: [ // 表格表头
+        {title: '商品名称', slot: 'goodsName'},
+        {title: '价格', slot: 'goodsPrice'},
+        {title: '购买数量', key: 'num'}
+      ],
+      goodsData: [], // 商品数据
+      reasonList: [], // 售后原因列表
+      info: {}, // 售后信息
+      form: { // 售后数据
+        serviceType: 'RETURN_GOODS',
+        num: 1
+      },
+      uploadList: [], // 上传列表
+      action: commonUrl + '/common/upload/file', // 上传地址
+      accessToken: {}, // 验证token
+      visible: false, // 图片预览
+      previewImage: '', // 预览图片url
+      rules: { // 验证规则
+        num: [{ validator: checkNum }],
+        reason: [{ required: true, message: '请选择提交原因' }],
+        problemDesc: [{ required: true, message: '请输入问题描述' }],
+        bankAccountNumber: [
+          { required: true, message: '请输入银行卡号' },
+          {
+            type: 'string',
+            pattern: /^([1-9]{1})(\d{14}|\d{18})$/,
+            message: '请输入正确的银行卡号'
+          }
+        ],
+        bankAccountName: [{ required: true, message: '请输入银行开户名' }],
+        bankDepositName: [{ required: true, message: '请输入银行开户行' }]
+      }
+    }
+  },
+  methods: {
+    getInfo () {
+      afterSaleInfo(this.$route.query.sn).then(res => {
+        if (res.success) {
+          this.info = res.result
+          this.goodsData.push(res.result)
+        }
+      })
+    },
+    getReason (type) {
+      afterSaleReason(type).then(res => {
+        if (res.success) this.reasonList = res.result
+      })
+    },
+    changeReason (type) {
+      this.getReason(type)
+    },
+    apply () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let params = Object.assign(this.info, this.form)
+          params.images = this.uploadList.toString()
+          params.orderItemSn = this.$route.query.sn
+          applyAfterSale(params).then(res => {
+            if (res.success) {
+              this.$Message.success('售后申请提交成功，请到售后订单查看！')
+              this.$router.push({name: 'AfterSale'})
+            }
+          })
+        }
+      })
+    },
+    handleView (name) {
+      this.previewImage = name;
+      this.visible = true;
+    },
+    handleRemove (index) {
+      this.uploadList.splice(index, 1)
+      this.$forceUpdate()
+    },
+    handleSuccess (res, file) {
+      this.uploadList.push(res.result)
+      this.$forceUpdate()
+    },
+    handleBeforeUpload () {
+      const check = this.uploadList.length < 6;
+      if (!check) {
+        this.$Notice.warning({
+          title: '最多可以上传5张图片'
+        });
+        return check;
+      }
+    }
+  },
+  mounted () {
+    this.accessToken.accessToken = storage.getItem('accessToken');
+    this.getInfo()
+    this.getReason('RETURN_GOODS')
+  }
+}
+</script>
+<style lang="scss" scoped>
+
+/** 商品信息 */
+.order-price {
+  text-align: right;
+  margin-top: 30px;
+  font-size: 16px;
+  color: #999;
+  > div > span:nth-child(2) {
+    width: 130px;
+    text-align: right;
+    display: inline-block;
+    margin-top: 10px;
+  }
+  .actrual-price {
+    color: $theme_color;
+    font-weight: bold;
+    font-size: 20px;
+  }
+}
+.demo-upload-list{
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  margin-right: 4px;
+  margin-top: 10px;
+}
+.demo-upload-list img{
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover{
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0,0,0,.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover{
+  display: block;
+}
+.demo-upload-list-cover i{
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.icon-upload {
+  width: 58px;
+  height:58px;
+  line-height: 58px;
+  text-align:center;
+  display: inline-block;
+  border:1px dashed #999;
+  border-radius: 4px;
+  margin-top: 10px;
+  &:hover{
+    cursor: pointer;
+    border-color: $theme_color;
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/Complain.vue b/buyer/src/pages/home/orderCenter/Complain.vue
new file mode 100644
index 00000000..851cb6e3
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/Complain.vue
@@ -0,0 +1,235 @@
+
+<template>
+  <div class="add-eval">
+    <div class="title">
+      <card _Title="商品投诉" :_Size="16"></card>
+      <p>
+        <span class="color999">订单号：</span><span>{{$route.query.sn}}</span>
+        <span class="color999 ml_20" v-if="order.order">{{order.order.paymentTime}}</span>
+      </p>
+    </div>
+    <ul class="goods-eval">
+      <li >
+        <div class="goods-con">
+          <img :src="orderGoods.image" 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>
+          <p>{{orderGoods.goodsPrice | unitPrice('￥')}}</p>
+        </div>
+
+        <div class="eval-con">
+          <div>
+            <span class="color999">投诉主题：</span>
+            <Select v-model="form.complainTopic" style="width:260px;margin-bottom:10px">
+              <Option v-for="item in reasonList" :value="item.reason" :key="item.id">{{ item.reason }}</Option>
+            </Select>
+            <Input type="textarea" maxlength="500" show-word-limit :rows="4" placeholder="请输入投诉内容" v-model="form.content" />
+          </div>
+          <div style="display:flex;align-items:center;">
+            <div class="demo-upload-list" v-for="(img, index) in orderGoods.uploadList" :key="index">
+              <img :src="img">
+              <div class="demo-upload-list-cover">
+                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
+                  <Icon type="ios-trash-outline" @click.native="handleRemove(index)"></Icon>
+              </div>
+            </div>
+            <Upload
+                :show-upload-list="false"
+                :on-success="handleSuccess"
+                :before-upload="handleBeforeUpload"
+                :format="['jpg','jpeg','png']"
+                :action="action"
+                :headers="accessToken"
+                style="display: inline-block;width:58px;">
+                <div class="hover-pointer icon-upload" style="">
+                  <Icon type="ios-camera" size="20"></Icon>
+                </div>
+            </Upload>
+            <div class="describe">上传投诉凭证，最多5张</div>
+          </div>
+        </div>
+      </li>
+    </ul>
+    <Button type="primary" class="mt_10" :loading="loading" @click="save">提交</Button>
+    <Modal title="View Image" v-model="visible">
+        <img :src="previewImage" v-if="visible" style="width: 100%">
+    </Modal>
+  </div>
+</template>
+<script>
+import { orderDetail } from '@/api/order.js';
+import { afterSaleReason, handleComplain } from '@/api/member.js';
+import { commonUrl } from '@/plugins/request.js';
+import storage from '@/plugins/storage';
+export default {
+  data () {
+    return {
+      order: {}, // 订单详情
+      orderGoods: {}, // 订单商品
+      form: { // 投诉表单
+        complainTopic: '',
+        content: ''
+      }, // 表单
+      visible: false, // 图片预览
+      action: commonUrl + '/common/upload/file', // 上传地址
+      accessToken: {}, // 验证token
+      previewImage: '', // 图片地址
+      loading: false, // 加载状态
+      reasonList: [] // 投诉原因
+    }
+  },
+  methods: {
+    getOrderDetail () {
+      orderDetail(this.$route.query.sn).then(res => {
+        this.order = res.result
+        this.orderGoods = res.result.orderItems[this.$route.query.index]
+        this.orderGoods.uploadList = []
+      })
+      afterSaleReason('COMPLAIN').then(res => {
+        if (res.success) {
+          this.reasonList = res.result
+          this.$set(this.form, 'complainTopic', res.result[0].reason)
+          this.$forceUpdate()
+        }
+      })
+    },
+    save () {
+      let params = {
+        goodsId: this.orderGoods.goodsId,
+        complainTopic: this.form.complainTopic,
+        content: this.form.content,
+        images: this.orderGoods.uploadList.toString(),
+        orderSn: this.$route.query.sn,
+        skuId: this.orderGoods.skuId
+      }
+      handleComplain(params).then(res => {
+        if (res.success) {
+          this.$Message.success('投诉申请已提交，感谢您的反馈')
+          this.$router.push({name: 'ComplainList'})
+        }
+      })
+    },
+    goGoodsDetail (skuId, goodsId) {
+      let routerUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: {skuId, goodsId}
+      })
+      window.open(routerUrl.href, '_blank')
+    },
+    handleView (name) {
+      this.previewImage = name;
+      this.visible = true;
+    },
+    handleRemove (index) {
+      this.orderGoods.uploadList.splice(index, 1)
+      this.$forceUpdate()
+    },
+    handleSuccess (res, file) {
+      this.orderGoods.uploadList.push(res.result)
+      this.$forceUpdate()
+    },
+    handleBeforeUpload () {
+      const check = this.orderGoods.uploadList.length < 6;
+      if (!check) {
+        this.$Notice.warning({
+          title: '最多可以上传五张图片'
+        });
+        return check;
+      }
+    }
+  },
+  mounted () {
+    this.accessToken.accessToken = storage.getItem('accessToken');
+    this.getOrderDetail()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.delivery-rate {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  height: 50px;
+  border-bottom: 1px solid #eee;
+  >div:nth-child(1) {
+    width: 30%;
+    font-weight: bold;
+  }
+}
+.goods-eval li{
+  display: flex;
+  border-bottom: 1px solid #eee;
+
+  .goods-con {
+    width: 30%;
+    padding: 20px;
+    text-align: center;
+    p {
+      word-wrap: wrap;
+      &:hover{ color: $theme_color; }
+    }
+  }
+  .eval-con {
+    width: 70%;
+    padding: 20px;
+  }
+}
+
+.demo-upload-list{
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  margin-right: 4px;
+  margin-top: 10px;
+}
+.demo-upload-list img{
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover{
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0,0,0,.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover{
+  display: block;
+}
+.demo-upload-list-cover i{
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.icon-upload {
+  width: 58px;
+  height:58px;
+  line-height: 58px;
+  text-align:center;
+  display: inline-block;
+  border:1px dashed #999;
+  border-radius: 4px;
+  margin-top: 10px;
+  &:hover{
+    cursor: pointer;
+    border-color: $theme_color;
+  }
+}
+.describe{
+  font-size: 12px;
+  color: #999;
+  position:relative;
+  top: 46px;
+  left: -60px;
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/MyAddress.vue b/buyer/src/pages/home/orderCenter/MyAddress.vue
new file mode 100644
index 00000000..aacc0c8a
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/MyAddress.vue
@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <card _Title="收货地址" _More="添加新地址" _Src="/home/addAddress"></card>
+    <div class="address-box" v-for="(item, index) in list" :key="index">
+      <div class="address-header">
+        <span
+          >{{ item.name }}
+          <Tag class="ml_10" v-if="item.isDefault" color="red">默认地址</Tag>
+          <Tag class="ml_10" v-if="item.alias" color="warning">{{
+            item.alias
+          }}</Tag>
+        </span>
+        <div class="address-action">
+          <span @click="edit(item.id)"><Icon type="edit"></Icon>修改</span>
+          <span @click="del(item.id)"><Icon type="trash-a"></Icon>删除</span>
+        </div>
+      </div>
+      <div class="address-content">
+        <p>
+          <span class="address-content-title"> 收 货 人 :</span> {{ item.name }}
+        </p>
+        <p>
+          <span class="address-content-title">收货地区:</span
+          >{{ item.consigneeAddressPath | unitAddress }}
+        </p>
+        <p>
+          <span class="address-content-title">详细地址:</span> {{ item.detail }}
+        </p>
+        <p>
+          <span class="address-content-title">手机号码:</span> {{ item.mobile }}
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import card from '@/components/card';
+import { memberAddress, delMemberAddress } from '@/api/address.js';
+
+export default {
+  name: 'MyAddress',
+
+  data () {
+    return {
+      list: [] // 地址列表
+    };
+  },
+  methods: {
+    edit (id) {
+      // 编辑地址
+      this.$router.push({ path: '/home/addAddress', query: { id: id } });
+    },
+    del (id) {
+      // 删除地址
+      this.$Modal.confirm({
+        title: '提示',
+        content: '你确定删除这个收货地址',
+        onOk: () => {
+          delMemberAddress(id).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success('删除成功');
+              this.getAddrList();
+            }
+          });
+        },
+        onCancel: () => {
+          this.$Message.info('取消删除');
+        }
+      });
+    },
+    getAddrList () {
+      // 获取地址列表
+      memberAddress().then((res) => {
+        console.log(res);
+        if (res.code === 200) {
+          this.list = res.result.records;
+        }
+      });
+    }
+  },
+  mounted () {
+    this.getAddrList();
+  },
+  components: {
+    card
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.address-box {
+  padding: 15px;
+  margin: 15px;
+
+  border-bottom: 1px solid $border_color;
+}
+
+.address-header {
+  cursor: pointer;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+  @include title_color($light_title_color);
+  font-size: 18px;
+}
+
+.address-content {
+  cursor: pointer;
+  font-size: 14px;
+
+  > p {
+    padding: 12px 0;
+  }
+}
+
+.address-content-title {
+  @include sub_color($light_sub_color);
+}
+
+.address-action span {
+  margin-left: 15px;
+  font-size: 14px;
+  color: $theme_color;
+  cursor: pointer;
+}
+
+#map-container {
+  width: 500px;
+  height: 300px;
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
new file mode 100644
index 00000000..79f6039b
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -0,0 +1,394 @@
+<template>
+  <div class="wrapper">
+    <!-- 卡片组件 -->
+    <card _Title="我的订单" :_Size="16" :_Tabs="changeWay" @_Change="change" v-if="!homePage"></card>
+    <card _Title="我的订单" :_Size="16" :_Tabs="changeWay" @_Change="change" _More="全部订单" _Src="/home/MyOrder" v-else></card>
+    <!-- 搜索 筛选 -->
+    <div class="mb_20 box" v-if="!homePage">
+      <div class="global_float_right" >
+        <Input
+          class="width_300"
+          search
+          enter-button
+          v-model="params.keywords"
+          @on-search="getList"
+          placeholder="请输入订单号搜索"
+        />
+      </div>
+    </div>
+    <!-- 订单列表 -->
+    <empty v-if="orderList.length === 0" />
+    <div class="order-content" v-else>
+      <div
+        class="order-list"
+        v-for="(order, onderIndex) in orderList"
+        :key="onderIndex"
+      >
+        <div class="order-header">
+          <div>
+            <div>{{ filterOrderStatus(order.orderStatus) }}</div>
+            <div>
+              订单号：{{ order.sn }} &nbsp; &nbsp; &nbsp;{{order.createTime}}
+              &nbsp; &nbsp;{{ order.memberName | secrecyMobile }}
+            </div>
+          </div>
+          <div>
+            <Button @click="delOrder(order.sn)" class="del-btn mr_10 fontsize_16" style="margin-top:-5px;" type="text" icon="ios-trash-outline" size="small"></Button>
+            <span>{{ order.flowPrice | unitPrice("￥") }}</span>
+          </div>
+        </div>
+        <div class="order-body">
+          <div class="goods-list">
+            <div
+              v-for="(goods, goodsIndex) in order.orderItems"
+              :key="goodsIndex"
+            >
+              <img
+                @click="goodsDetail(goods.skuId, goods.goodsId)"
+                class="hover-color"
+                :src="goods.image"
+                alt=""
+              />
+              <div>
+                <div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
+                <div class="mt_10">
+                  <span class="global_color"
+                    >{{ goods.goodsPrice | unitPrice("￥") }} </span
+                  >x {{ goods.num }}
+                </div>
+                <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" style="position:relative;top:-22px;left:100px">评价</Button>
+                <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" size="small" style="position:relative;top:-22px;left:110px">投诉</Button>
+              </div>
+            </div>
+          </div>
+
+          <div>
+            <span @click="shopPage(order.storeId)">{{ order.storeName }}</span
+            >&nbsp;<Icon custom="iconfont icon-kefu" />
+          </div>
+          <div>
+            <!-- 订单基础操作 -->
+            <Button @click="orderDetail(order.sn)" size="small">订单详情</Button>
+            <Button @click="handleCancelOrder(order.sn)" v-if="order.allowOperationVO.cancel" size="small">取消订单</Button>
+            <Button @click="goPay(order.sn)" size="small" v-if="order.allowOperationVO.pay">去支付</Button>
+            <Button @click="received(order.sn)" size="small" v-if="order.allowOperationVO.rog">确认收货</Button>
+            <!-- 售后 -->
+            <Button v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
+          </div>
+        </div>
+      </div>
+      <Spin size="large" fix v-if="spinShow"></Spin>
+    </div>
+    <!-- 分页 -->
+    <div class="page-size" v-if="paging">
+      <Page :total="total" @on-change="changePageNum"
+        @on-page-size-change="changePageSize"
+        :page-size="params.pageSize"
+        show-sizer>
+      </Page>
+    </div>
+    <!-- 选择售后商品 -->
+    <Modal v-model="afterSaleModal" title="请选择申请售后的商品">
+        <div>
+            <Table
+              border
+              :columns="afterSaleColumns"
+              :data="afterSaleArr"
+              @on-row-click="afterSaleSelect"
+            >
+            </Table>
+        </div>
+        <div slot="footer"></div>
+    </Modal>
+    <Modal v-model="cancelAvail" title="请选择取消订单原因" @on-ok="sureCancel" @on-cancel="cancelAvail = false">
+      <RadioGroup v-model="cancelParams.reason" vertical>
+        <Radio :label="item.reason" v-for="item in cancelReason" :key="item.id">
+           {{item.reason}}
+        </Radio>
+      </RadioGroup>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { getOrderList, sureReceived, cancelOrder, delOrder } from '@/api/order';
+import { afterSaleReason } from '@/api/member';
+import { orderStatusList } from '../enumeration.js'
+export default {
+  name: 'MyOrder',
+  props: {
+    paging: {
+      type: Boolean,
+      default: true
+    },
+    homePage: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      orderList: [], // 订单列表
+      params: { // 请求参数
+        pageNumber: 1,
+        pageSize: 10,
+        // orderStatus: 'ALL',
+        keywords: '',
+        tag: 'ALL'
+      },
+      cancelParams: { // 取消售后参数
+        orderSn: '',
+        reason: ''
+      },
+      // 状态数组
+      orderStatusList,
+      changeWay: ['全部订单', '待付款', '待收货', '已完成'], // 订单状态
+      total: 0, // 数据总数
+      spinShow: false, // 加载状态
+      afterSaleModal: false, // 选择售后商品模态框
+      afterSaleColumns: [ // 售后商品表头
+        {title: '商品名称', key: 'name'},
+        {title: '价格', key: 'goodsPrice'}
+      ],
+      afterSaleArr: [], // 售后商品列表
+      cancelAvail: false, // 取消订单modal控制
+      cancelReason: [] // 取消订单原因
+    };
+  },
+  mounted () {
+    if (this.homePage) this.params.pageSize = 5;
+    this.getList();
+  },
+  methods: {
+    goodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    change (index) {
+      switch (index) {
+        case 0:
+          this.params.tag = 'ALL'
+          break;
+        case 1:
+          this.params.tag = 'WAIT_PAY'
+          break;
+        case 2:
+          this.params.tag = 'WAIT_ROG'
+          break;
+        case 3:
+          this.params.tag = 'COMPLETE'
+          break;
+      }
+      this.getList()
+    },
+    // 跳转店铺首页
+    shopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: { id: id }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    orderDetail (sn) {
+      // 跳转订单详情
+      this.$router.push({ name: 'OrderDetail', query: {sn} });
+    },
+    received (sn) { // 确认收货
+      sureReceived(sn).then(res => {
+        if (res.success) {
+          this.$Message.success('确认收货成功')
+          this.getList()
+        }
+      })
+    },
+    goPay (sn) { // 去支付
+      this.$router.push({path: '/payment', query: {orderType: 'ORDER', sn}});
+    },
+    applyAfterSale (goodsItem) { // 申请售后
+      let arr = []
+      goodsItem.forEach(e => {
+        if (e.afterSaleStatus === 'NOT_APPLIED') {
+          arr.push(e)
+        }
+      });
+      if (arr.length === 1) {
+        this.$router.push({name: 'ApplyAfterSale', query: {sn: arr[0].sn}})
+      } else {
+        this.afterSaleArr = arr;
+        this.afterSaleModal = true
+      }
+    },
+    afterSaleSelect (item) {
+      this.$router.push({name: 'ApplyAfterSale', query: {sn: item.sn}})
+    },
+    viewComment (sn) { // 查看评价
+
+    },
+    comment (sn, goodsIndex) { // 评价
+      this.$router.push({path: '/home/addEval', query: {sn, index: goodsIndex}})
+    },
+    addComment (sn) { // 追加评价
+
+    },
+    complain (sn, goodsIndex) { // 投诉
+      this.$router.push({name: 'Complain', query: {sn, index: goodsIndex}})
+    },
+    complainResult (sn) { // 投诉结果
+
+    },
+    delOrder (sn) {
+      this.$Modal.confirm({
+        title: '删除订单',
+        content: '<p>确认删除当前订单吗？</p>',
+        onOk: () => {
+          delOrder(sn).then(res => {
+            if (res.success) {
+              this.$Message.success('删除成功');
+              this.getList()
+            }
+          })
+        },
+        onCancel: () => {}
+      });
+    },
+    getList () {
+      this.spinShow = true;
+      let params = JSON.parse(JSON.stringify(this.params))
+      if (params.orderStatus === 'ALL') {
+        delete params.orderStatus
+      }
+      getOrderList(params).then(res => {
+        this.spinShow = false
+        if (res.success) {
+          this.orderList = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    changePageNum (val) {
+      this.params.pageNumber = val;
+      this.getList()
+    },
+    changePageSize (val) {
+      this.pageNumber = 1;
+      this.params.pageSize = val;
+      this.getList()
+    },
+    handleCancelOrder (sn) {
+      // 取消订单
+      this.cancelParams.orderSn = sn;
+      afterSaleReason('CANCEL').then(res => {
+        if (res.success) {
+          this.cancelReason = res.result;
+          this.cancelAvail = true
+          this.cancelParams.reason = this.cancelReason[0].reason
+        }
+      })
+    },
+    sureCancel () {
+      cancelOrder(this.cancelParams).then(res => {
+        if (res.success) {
+          this.$Message.success('取消订单成功')
+          this.getList()
+          this.cancelAvail = false
+        }
+      })
+    },
+    filterOrderStatus (status) { // 获取订单状态中文
+      const ob = this.orderStatusList.filter(e => { return e.status === status });
+      return ob[0].name
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.wrapper {
+  margin-bottom: 40px;
+}
+.box {
+  overflow: hidden;
+}
+.page-size {
+  margin: 15px 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+/** 订单列表 */
+.order-list {
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  margin-bottom: 10px;
+
+  &:hover{
+    .del-btn{visibility: visible;}
+  }
+  .del-btn{
+    visibility: hidden;
+  }
+
+  .order-header {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    justify-content: space-between;
+    border-bottom: 1px solid #ddd;
+    > div:nth-child(1) > div:nth-child(2) {
+      font-size: 12px;
+      color: #999;
+      margin-top: 3px;
+    }
+  }
+  .order-body {
+    display: flex;
+    justify-content: space-between;
+    color: #999;
+    padding: 10px;
+
+    .goods-list > div {
+      width: 500px;
+      display: flex;
+      margin-bottom: 10px;
+      img {
+        width: 60px;
+        height: 60px;
+        margin-right: 10px;
+      }
+      > div {
+        flex: 1;
+      }
+    }
+
+    > div:nth-child(2) {
+      width: 150px;
+      text-align: center;
+      span {
+        color: #438cde;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+      .ivu-icon {
+        color: #ff8f23;
+        cursor: pointer;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+
+    > div:nth-child(3) {
+      width: 100px;
+      .ivu-btn {
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
new file mode 100644
index 00000000..4af54b8e
--- /dev/null
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -0,0 +1,242 @@
+<template>
+  <div class="order-detail" v-if="order.order">
+    <card _Title="订单详情" :_Size="16"></card>
+    <div class="order-card">
+      <p class="global_color fontsize_18">{{ order.orderStatusValue }}</p>
+      <p class="global_color">订单号：{{ order.order.sn }}</p>
+      <div style="color:#999;" class="operation-time">操作时间：{{order.order.updateTime}}</div>
+      <Steps class="progress" :current="progressList.length" direction="vertical">
+        <Step
+          :title="progress.message"
+          :content="progress.createTime"
+          v-for="(progress, index) in progressList"
+          :key="index"
+        ></Step>
+      </Steps>
+    </div>
+    <div class="order-card">
+      <h3>收货人信息</h3>
+      <p>收货人：{{order.order.consigneeName}}</p>
+      <p>手机号码：{{order.order.consigneeMobile | secrecyMobile}}</p>
+      <p>收货地址：{{order.order.consigneeAddressPath | unitAddress}} {{order.order.consigneeDetail}}</p>
+    </div>
+    <div class="order-card">
+      <h3>付款信息</h3>
+      <p>支付方式：在线支付</p>
+      <p>付款状态：未付款</p>
+    </div>
+    <div class="order-card">
+      <h3>配送信息</h3>
+      <p>配送方式：{{order.deliveryMethodValue}}</p>
+      <p>配送状态：{{order.deliverStatusValue}}</p>
+    </div>
+    <div class="order-card" v-if="order.order.receipt">
+      <h3>发票信息</h3>
+      <p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
+      <p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
+      <p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
+    </div>
+    <!-- 订单商品 -->
+    <div class="goods">
+      <div class="shop-name">
+        <span @click="shopPage(order.order.storeId)">{{ order.order.storeName }}</span> &nbsp; <Icon custom="iconfont icon-kefu" />
+      </div>
+      <table>
+        <thead>
+          <tr>
+            <th width="50%">商品</th>
+            <!-- <th width="20%">属性</th> -->
+            <th width="20%">货号</th>
+            <!-- <th width="10%">发货仓库</th> -->
+            <th width="10%">单价</th>
+            <th width="10%">数量</th>
+            <th width="10%">小计</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(goods, goodsIndex) in order.orderItems" :key="goodsIndex">
+            <td>
+              <img @click="goodsDetail(goods.id, goods.goodsId)" :src="goods.image" alt="" />
+              <div>
+                <p @click="goodsDetail(goods.id, goods.goodsId)" class="hover-color">
+                  {{ goods.goodsName }}
+                </p>
+              </div>
+            </td>
+            <td>{{ goods.id }}</td>
+            <td>{{ goods.goodsPrice | unitPrice }}</td>
+            <td>{{ goods.num }}</td>
+            <td>{{ (goods.goodsPrice * goods.num) | unitPrice }}</td>
+          </tr>
+        </tbody>
+      </table>
+      <!-- 订单价格 -->
+      <div class="order-price">
+        <div>
+          <span>商品件数：</span><span>{{ order.order.goodsNum }}件</span>
+        </div>
+        <div>
+          <span>商品总价：</span><span>{{ order.order.goodsPrice | unitPrice("￥") }}</span><br>
+        </div>
+        <div>
+          <span>运费：</span><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span><br>
+        </div>
+        <div><span>优惠金额：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
+        <div>
+          <span>应付金额：</span
+          ><span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import card from '@/components/card';
+import { orderDetail, getTraces } from '@/api/order.js';
+export default {
+  components: { card },
+  name: 'order-detail',
+  data () {
+    return {
+      order: {}, // 订单详情数据
+      progressList: [], // 订单流程
+      logistics: [] // 物流数据
+    };
+  },
+  methods: {
+    goodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 跳转店铺首页
+    shopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: { id: id }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    getDetail () { // 订单详情
+      orderDetail(this.$route.query.sn).then(res => {
+        if (res.success) {
+          this.order = res.result;
+          this.progressList = res.result.orderLogs
+        }
+      })
+    },
+    traces () {
+      getTraces(this.$route.query.sn).then(res => {
+        if (res.success) {
+          this.logistics = res.result
+        }
+      })
+    }
+  },
+  mounted () {
+    this.getDetail()
+    this.traces()
+  }
+};
+</script>
+<style lang="scss" scoped>
+.order-card {
+  padding: 10px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #e8eaec;
+  position: relative;
+  .global_color {
+    color: $theme_color;
+  }
+  p {
+    color: #999;
+    margin: 3px;
+  }
+  h3 {
+    font-weight: normal;
+    font-size: 16px;
+  }
+  .operation-time {
+    position: absolute;
+    right: 20px;
+    top: 10px;
+  }
+}
+/** 店铺名称 */
+.shop-name {
+  margin: 15px 0;
+  span {
+    color: #438cde;
+    cursor: pointer;
+    &:hover {
+      color: $theme_color;
+    }
+  }
+  .ivu-icon {
+    color: #ff8f23;
+    cursor: pointer;
+    &:hover {
+      color: $theme_color;
+    }
+  }
+}
+/** 商品列表 */
+table {
+  border: 1px solid #ddd;
+  color: #999;
+  border-collapse: collapse;
+  width: 100%;
+  tr {
+    border-top: 1px solid #ddd;
+  }
+  thead > tr {
+    height: 40px;
+    background: #eee;
+  }
+  td {
+    padding: 5px;
+    text-align: center;
+    &:first-child {
+      text-align: left;
+      display: flex;
+      img {
+        width: 70px;
+        height: 70px;
+        margin-right: 10px;
+        margin-left: 10px;
+        cursor: pointer;
+      }
+    }
+    &:last-child {
+      color: $theme_color;
+    }
+  }
+}
+/** 订单价格 */
+.order-price {
+  text-align: right;
+  margin-top: 30px;
+  font-size: 16px;
+  color: #999;
+  > div > span:nth-child(2) {
+    width: 130px;
+    text-align: right;
+    display: inline-block;
+    margin-top: 10px;
+  }
+  .actrual-price {
+    color: $theme_color;
+    font-weight: bold;
+    font-size: 20px;
+  }
+}
+
+/** 订单进度条 */
+.progress {
+  margin: 15px 0;
+}
+</style>
diff --git a/buyer/src/pages/home/userCenter/Coupons.vue b/buyer/src/pages/home/userCenter/Coupons.vue
new file mode 100644
index 00000000..ea14a3c9
--- /dev/null
+++ b/buyer/src/pages/home/userCenter/Coupons.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="wrapper">
+    <card _Title="优惠券列表"  />
+    <Coupon/>
+  </div>
+</template>
+
+<script>
+import Coupon from '@/components/coupon/Coupon.vue'
+export default {
+  name: 'Coupons',
+  data () {
+    return {
+      couponsList: [ // 优惠券状态
+        '未使用',
+        '已使用',
+        '已过期',
+        '即将到期'
+      ]
+    }
+  },
+  components: {Coupon},
+  mounted () {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue
new file mode 100644
index 00000000..d9e8a317
--- /dev/null
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -0,0 +1,451 @@
+<template>
+  <div class="wrapper">
+    <card _Title="资金管理" />
+
+    <div class="box">
+      <div class="mb_20 account-price">
+        <span class="subTips">账户余额：</span>
+        <span class="global_color mr_10" style="font-size:26px">￥{{ memberDeposit | unitPrice }}</span>
+        <span class="subTips">冻结金额：</span>
+        <span class="">￥{{ frozenDeposit | unitPrice}}</span>
+      </div>
+      <div class="account-btns">
+        <Button type="primary" @click="recharge">在线充值</Button>
+        <Button @click="withdrawalApply">申请提现</Button>
+      </div>
+    </div>
+    <Modal v-model="modal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>充值金额</span>
+      </p>
+      <div>
+        <Form
+          ref="formData"
+          :model="formData"
+          label-position="left"
+          :label-width="100"
+          :rules="formValidate"
+        >
+          <FormItem label="充值金额" prop="price">
+            <Input v-model="formData.price" size="large" number maxlength="9"
+              ><span slot="append">元</span></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button type="success" size="large" @click="rechargePrice">充值</Button>
+      </div>
+    </Modal>
+    <!-- 提现申请 -->
+    <Modal v-model="withdrawApplyModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>提现金额</span>
+      </p>
+      <div>
+        <Form
+          ref="withdrawApplyFormData"
+          :model="withdrawApplyFormData"
+          label-position="left"
+          :label-width="100"
+          :rules="withdrawApplyFormValidate"
+        >
+          <FormItem label="提现金额" prop="price">
+            <Input
+              v-model="withdrawApplyFormData.price"
+              size="large"
+              number
+              maxlength="9"
+              ><span slot="append">元</span></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button type="success" size="large" @click="withdrawal">提现</Button>
+      </div>
+    </Modal>
+    <!-- 余额日志 -->
+    <Tabs value="log" @on-click="tabPaneChange">
+      <TabPane label="余额日志" name="log">
+        <Table :columns="logColumns" :data="logColumnsData.records"></Table>
+        <!-- 分页 -->
+        <div class="page-size">
+          <Page
+            :current="searchForm.pageNumber"
+            :total="logColumnsData.total"
+            :page-size="searchForm.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+          ></Page>
+        </div>
+      </TabPane>
+      <!-- 充值记录 -->
+      <TabPane label="充值记录" name="recharge">
+        <Table
+          :columns="rechargeListColumns"
+          :data="rechargeListData.records"
+        ></Table>
+        <!-- 分页 -->
+        <div class="page-size">
+          <Page
+            :current="rechargeSearchForm.pageNumber"
+            :total="rechargeListData.total"
+            :page-size="rechargeSearchForm.pageSize"
+            @on-change="rechargeChangePage"
+            @on-page-size-change="rechargeChangePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+          ></Page>
+        </div>
+      </TabPane>
+
+      <TabPane label="提现记录" name="withdrawApply">
+        <Table
+          :columns="withdrawApplyColumns"
+          :data="withdrawApplyColumnsListData.records"
+        ></Table>
+        <!-- 分页 -->
+        <div class="page-size">
+          <Page
+            :current="withdrawApplySearchForm.pageNumber"
+            :total="withdrawApplyColumnsListData.total"
+            :page-size="withdrawApplySearchForm.pageSize"
+            @on-change="withdrawChangePage"
+            @on-page-size-change="withdrawChangePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+          ></Page>
+        </div>
+      </TabPane>
+    </Tabs>
+  </div>
+</template>
+
+<script>
+import card from '@/components/card';
+import {
+  getMembersWallet,
+  getDepositLog,
+  getRecharge,
+  getWithdrawApply,
+  recharge,
+  withdrawalApply
+} from '@/api/member';
+export default {
+  name: 'MoneyManagement',
+  data () {
+    return {
+      frozenDeposit: 0, // 冻结余额
+      memberDeposit: 0, // 余额
+
+      modal: false, // 余额充值
+      withdrawApplyModal: false, // 提现申请
+      formData: {
+        // 充值金额
+        price: 1
+      },
+      // 提现金额
+      withdrawApplyFormData: {
+        price: 1
+      },
+      // 余额日志
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1,
+        pageSize: 10
+      },
+      // 充值记录
+      rechargeSearchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10 // 页面大小
+      },
+      // 提现记录
+      withdrawApplySearchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10 // 页面大小
+      },
+      // 提现申请校验
+      withdrawApplyFormValidate: {
+        price: [
+          { required: true, message: '请输入大于0小于9999的合法提现金额' },
+          {
+            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
+            message: '请输入大于0小于9999的合法提现金额',
+            trigger: 'change'
+          }
+        ]
+      },
+      formValidate: {
+        price: [
+          { required: true, message: '请输入大于0小于9999的合法充值金额' },
+          {
+            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
+            message: '请输入大于0小于9999的合法充值金额',
+            trigger: 'change'
+          }
+        ]
+      },
+      // 余额日志
+      logColumns: [
+        {
+          title: '时间',
+          key: 'createTime'
+        },
+        {
+          title: '金额',
+          key: 'money',
+          render: (h, params) => {
+            if (params.row.money > 0) {
+              return h('div', [
+                h(
+                  'span',
+                  {
+                    style: {
+                      color: 'green'
+                    }
+                  },
+                  params.row.money
+                )
+              ]);
+            } else if (params.row.money < 0) {
+              return h('div', [
+                h(
+                  'span',
+                  {
+                    style: {
+                      color: 'red'
+                    }
+                  },
+                  params.row.money
+                )
+              ]);
+            }
+          }
+        },
+        {
+          title: '变动日志',
+          key: 'detail'
+        }
+      ],
+      logColumnsData: {}, // 余额日志
+      // 充值记录
+      rechargeListColumns: [
+        {
+          title: '支付单号',
+          key: 'rechargeSn',
+          width: 200
+        },
+        {
+          title: '支付方式',
+          key: 'rechargeWay'
+        },
+        {
+          title: '充值金额',
+          key: 'rechargeMoney'
+        },
+        {
+          title: '支付状态',
+          key: 'payStatus',
+          render: (h, params) => {
+            if (params.row.payStatus === 'PAID') {
+              return h('div', [h('span', {}, '已付款')]);
+            } else if (params.row.payStatus === 'UNPAID') {
+              return h('div', [h('span', {}, '未付款')]);
+            }
+          }
+        },
+        {
+          title: '支付时间',
+          key: 'payTime'
+        }
+      ],
+      rechargeListData: {}, // 充值记录数据
+      // 提现记录
+      withdrawApplyColumns: [
+        {
+          title: '提现单号',
+          key: 'sn',
+          width: 215
+        },
+        {
+          title: '提现金额',
+          key: 'applyMoney',
+          width: 120
+        },
+        {
+          title: '提现状态',
+          key: 'applyStatus',
+          render: (h, params) => {
+            if (params.row.applyStatus === 'APPLY') {
+              return h('div', [h('span', {}, '申请中')]);
+            } else if (params.row.applyStatus === 'VIA_AUDITING') {
+              return h('div', [h('span', {}, '提现成功')]);
+            } else {
+              return h('div', [h('span', {}, '审核未通过')]);
+            }
+          }
+        },
+        {
+          title: '提现时间',
+          key: 'inspectTime'
+        },
+        {
+          title: '审核备注',
+          key: 'inspectRemark'
+        }
+      ],
+      withdrawApplyColumnsListData: {} // 提现记录
+    };
+  },
+  components: { card },
+  mounted () {
+    this.init();
+  },
+  methods: {
+    init () {
+      getMembersWallet().then((res) => {
+        this.frozenDeposit = res.result.memberFrozenWallet;
+        this.memberDeposit = res.result.memberWallet;
+      });
+      getDepositLog(this.searchForm).then((res) => {
+        if (res.message === 'success') {
+          this.logColumnsData = res.result;
+        }
+      });
+    },
+    tabPaneChange (v) {
+      // 如果查询充值记录
+      if (v === 'recharge') {
+        this.getRechargeData();
+      }
+      // 如果是余额日志
+      if (v === 'log') {
+        this.init();
+      }
+      // 如果是提现记录
+      if (v === 'withdrawApply') {
+        this.getWithdrawApplyData();
+      }
+    },
+    // 充值记录
+    getRechargeData () {
+      getRecharge(this.rechargeSearchForm).then((res) => {
+        if (res.message === 'success') {
+          this.rechargeListData = res.result;
+        }
+      });
+    },
+    // 提现记录
+    getWithdrawApplyData () {
+      getWithdrawApply(this.withdrawApplySearchForm).then((res) => {
+        if (res.message === 'success') {
+          this.withdrawApplyColumnsListData = res.result;
+        }
+      });
+    },
+    // 余额日志
+    changePage (v) {
+      this.searchForm.pageNumber = v;
+      this.init();
+    },
+    changePageSize (v) {
+      this.searchForm.pageSize = v;
+      this.init();
+    },
+    // 充值记录
+    rechargeChangePage (v) {
+      this.rechargeSearchForm.pageNumber = v;
+      this.getRechargeData();
+    },
+    rechargeChangePageSize (v) {
+      this.rechargeSearchForm.pageSize = v;
+      this.getRechargeData();
+    },
+    // 提现记录
+    withdrawChangePage (v) {
+      this.withdrawApplySearchForm.pageNumber = v;
+      this.getWithdrawApplyData();
+    },
+    withdrawChangePageSize (v) {
+      this.withdrawApplySearchForm.pageSize = v;
+      this.getWithdrawApplyData();
+    },
+    // 弹出在线充值框
+    recharge () {
+      this.formData.price = 1;
+      this.modal = true;
+    },
+    // 在线充值
+    rechargePrice () {
+      this.$refs['formData'].validate((valid) => {
+        if (valid) {
+          recharge(this.formData).then((res) => {
+            if (res.message === 'success') {
+              // TODO 根据返回的值跳转到收银台进行支付,一下是输出sn
+              console.warn(res.result.rechargeSn);
+              this.modal = false;
+            }
+          });
+        }
+      });
+    },
+    // 申请提现弹出框
+    withdrawalApply () {
+      this.withdrawApplyFormData.price = 1;
+      this.withdrawApplyModal = true;
+    },
+    withdrawal () {
+      this.$refs['withdrawApplyFormData'].validate((valid) => {
+        if (valid) {
+          withdrawalApply(this.withdrawApplyFormData).then((res) => {
+            if (res && res.success) {
+              this.$Message.success('提现申请成功，关注提现状态');
+              this.withdrawApplyModal = false;
+              this.init(); // 余额查询
+              this.getWithdrawApplyData(); // 提现记录
+            }
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.box {
+  margin: 20px 0;
+}
+.page-size {
+  margin: 15px 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.account-price {
+  font-weight: bold;
+}
+.subTips {
+  @include sub_color($light_sub_color);
+}
+.account-btns {
+  margin: 10px 0;
+}
+.ivu-btn {
+  margin: 0 4px;
+}
+.fontsize_48 {
+  font-size: 48px;
+}
+</style>
diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
new file mode 100644
index 00000000..7a721be1
--- /dev/null
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="wrapper">
+    <!-- 卡片组件 -->
+    <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>
+        <span class="del-icon" @click.stop="clearById(item.goodsId)">
+          <Icon type="md-trash" />
+        </span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { tracksList, clearTracks, clearTracksById } from '@/api/member';
+export default {
+  name: 'MyTrack',
+  data () {
+    return {
+      list: [], // 我的足迹，商品列表
+      spinShow: false // 控制loading是否加载
+    };
+  },
+  mounted () {
+    this.getList();
+  },
+  methods: {
+    goodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 跳转店铺首页
+    shopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: { id: id }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    clearAll () { // 清除全部足迹
+      this.$Modal.confirm({
+        title: '删除',
+        content: '<p>确定要删除全部足迹吗？</p>',
+        onOk: () => {
+          clearTracks().then(res => {
+            if (res.success) {
+              this.$Message.success('删除成功')
+              this.getList()
+            }
+          })
+        },
+        onCancel: () => { }
+      });
+    },
+    clearById (id) { // 清除全部足迹
+      clearTracksById(id).then(res => {
+        if (res.success) {
+          this.$Message.success('删除成功')
+          this.getList()
+        }
+      })
+    },
+    getList () {
+      this.spinShow = true;
+      tracksList(this.params).then(res => {
+        this.spinShow = false
+        if (res.success && res.result) {
+          this.list = res.result;
+        }
+      });
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.wrapper {
+  margin-bottom: 40px;
+}
+.del-btn {
+  margin: 0 0 10px 15px;
+}
+
+.track-list {
+  display: flex;
+  flex-wrap: wrap;
+  li{
+    width: 200px;
+    overflow: hidden;
+    margin-left: 15px;
+    margin-bottom: 10px;
+    border: 1px solid #eee;
+    position: relative;
+    &:hover{
+      cursor: pointer;
+      box-shadow:1px 1px 3px #999;
+      .del-icon{
+        display: block;
+      }
+    }
+    p{
+      padding: 0 5px;
+      margin: 3px 0;
+    }
+    p:nth-child(2) {
+      color: #999;
+    }
+    p:nth-child(3){
+      color: $theme_color;
+    }
+    .del-icon {
+      display: none;
+      font-size: 30px;
+      background-color:rgba(0,0,0,.3);
+      position: absolute;
+      width: 40px;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      right: 0;
+      top: 0;
+      cursor: pointer;
+    }
+  }
+}
+.page-size {
+  margin: 15px 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+</style>
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
new file mode 100644
index 00000000..f7e7a2e0
--- /dev/null
+++ b/buyer/src/pages/payment/Pay.vue
@@ -0,0 +1,757 @@
+<template>
+    <div class="pay-order">
+        <BaseHeader></BaseHeader>
+        <!-- LOGO 步骤条 -->
+        <div class="width_1200 logo">
+            <div>
+                <router-link to="/"><img :src="logoImg" alt="lili shop" title="lilishop"></router-link>
+                <div>结算页</div>
+            </div>
+            <div class="cart-steps">
+                <span :class="stepIndex==1?'active':''">1.我的购物车</span>
+                <Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
+                <span :class="stepIndex==1?'active':''">2.填写订单信息</span>
+                <Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
+                <span :class="stepIndex==2?'active':''">3.成功提交订单</span>
+            </div>
+        </div>
+        <Divider />
+        <div class="content width_1200">
+            <!-- 收货地址 -->
+            <div class="address">
+                <div class="card-head">
+                    <span>收货人信息</span>
+                    <span @click="goAddressManage">管理收货人地址</span>
+                </div>
+                <div class="address-manage">
+                    <div class="address-item" v-show="moreAddr ? true : index < 3" :class="selectedAddress.id === item.id?'border-red':''" @mouseenter="showEditBtn = index" @mouseleave="showEditBtn = ''" @click="selectAddress(item)" v-for="(item,index) in addressList" :key="index">
+                        <div>
+                            <span>{{item.name}}</span>
+                            <Tag class="ml_10" v-if="item.isDefault" color="red">默认</Tag>
+                            <Tag class="ml_10" v-if="item.alias" color="warning">{{item.alias}}</Tag>
+                        </div>
+                        <div>{{item.mobile}}</div>
+                        <div>{{ item.consigneeAddressPath | unitAddress }} {{item.detail}}</div>
+                        <div class="edit-btn" v-show="showEditBtn === index">
+                            <span @click.stop="editAddress(item.id)">修改</span>
+                            <span class="ml_10" v-if="!item.isDefault" @click.stop="delAddress(item)">删除</span>
+                        </div>
+                        <div class="corner-icon" v-show="selectedAddress.id === item.id">
+                            <div></div>
+                            <Icon type="md-checkmark" />
+                        </div>
+                    </div>
+                    <div class="add-address" @click="editAddress('')">
+                        <Icon type="ios-add-circle-outline" />
+                        <div>添加新地址</div>
+                    </div>
+                </div>
+
+                <div class="more-addr" @click="moreAddr = !moreAddr" v-if="addressList.length>3">
+                    {{moreAddr ? '收起地址' : '更多地址'}}
+                    <Icon v-show="!moreAddr" type="md-arrow-dropdown" />
+                    <Icon v-show="moreAddr" type="md-arrow-dropup" />
+                </div>
+            </div>
+            <!-- 商品信息 -->
+            <div class="goods-content">
+                <div class="card-head mt_20 mb_20">
+                    <span>商品信息</span>
+                    <span @click="$router.push('/cart')">返回购物车</span>
+                </div>
+                <div class="goods-msg" v-for="(shop,shopIndex) in goodsList" :key="shopIndex">
+                    <div class="shop-name">
+                        <span>
+                            <span class="hover-color"  @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>&nbsp;&nbsp;
+                            <Icon class="hover-color" custom="iconfont icon-kefu" />
+                        </span>
+                        <span>
+                            <p style="width:120px">配送方式：</p>
+                            <Select v-model="shop.deliveryMethod" size="small">
+                                <Option v-for="item in deliveryList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                            </Select>
+                        </span>
+                    </div>
+                    <div class="goods-list">
+                        <div class="goods-item" v-for="(goods,goodsIndex) in shop.skuList" :key="goodsIndex">
+                            <span class="hover-color" @click="goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)">
+                                <img :src="goods.goodsSku.thumbnail" alt="">
+                                <span style="vertical-align:top;">{{goods.goodsSku.goodsName}}</span>
+                            </span>
+                            <span class="goods-price">{{goods.goodsSku.price | unitPrice('￥')}}</span>
+                            <span>x{{goods.num}}</span>
+                            <span>{{goods.goodsSku.quantity > 0 ? '有货' : '无货'}}</span>
+                            <span class="goods-price">{{goods.goodsSku.price * goods.num | unitPrice('￥')}}</span>
+                        </div>
+                    </div>
+                    <div class="order-mark">
+                        <Input type="textarea" maxlength="60" v-model="shop.remark" show-word-limit placeholder="订单备注" />
+                        <span style="font-size:12px;color:#999;">提示：请勿填写有关支付、收货、发票方面的信息</span>
+                    </div>
+                </div>
+            </div>
+            <!-- 发票信息 -->
+            <div class="invoice">
+                <div class="card-head mt_20 mb_20">
+                    <span class="relative">发票信息<span class="inv-tips"><Icon type="ios-alert-outline" />开企业抬头发票须填写纳税人识别号，以免影响报销</span></span>
+                </div>
+                <div class="inovice-content">
+                    <span>{{invoiceData.receiptTitle}}</span>
+                    <span>{{invoiceData.receiptContent}}</span>
+                    <span @click="editInvoice">编辑</span>
+                </div>
+            </div>
+            <!-- 优惠券 -->
+            <div class="invoice">
+                <div class="card-head mt_20 mb_20">
+                    <span class="relative">优惠券</span>
+                </div>
+                <div v-if="couponList.length === 0">
+                    无可用优惠券
+                </div>
+                <ul v-else class="coupon-list">
+                    <li v-for="(item, index) in couponList" class="coupon-item" :key="index">
+                        <div class="c-left">
+                        <div>
+                            <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
+                            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+                            <span class="describe">满{{item.consumeThreshold}}元可用</span>
+                        </div>
+                        <p>使用范围：{{useScope(item.scopeType)}}</p>
+                        <p>有效期：{{item.endTime}}</p>
+                        </div>
+                        <b></b>
+                        <a class="c-right" @click="useCoupon(item.id)">立即使用</a>
+                        <i class="circle-top"></i>
+                        <i class="circle-bottom"></i>
+                    </li>
+                </ul>
+            </div>
+            <!-- 其他信息 -->
+            <div class="other" v-if="$route.query.way === 'POINT'">
+                <div class="card-head mt_20 mb_20">
+                    <span>其他信息</span>
+                </div>
+                <div>
+                    <div>
+                        <span>使用积分：</span><Input type="text" style="width:100px;" v-model.number="otherMsgForm.point" placeholder="请输入使用积分" /> <span style="color:#999;">您当前的可用积分为 {{otherMsgForm.totalPoint}} ，本订单最多可以使用{{otherMsgForm.availablePoint}}</span>
+                    </div>
+                </div>
+            </div>
+            <!-- 订单价格 -->
+            <div class="order-price">
+                <div>
+                    <span>{{totalNum}}件商品，总商品金额：</span><span>{{priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
+                </div>
+                <div>
+                    <span>运费：</span><span>{{ priceDetailDTO.freightPrice | unitPrice('￥')}}</span>
+                </div>
+                <div>
+                    <span>优惠金额：</span><span>-{{ priceDetailDTO.discountPrice + priceDetailDTO.couponPrice + priceDetailDTO.updatePrice | unitPrice('￥')}}</span>
+                </div>
+                <div>
+                    <span>应付金额：</span><span class='actrual-price'>{{priceDetailDTO.billPrice | unitPrice('￥')}}</span>
+                </div>
+            </div>
+
+        </div>
+        <!-- 底部支付栏 -->
+        <div class="order-footer width_1200">
+            <div class="pay ml_20" @click="pay">提交订单</div>
+            <div class="pay-address" v-if="addressList.length">配送至：{{ selectedAddress.consigneeAddressPath | unitAddress }} {{selectedAddress.detail}}&nbsp;&nbsp;收货人：{{selectedAddress.name}}&nbsp;&nbsp;{{selectedAddress.mobile}}</div>
+        </div>
+        <BaseFooter></BaseFooter>
+        <!-- 添加发票模态框 -->
+        <invoice-modal ref="invModal" @change="getInvMsg" />
+        <!-- 选择地址模态框 -->
+        <address-manage ref="address" :id="addrId" @change="addrChange"></address-manage>
+    </div>
+</template>
+
+<script>
+import invoiceModal from '@/components/invoiceModal';
+import addressManage from '@/components/addressManage';
+import {memberAddress, delMemberAddress} from '@/api/address';
+import {cartGoodsPay, createTrade, selectAddr, shippingMethod, receiptSelect, selectCoupon, couponNum} from '@/api/cart';
+import { canUseCouponList } from '@/api/member.js';
+import {getLogo} from '@/api/common.js'
+export default {
+  name: 'Pay',
+  components: { invoiceModal, addressManage },
+  data () {
+    return {
+      stepIndex: 1, // 顶部步骤条状态
+      invoiceAvailable: false, // 发票编辑按钮
+      showEditBtn: '', // 鼠标移入显示编辑按钮
+      orderMark: '', // 订单备注
+      invoiceData: { // 发票数据
+        receiptTitle: '个人',
+        receiptContent: '不开发票'
+      },
+      otherMsgForm: { // 其他信息模块数据
+        point: 0,
+        availablePoint: 10,
+        totalPoint: 100,
+        noGoods: 0
+      },
+      deliveryList: [ // 物流
+        // {value: 'SELF_PICK_UP', label: '自提'},
+        {value: 'LOGISTICS', label: '物流'}
+        // {value: 'LOCAL_TOWN_DELIVERY', label: '同城配送'}
+      ],
+      addressList: [], // 地址列表
+      selectedAddress: {}, // 所选地址的id
+      goodsList: [], // 商品列表
+      priceDetailDTO: {}, // 商品价格
+      totalNum: 0, // 购买数量
+      addrId: '', // 编辑地址传入的id
+      moreAddr: false, // 更多地址
+      canUseCouponNum: 0, // 可用优惠券数量
+      couponList: [], // 可用优惠券列表
+      logoImg: '' // 平台logo
+    };
+  },
+  mounted () {
+    this.init();
+    if (!this.Cookies.getItem('logo')) {
+      getLogo().then(res => {
+        if (res.success) {
+          let logoObj = JSON.parse(res.result.settingValue)
+          this.Cookies.setItem('logo', logoObj.buyerSideLogo)
+        }
+      })
+    } else {
+      this.logoImg = this.Cookies.getItem('logo')
+    }
+  },
+  methods: {
+    init () {
+      this.getGoodsDetail();
+      this.getAddress();
+    },
+    goAddressManage () { // 跳转地址管理页面
+      this.$router.push('/home/MyAddress');
+    },
+    getAddress () { // 获取收货地址列表
+      memberAddress().then(res => {
+        if (res.success) {
+          this.addressList = res.result.records;
+          this.addressList.forEach((e) => {
+            if (e.isDefault) this.selectedAddress = e;
+          });
+        }
+      });
+    },
+    getGoodsDetail () { // 订单商品详情
+      this.$Spin.show();
+      cartGoodsPay({way: this.$route.query.way}).then(res => {
+        this.$Spin.hide();
+        if (res.success) {
+          this.goodsList = res.result.cartList;
+          this.priceDetailDTO = res.result.priceDetailDTO;
+          this.skuList = res.result.skuList;
+          this.totalNum = 0;
+          for (let i = 0; i < this.skuList.length; i++) {
+            this.totalNum += this.skuList[i].num;
+          }
+          this.getCouponNum()
+        }
+      }).catch(() => { this.$Spin.hide(); });
+    },
+    getCouponNum  () { // 获取可用优惠券数量
+      couponNum({way: this.$route.query.way}).then(res => {
+        this.canUseCouponNum = res.result
+        if (res.result) {
+          let storeArr = []
+          let skuArr = []
+          this.goodsList.forEach(e => {
+            storeArr.push(e.storeId)
+            e.skuList.forEach(i => {
+              skuArr.push(i.goodsSku.id)
+            })
+          })
+          let params = {
+            pageNumber: 1,
+            pageSize: 100,
+            memberCouponStatus: 'NEW',
+            scopeId: skuArr.toString(),
+            storeId: storeArr.toString(),
+            totalPrice: this.priceDetailDTO.goodsPrice
+          }
+          canUseCouponList(params).then(res => {
+            if (res.success) this.couponList = res.result.records
+          })
+        }
+      })
+    },
+    selectAddress (item) { // 选择地址
+      let params = {
+        way: this.$route.query.way,
+        shippingAddressId: item.id
+      };
+      selectAddr(params).then(res => {
+        if (res.success) {
+          this.$Message.success('选择收货地址成功');
+          this.selectedAddress = item;
+          this.getGoodsDetail();
+        }
+      });
+    },
+    editAddress (id) { // 编辑地址
+      this.addrId = id;
+      this.$refs.address.show();
+    },
+    addrChange (item) { // 添加，编辑地址回显
+      this.getAddress();
+    },
+    delAddress (item) {
+      // 删除地址
+      this.$Modal.confirm({
+        title: '提示',
+        content: '你确定删除这个收货地址',
+        onOk: () => {
+          delMemberAddress(item.id).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success('删除成功');
+              this.getAddress();
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    },
+    goGoodsDetail (skuId, goodsId) { // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    // 跳转店铺首页
+    goShopPage (id) {
+      let routeUrl = this.$router.resolve({
+        path: '/Merchant',
+        query: {id: id}
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    selectDelivery (delivery) { // 选择配送方式
+      let params = {
+        way: this.$route.query.way,
+        shippingMethod: delivery.value
+      };
+      shippingMethod(params).then(res => {
+
+      });
+    },
+    useCoupon (id) { // 使用优惠券
+      let params = {
+        way: this.$route.query.way,
+        memberCouponId: id,
+        used: true
+      }
+      selectCoupon(params).then(res => {
+        if (res.success) {
+          this.init()
+        }
+      })
+    },
+    editInvoice () { // 编辑发票信息
+      this.$refs.invModal.invoiceAvailable = true;
+    },
+    getInvMsg (item) { // 获取发票信息
+      console.log(item);
+      this.invoiceData = item;
+      this.selectReceipt(item.id)
+    },
+    selectReceipt (id) { // 选择发票
+      let params = {
+        way: this.$route.query.way,
+        receiptId: id
+      }
+      receiptSelect(params).then(res => {
+      })
+    },
+    pay () { // 结算
+      const params = {
+        client: 'PC',
+        remark: [],
+        way: this.$route.query.way
+      };
+      this.goodsList.forEach(e => {
+        if (e.remark) {
+          params.remark.push({
+            remark: e.remark,
+            storeId: e.storeId
+          })
+        }
+      })
+      if (!params.remark.length) delete params.remark;
+      this.$Spin.show();
+      createTrade(params).then(res => {
+        this.$Spin.hide();
+        if (res.success) {
+          this.$router.push({path: '/payment', query: {orderType: 'TRADE', sn: res.result.sn}});
+        }
+      });
+    },
+    useScope (type) {
+      let goods = '全部商品'
+      switch (type) {
+        case 'ALL':
+          goods = '全部商品'
+          break;
+        case 'PORTION_GOODS':
+          goods = '部分商品'
+          break;
+        case 'PORTION_GOODS_CATEGORY':
+          goods = '部分分类商品'
+          break;
+      }
+      return `${goods}可用`
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../assets/styles/coupon.scss';
+/** logo start */
+.logo {
+    height: 40px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 20px auto 0;
+    div:nth-child(1){
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        img{
+            width: 150px;
+            height:auto;
+            cursor: pointer;
+        }
+        div:nth-child(2){
+            width: 200px;
+            color: #999;
+            font-size: 16px;
+            margin: 0 20px;
+            span{
+                color: $theme_color;
+            }
+        }
+    }
+}
+.cart-steps{
+    height: 30px;
+    display: flex;
+    align-items: center;
+    span{
+        @include content_color($light_content_color);
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        display: inline-block;
+        padding: 0 15px;
+    }
+
+    .ivu-icon{
+        @include content_color($light_content_color);
+        font-size: 20px;
+        margin:0 15px;
+    }
+
+    .active{
+        border-radius: 50px;
+        background-color:#ff8f23;
+        color: #fff;
+    }
+
+    .active-arrow{
+        color: #ff8f23;
+    }
+}
+/** logo end */
+/** content start */
+.content {
+    margin: 20px auto;
+    background-color: #fff;
+    min-height: 200px;
+    padding: 15px 25px;
+}
+/** 地址管理 */
+.address-manage{
+    display: flex;
+    flex-wrap: wrap;
+    >div {
+        border:1px dotted #949494;
+        width: 265px;
+        height: 120px;
+        margin:20px 20px 0 0;
+        padding: 10px;
+        cursor: pointer;
+        color: #999;
+    }
+    .add-address{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        .ivu-icon{
+            font-size: 24px;
+        }
+    }
+    .address-item{
+        position: relative;
+        font-size: 12px;
+        >div:nth-child(1){
+            margin-bottom: 10px;
+            span{
+                margin-right: 10px;
+            }
+            >span:nth-child(1){
+                color: #000000;
+                font-size: 14px;
+            }
+        }
+        .edit-btn{
+            font-size: 12px;
+            position: absolute;
+            top: 15px;
+            right: 20px;
+            color: $theme_color;
+            span:hover{
+                border-bottom: 1px solid $theme_color;
+            }
+        }
+        .corner-icon{
+            position: absolute;
+            right: -1px;
+            bottom: -1px;
+            div{
+                width: 0;
+                border-top: 20px solid transparent;
+                border-right: 20px solid $theme_color;
+            }
+            .ivu-icon{
+                font-size: 12px;
+                position: absolute;
+                bottom: 0;
+                right: 1px;
+                transform: rotate(-15deg);
+                color: #fff;
+            }
+        }
+    }
+    .border-red{
+        border-color: $theme_color;
+    }
+}
+/** 购买商品列表 start */
+.shop-name{
+    display: flex;
+    justify-content: space-between;
+    >span:nth-child(1){
+        font-weight: bold;
+        .ivu-icon{
+            color: #ff8f23;
+            &:hover {color: $theme_color;}
+        }
+    }
+    >span:nth-child(2){
+        color: #999;
+        position: relative;
+        display: flex;
+        width: 200px;
+    }
+    .delivery-list{
+        position: absolute;
+        right: 0;
+        top: 20px;
+        background-color: #f3fafe;
+        box-shadow: 0px 0px 5px #b9b2b2;
+        display: flex;
+        flex-wrap: wrap;
+        width: 200px;
+        min-height: 100px;
+        padding: 10px;
+        li{
+            width: 90px;
+            height: 30px;
+            text-align: center;
+            &:hover{
+                cursor: pointer;
+            }
+        }
+    }
+}
+.goods-list{
+    background-color: #f8f8f8;
+    margin: 10px 0 20px 0;
+    .goods-item{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 20px 0;
+        margin: 0 20px;
+        border-bottom: 1px dotted #999;
+        &:last-child{border:none;}
+        img{
+            width: 48px;
+            height: 48px;
+        }
+        >span{
+            text-align: center;
+            width: 100px;
+        }
+        >span:nth-child(1) {
+            font-size: 12px;
+            flex: 1;
+            text-align: left;
+        }
+        >span:last-child{
+            color: $theme_color;
+            font-weight: bold;
+        }
+        .goods-price{
+            font-size: 16px;
+        }
+    }
+}
+.order-mark{
+    width: 500px;
+}
+/** 购买商品列表 end */
+/** 发票信息 start */
+.invoice{
+    .inv-tips{
+        position: absolute;
+        border: 1px solid #ddd;
+        width: 310px;
+        padding: 3px;
+        margin: 0 0 0 10px;
+        font-size: 12px!important;
+        box-shadow:  0 0 3px rgba(0,0,0,.15);
+        &::before{
+            content: '';
+            display: inline-block;
+            width: 12px;
+            height: 17px;
+            background:url(../../assets/images/arrow-left.png) 0 0 no-repeat;
+            background-color:#fff;
+            position: absolute;
+            left: -9px;
+        }
+        .ivu-icon{
+            color: #ff8f23;
+            margin-right: 3px;
+            font-size: 16px;
+            font-weight: bold;
+        }
+    }
+    .inovice-content{
+        >span {
+            margin-right: 10px;
+        }
+        >span:last-child{
+            color: $theme_color;
+            cursor: pointer;
+            &:hover{border-bottom: 1px solid $theme_color;}
+        }
+    }
+}
+/** 发票信息 end */
+
+/** 订单价格 */
+.order-price{
+    text-align: right;
+    margin-top: 30px;
+    font-size: 16px;
+    color: #999;
+    >div>span:nth-child(2){
+        width: 130px;
+        text-align: right;
+        display: inline-block;
+        margin-top: 10px;
+    }
+    .actrual-price{
+        color: $theme_color;
+        font-weight: bold;
+        font-size: 20px;
+    }
+}
+/** content end */
+/** 底部支付栏 */
+.order-footer {
+        height: 50px;
+        @include background_color($light_white_background_color);
+        @include title_color($title_color);
+        display: flex;
+        align-items: center;
+        flex-direction: row-reverse;
+        border-top: 1px solid #ddd;
+        margin: 10px auto;
+        div{
+            text-align: center;
+        }
+        position: sticky;
+        bottom: 0;
+        .pay {
+            background-color: $theme_color;
+            width: 150px;
+            font-size: 20px;
+            color: #fff;
+            height: 100%;
+            line-height: 50px;
+            cursor: pointer;
+        }
+    }
+/** 公共表头 */
+.card-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #dddddd;
+    height: 40px;
+
+    span:nth-child(1){
+        font-size: 18px;
+    }
+    span:nth-child(2){
+        font-size: 12px;
+        color: #438cde;
+        cursor: pointer;
+        &:hover{
+            color: $theme_color;
+        }
+    }
+}
+.ivu-divider {
+    background: $theme_color;
+    height: 2px;
+}
+.pay-address{font-size: 12px;}
+.more-addr{
+    cursor: pointer;
+    margin-top: 10px;
+    display: inline-block;
+}
+.coupon-item {
+    width: 260px;
+    height: 125px;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    .c-right{
+        width: 30px;
+        padding: 10px 7px;
+    }
+    b{
+      background: url('../../assets/images/small-circle.png') top left repeat-y;
+      right: 28px;
+    }
+    .circle-top,.circle-bottom{
+        right: 22px;
+    }
+}
+</style>
diff --git a/buyer/src/pages/payment/PayDone.vue b/buyer/src/pages/payment/PayDone.vue
new file mode 100644
index 00000000..7f76d562
--- /dev/null
+++ b/buyer/src/pages/payment/PayDone.vue
@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <BaseHeader></BaseHeader>
+    <div class="pay-done-box">
+      <img src="../../assets/images/pay-success.png">
+    </div>
+    <div class="pay-btn">
+      <Button type="primary" @click="$router.push('/')">继续逛逛</Button>
+      <Button type="info" @click="$router.push('home/myOrder')">查看订单</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PayDone'
+};
+</script>
+
+<style scoped>
+.pay-done-box {
+  margin: 100px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.pay-btn{
+  width: 300px;
+  margin: 0 auto;
+}
+</style>
diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue
new file mode 100644
index 00000000..18f81c20
--- /dev/null
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="wrapper">
+    <BaseHeader></BaseHeader>
+    <div class="wrapper-head">
+      <div class="head-left">
+        <div class="left-tips">订单提交成功，请尽快付款！</div>
+        <div class="left-tips-time">请您尽快完成支付，否则订单会被自动取消</div>
+      </div>
+      <div class="head-right">
+        <div>应付金额 <span class="price">{{payDetail.price | unitPrice}}</span>元</div>
+      </div>
+    </div>
+    <div class="wrapper-box">
+      <div class="-box-item" @click="handlePay('ALIPAY')">
+        <img src="https://ss3.bdstatic.com/yrwDcj7w0QhBkMak8IuT_XF5ehU5bvGh7c50/logopic/a9936a369e82e0c6c42112674a5220e8_fullsize.jpg" alt="">
+        <span>支付宝</span>
+      </div>
+      <div  class="-box-item" @click="handlePay('WECHAT')">
+        <img src="https://dss1.bdstatic.com/6OF1bjeh1BF3odCf/it/u=3774939867,2826752539&fm=74&app=80&f=JPEG&size=f121,121?sec=1880279984&t=796e842a5ef2d16d9edc872d6f1147ef" alt="">
+        <span>微信</span>
+      </div>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import { tradeDetail } from '@/api/pay.js';
+export default {
+  data () {
+    return {
+      payDetail: {}, // 支付详情
+      qrcode: '' // 支付二维码
+    };
+  },
+  methods: {
+    getTradeDetail () {
+      const params = this.$route.query;
+      params.clientType = 'PC'
+      tradeDetail(params).then(res => {
+        if (res.success) {
+          this.payDetail = res.result;
+        }
+      });
+    },
+    handlePay (way) {
+      const params = this.$route.query;
+      params.paymentMethod = way;
+      params.paymentClient = 'NATIVE';
+      params.price = this.payDetail.price;
+      this.$router.push({path: '/qrpay', query: params});
+    }
+  },
+  mounted () {
+    this.getTradeDetail();
+  }
+};
+</script>
+<style scoped lang="scss">
+.head-left{
+    font-weight: bold;
+}
+.left-tips{
+    font-size: 21px;
+
+}
+.-box-item{
+    margin-right: 30px;
+    display: flex;
+    font-size: 21px;
+    font-weight: bold;
+    align-items: center;
+    margin: 20px 20px;
+    cursor: pointer;
+    @include content_color($light_content_color);
+
+    &:hover{color: $theme_color;}
+
+    >span{
+        margin-left: 10px;
+    }
+    >img{
+        border-radius: 10px;
+        width: 60px;
+        height: 60px;
+    }
+}
+.left-tips-time{
+    font-size: 16px;
+}
+.wrapper-head{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+   line-height: 1.75;
+}
+.wrapper-head,
+.wrapper-box {
+  padding: 20px 40px;
+  width: 1200px;
+  margin: 20px auto;
+}
+.wrapper-box {
+  @include white_background_color();
+  height: auto;
+  display: flex;
+}
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
+.price{
+    font-size: 18px;
+    font-weight: bold;
+    color: $theme_color;
+}
+.head-right{
+    font-weight: bold;
+}
+</style>
diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue
new file mode 100644
index 00000000..21192601
--- /dev/null
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="wrapper">
+    <BaseHeader></BaseHeader>
+    <div class="wrapper-head">
+      <div class="head-left">
+        <div class="left-tips">订单提交成功，请尽快付款！</div>
+        <div class="left-tips-time">请您尽快完成支付，否则订单会被自动取消</div>
+      </div>
+      <div class="head-right">
+        <div>应付金额 <span class="price">{{$route.query.price | unitPrice}}</span>元</div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="pay-way">{{params.paymentMethod === 'ALIPAY' ? '支付宝支付' : '微信支付'}}</div>
+      <div class="qrcode">
+        <div style="width:200px;height:200px;border:1px solid #eee;">
+          <vue-qr :text="qrcode" :margin="0" colorDark="#000" colorLight="#fff" :size="200"></vue-qr>
+        </div>
+        <div class="intro">
+          <Icon type="md-qr-scanner" /> 请使用{{params.paymentMethod === 'ALIPAY' ? '支付宝' : '微信'}}扫码付款
+        </div>
+      </div>
+      <div class="btn-div">
+        <p class="mb_10">支付成功后自动跳转，如未跳转请点击按钮手动跳转。。。</p>
+        <div>
+          <Button @click="handlePay">重新支付</Button>
+          <Button type="success" @click="$router.push('/payDone')">支付成功</Button>
+        </div>
+      </div>
+      <a @click="$router.back()">选择其他支付方式></a>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import vueQr from 'vue-qr';
+import { payCallback, pay } from '@/api/pay.js';
+export default {
+  components: { vueQr },
+  data () {
+    return {
+      qrcode: '',
+      params: this.$route.query,
+      interval: null,
+      num: 0
+    };
+  },
+  methods: {
+    handlePay () {
+      const params = this.$route.query;
+
+      pay(params).then(res => {
+        if (res.success) {
+          this.qrcode = res.result;
+          this.num = 0;
+          this.interval = setInterval(this.callback, 5000);
+        } else {
+          this.$Message.error(res.message)
+        }
+      });
+    },
+    callback () { // 支付回调接口
+      this.num++;
+      if (this.num >= 7) {
+        clearInterval(this.interval);
+      }
+      let params = JSON.parse(JSON.stringify(this.$route.query));
+      delete params.paymentMethod;
+      delete params.paymentClient;
+      payCallback(params).then(res => {
+        if (res.result) {
+          clearInterval(this.interval);
+          this.$router.push('/payDone');
+        }
+      });
+    }
+  },
+  mounted () {
+    this.handlePay();
+  }
+};
+</script>
+<style scoped lang="scss">
+.head-left {
+  font-weight: bold;
+}
+.left-tips {
+  font-size: 21px;
+}
+
+.left-tips-time {
+  font-size: 16px;
+}
+.wrapper-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  line-height: 1.75;
+}
+.wrapper-head,
+.content {
+  padding: 20px 40px;
+  width: 1000px;
+  margin: 20px auto;
+}
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
+.content {
+  background-color: #fff;
+  box-shadow: 0 6px 10px #ddd;
+  position: relative;
+  display: flex;
+  .pay-way {
+    font-weight: bold;
+    font-size: 18px;
+  }
+
+  .qrcode {
+    margin: 30px 0 0 70px;
+  }
+
+  .intro {
+    background-color: #ff7674;
+    height: 40px;
+    line-height: 40px;
+    margin-top: 10px;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+  }
+
+  .btn-div {
+    margin:120px 0 0 30px;
+  }
+
+  a {
+    position: absolute;
+    right: 20px;
+    top: 20px;
+  }
+}
+.price {
+  font-size: 18px;
+  font-weight: bold;
+  color: $theme_color;
+}
+.head-right {
+  font-weight: bold;
+}
+</style>
diff --git a/buyer/src/pages/pointMall.vue b/buyer/src/pages/pointMall.vue
new file mode 100644
index 00000000..1f487725
--- /dev/null
+++ b/buyer/src/pages/pointMall.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="point-mall">
+    <BaseHeader></BaseHeader>
+    <Search></Search>
+    <cateNav></cateNav>
+    <ul class="category">
+      <li @click="selectCate(cate.id)" v-for="(cate, index) in cateList" :key="index">{{cate.name}}</li>
+    </ul>
+    <h3 class="promotion-decorate">积分商品</h3>
+    <!-- 列表 -->
+    <div class="goods-list">
+      <empty v-if="goodsList.length === 0" />
+      <div
+        v-else
+        class="goods-show-info"
+        v-for="(item, index) in goodsList"
+        :key="index"
+        @click="goGoodsDetail(item.skuId, item.goodsSku.goodsId)"
+      >
+        <div class="goods-show-img">
+          <img width="220" height="220" :src="item.goodsSku.thumbnail" />
+        </div>
+        <div class="goods-show-price">
+          <span>
+            <span class="seckill-price text-danger">{{
+              item.settlementPrice | unitPrice("￥")
+            }} + {{item.points}}积分</span>
+          </span>
+        </div>
+        <div class="goods-show-detail">
+          <span>{{ item.goodsSku.goodsName }}</span>
+        </div>
+        <div class="goods-show-num">
+          已有<span>{{ item.commentNum || 0 }}</span
+          >人评价
+        </div>
+        <div class="goods-show-seller">
+          <span>{{ item.storeName }}</span>
+        </div>
+      </div>
+    </div>
+    <BaseFooter></BaseFooter>
+  </div>
+</template>
+<script>
+import {pointGoods, pointGoodsCategory} from '@/api/promotion.js'
+export default {
+  data () {
+    return {
+      goodsList: [], // 积分商品列表
+      cateList: [{
+        name: '全部分类',
+        id: ''
+      }], // 积分分类列表
+      params: { // 商品列表请求参数
+        pageNumber: 1,
+        pageSize: 20,
+        pointsGoodsCategoryId: ''
+      }
+    }
+  },
+  mounted () {
+    this.params.pointsGoodsCategoryId = this.$route.query.categoryId || ''
+    this.getList()
+    this.getCate()
+  },
+  methods: {
+    getList () { // 获取列表
+      pointGoods(this.params).then(res => {
+        if (res.success) {
+          this.goodsList = res.result.records
+        }
+      })
+    },
+    getCate () { // 获取分类
+      pointGoodsCategory(this.params).then(res => {
+        if (res.success) {
+          this.cateList.push(...res.result.records)
+        }
+      })
+    },
+    selectCate (id) {
+      this.params.pointsGoodsCategoryId = id
+      this.getList()
+      this.$router.push({query: {categoryId: id}})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../assets/styles/goodsList.scss';
+.seckill-price {
+  font-size: 18px;
+}
+.category {
+  width: 1200px;
+  margin: 0 auto;
+  display: flex;
+  height: 30px;
+  line-height: 30px;
+  background-color:#005aa0;
+  color: #fff;
+  li{
+    margin: 0 10px;
+    &:hover{
+      cursor: pointer;
+    }
+  }
+}
+.promotion-decorate::before,.promotion-decorate::after{
+  background-image: url('../../static/sprite@2x.png');
+}
+</style>
diff --git a/buyer/src/pages/promotion/seckill.vue b/buyer/src/pages/promotion/seckill.vue
new file mode 100644
index 00000000..0b8ad4a7
--- /dev/null
+++ b/buyer/src/pages/promotion/seckill.vue
@@ -0,0 +1,203 @@
+<template>
+  <div class="seckill-list">
+    <BaseHeader></BaseHeader>
+    <Search />
+    <!-- 秒杀时间段 -->
+    <div class="promotion-decorate">限时秒杀</div>
+    <ul class="time-line">
+      <template v-for="(time, index) in list">
+        <li v-if="index < 5" @click="currIndex = index" :key="index" :class="{'currTimeline': currIndex === index}">
+          <div>{{time.timeLine+':00'}}</div>
+          <div v-if="currIndex === index">
+            <p>{{nowHour >= time.timeLine ? '秒杀中' : '即将开始'}}</p>
+            <p>{{nowHour >= time.timeLine ? '距结束' : '距开始'}}&nbsp;{{currTime}}</p>
+          </div>
+          <div v-else class="not-curr">
+            {{nowHour >= time.timeLine ? '秒杀中' : '即将开始'}}
+          </div>
+        </li>
+      </template>
+    </ul>
+    <!-- 秒杀商品列表 -->
+    <div class="goods-list">
+      <empty v-if="goodsList.length === 0" />
+      <div
+        v-else
+        class="goods-show-info"
+        v-for="(item, index) in goodsList"
+        :key="index"
+        @click="goGoodsDetail(item.skuId, item.goodsId)"
+      >
+        <div class="goods-show-img">
+          <img width="220" height="220" :src="item.goodsImage" />
+        </div>
+        <div class="goods-show-price">
+          <span>
+            <span class="seckill-price text-danger">{{
+              item.price | unitPrice("￥")
+            }}</span>
+            <span style="color:#999;text-decoration:line-through;">{{item.originalPrice | unitPrice('￥')}}</span>
+          </span>
+        </div>
+        <div class="goods-show-detail">
+          <span>{{ item.goodsName }}</span>
+        </div>
+        <div class="goods-seckill-btn" :class="{'goods-seckill-btn-gray' : nowHour < list[currIndex].timeLine}">{{nowHour >= list[currIndex].timeLine ? '立即抢购' : '即将开始'}}</div>
+        <div class="goods-show-num">
+          已售<Progress style="width:110px"  class="ml_10" :percent="Math.floor(item.salesNum/item.quantity)" />
+        </div>
+        <div class="goods-show-seller">
+          <span>{{ item.storeName }}</span>
+        </div>
+      </div>
+    </div>
+    <BaseFooter />
+  </div>
+</template>
+<script>
+import {seckillByDay} from '@/api/promotion'
+export default {
+  data () {
+    return {
+      list: [],
+      goodsList: [],
+      interval: null,
+      currIndex: 0, // 当前时间段的下标
+      currTime: 0, // 当前显示的倒计时
+      diffSeconds: 0, // 倒计时时间戳
+      nowHour: new Date().getHours()
+    }
+  },
+  watch: {
+    currIndex (val) {
+      clearInterval(this.interval)
+      this.interval = null
+      this.nowHour = new Date().getHours()
+      this.countDown(val)
+      this.goodsList = this.list[val].seckillGoodsList
+    },
+    diffSeconds (val) {
+      const hours = Math.floor(val / 3600);
+      // 当前秒数 / 60，向下取整
+      // 获取到所有分钟数 3600 / 60 = 60分钟
+      // 对60取模，超过小时数的分钟数
+      const minutes = Math.floor(val / 60) % 60;
+      // 当前的秒数 % 60，获取到 超过小时数、分钟数的秒数（秒数）
+      const seconds = val % 60;
+      this.currTime = filteTime(hours) + ':' + filteTime(minutes) + ':' + filteTime(seconds)
+      if (val <= 0) {
+        clearInterval(this.interval)
+        this.interval = null
+      }
+      function filteTime (time) {
+        if (time < 10) {
+          return '0' + time
+        } else {
+          return time
+        }
+      }
+    }
+  },
+  methods: {
+    getListByDay () { // 当天秒杀活动
+      seckillByDay().then(res => {
+        if (res.success) {
+          this.list = res.result
+          this.goodsList = this.list[0].seckillGoodsList
+          this.countDown(this.currIndex)
+        }
+      })
+    },
+    goGoodsDetail (skuId, goodsId) {
+      // 跳转商品详情
+      let routeUrl = this.$router.resolve({
+        path: '/goodsDetail',
+        query: { skuId, goodsId }
+      });
+      window.open(routeUrl.href, '_blank');
+    },
+    countDown (currIndex) { // 倒计时
+      // 0点时间戳
+      let zeroTime = new Date(new Date().toLocaleDateString()).getTime();
+      let currTime = new Date().getTime()
+      let actTime = 0;
+      let nowHour = new Date().getHours(); // 当前小时数
+      if (this.list[currIndex].timeLine > nowHour) { // 活动未开始
+        actTime = zeroTime + this.list[currIndex].timeLine * 3600 * 1000
+      } else if (this.list[currIndex].timeLine <= nowHour) { // 活动进行中
+        if (currIndex === this.list.length - 1) { // 如果是最后一个活动，直到24点结束
+          actTime = zeroTime + 24 * 3600 * 1000
+        } else {
+          actTime = zeroTime + this.list[currIndex + 1].timeLine * 3600 * 1000
+        }
+      }
+      this.diffSeconds = Math.floor((actTime - currTime) / 1000)
+      this.interval = setInterval(() => {
+        this.diffSeconds--
+      }, 1000)
+    }
+  },
+  mounted () {
+    this.getListByDay()
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../assets/styles/goodsList.scss';
+.goods-seckill-btn {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  width: 80px;
+  color: #fff;
+  height: 35px;
+  text-align: center;
+  line-height: 35px;
+  font-size: 14px;
+  background-color: $theme_color;
+}
+.goods-seckill-btn-gray {
+  background-color: #666;
+}
+.promotion-decorate::before,.promotion-decorate::after{
+  background-image: url('../../../static/sprite@2x.png');
+}
+.time-line{
+  width: 1200px;
+  height: 60px;
+  margin: 0 auto;
+  background-color: #fff;
+  display: flex;
+  li{
+    padding: 0 30px;
+    font-size: 16px;
+    font-weight: bold;
+    width: 240px;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    &:hover{
+      cursor: pointer;
+    }
+    .not-curr {
+      border: 1px solid #999;
+      border-radius: 20px;
+      padding: 3px 10px;
+      margin-left: 10px;
+      font-size: 12px;
+      font-weight: normal;
+    }
+  }
+  .currTimeline{
+    background-color: $theme_color;
+    color: #fff;
+    >div:nth-child(1) {
+      font-size: 20px;
+    }
+    >div:nth-child(2) {
+      font-size: 14px;
+      margin-left: 10px;
+    }
+  }
+}
+</style>
diff --git a/buyer/src/pages/shopEntry/README.md b/buyer/src/pages/shopEntry/README.md
new file mode 100644
index 00000000..8f2abafc
--- /dev/null
+++ b/buyer/src/pages/shopEntry/README.md
@@ -0,0 +1 @@
+### 店铺入驻页面
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
new file mode 100644
index 00000000..29ed089a
--- /dev/null
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="company-msg">
+    <Form ref="firstForm" :model="form" :rules="rules" :label-width="140">
+      <h4>基础信息</h4>
+      <FormItem prop="companyName" label="公司名称">
+        <Input
+          type="text"
+          v-model="form.companyName"
+          placeholder="请填写公司信息"
+        />
+      </FormItem>
+      <FormItem prop="addressIdPath" label="公司所在地">
+        <!-- <Input type="text" v-model="form.addressIdPath" placeholder="请选择公司所在地" /> -->
+        <region
+          style="width: 250px"
+          @selected="selectedRegion"
+          :addressId="address"
+        />
+      </FormItem>
+      <FormItem prop="companyAddress" label="公司详细地址">
+        <Input
+          type="text"
+          v-model="form.companyAddress"
+          placeholder="请填写公司详细信息"
+        />
+      </FormItem>
+      <FormItem prop="employeeNum" label="员工总数">
+        <Input
+          type="text"
+          v-model="form.employeeNum"
+          placeholder="请填写公司员工总数"
+          ><span slot="append">人</span>
+          </Input>
+      </FormItem>
+      <FormItem prop="registeredCapital" label="注册资金">
+        <Input
+          type="text"
+          v-model="form.registeredCapital"
+          placeholder="请填写注册资金"
+          ><span slot="append">万元</span></Input>
+      </FormItem>
+      <FormItem prop="linkName" label="联系人姓名">
+        <Input
+          type="text"
+          v-model="form.linkName"
+          placeholder="请填写联系人姓名"
+        />
+      </FormItem>
+      <FormItem prop="linkPhone" label="联系人电话">
+        <Input
+          type="text"
+          v-model="form.linkPhone"
+          placeholder="请填写联系人电话"
+        />
+      </FormItem>
+      <FormItem prop="companyEmail" label="电子邮箱">
+        <Input
+          type="text"
+          v-model="form.companyEmail"
+          placeholder="请填写电子邮箱"
+        />
+      </FormItem>
+
+      <h4>营业执照信息</h4>
+      <FormItem prop="licenseNum" label="营业执照号">
+        <Input
+          type="text"
+          v-model="form.licenseNum"
+          placeholder="请填写营业执照号"
+        />
+      </FormItem>
+      <FormItem prop="scope" label="法定经营范围">
+        <Input
+          type="textarea"
+          v-model="form.scope"
+          maxlength="300"
+          show-word-limit
+          :rows="4"
+          placeholder="请输入营业执照所示经营范围"
+        />
+      </FormItem>
+      <FormItem prop="licencePhoto" label="营业执照电子版">
+        <Upload
+          ref="uploadLicence"
+          :show-upload-list="false"
+          :on-success="handleSuccess"
+          :format="['jpg', 'jpeg', 'png', 'gif']"
+          :max-size="2048"
+          :before-upload="beforeUpload"
+          :on-format-error="handleFormatError"
+          :on-exceeded-size="handleMaxSize"
+          :on-error="uploadErr"
+          multiple
+          :action="action"
+          :headers="accessToken"
+        >
+          <Button type="info" :loading="uploadLoading">证照上传</Button>
+        </Upload>
+        <div class="describe">
+          请压缩图片在2M以内，格式为gif，jpg，png，并确保文字清晰，以免上传或审核失败
+        </div>
+        <div
+          class="img-list"
+          v-for="(item, index) in form.licencePhoto"
+          :key="index"
+        >
+          <img :src="item" width="100" alt="" />
+          <div class="cover">
+            <Icon
+              type="ios-eye-outline"
+              @click.native="handleView(item)"
+            ></Icon>
+            <Icon
+              type="ios-trash-outline"
+              @click.native="handleRemove(index, 'licencePhoto')"
+            ></Icon>
+          </div>
+        </div>
+      </FormItem>
+
+      <h4>法人信息</h4>
+      <FormItem prop="legalName" label="法人姓名">
+        <Input
+          type="text"
+          v-model="form.legalName"
+          maxlength="20"
+          placeholder="请输入法人姓名"
+        />
+      </FormItem>
+      <FormItem prop="legalId" label="法人证件号">
+        <Input
+          type="text"
+          v-model="form.legalId"
+          placeholder="请输入法人证件号"
+        />
+      </FormItem>
+      <FormItem prop="legalPhoto" label="法人证件电子版">
+        <Upload
+          ref="uploadLegal"
+          :show-upload-list="false"
+          :on-success="handleSuccess1"
+          :before-upload="beforeUpload1"
+          :max-size="2048"
+          :format="['jpg', 'jpeg', 'png', 'gif']"
+          :on-format-error="handleFormatError"
+          :on-exceeded-size="handleMaxSize"
+          :on-error="uploadErr"
+          multiple
+          :action="action"
+          :headers="accessToken"
+        >
+          <Button type="info" :loading="uploadLoading1">证照上传</Button>
+        </Upload>
+        <div class="describe">
+          请压缩图片在2M以内，格式为gif，jpg，png，并确保文字清晰，以免上传或审核失败
+        </div>
+        <div
+          class="img-list"
+          v-for="(item, index) in form.legalPhoto"
+          :key="index"
+        >
+          <img :src="item" width="100" alt="" />
+          <div class="cover">
+            <Icon
+              type="ios-eye-outline"
+              @click.native="handleView(item)"
+            ></Icon>
+            <Icon
+              type="ios-trash-outline"
+              @click.native="handleRemove(index, 'legalPhoto')"
+            ></Icon>
+          </div>
+        </div>
+      </FormItem>
+      <FormItem>
+        <Button type="primary" :loading="loading" @click="next"
+          >填写财务资质信息</Button
+        >
+      </FormItem>
+    </Form>
+    <Modal title="View Image" v-model="visible">
+      <img :src="previewPicture" v-if="visible" style="width: 100%" />
+    </Modal>
+  </div>
+</template>
+<script>
+import { applyFirst } from '@/api/shopentry';
+import * as RegExp from '@/plugins/RegExp.js';
+import region from '@/components/map/region.vue';
+import storage from '@/plugins/storage';
+import { commonUrl } from '@/plugins/request.js';
+export default {
+  components: { region },
+  props: {
+    content: {
+      default () {
+        return {};
+      },
+      type: Object
+    }
+  },
+  data () {
+    return {
+      action: commonUrl + '/common/upload/file',
+      accessToken: {},
+      visible: false,
+      loading: false,
+      address: '',
+      previewPicture: '',
+      form: {
+        legalPhoto: [],
+        licencePhoto: []
+      },
+      rules: {
+        companyName: [{ required: true, message: '请填写公司信息' }],
+        addressIdPath: [{ required: true, message: '请选择公司所在地' }],
+        companyAddress: [{ required: true, message: '请填写公司详细地址' }],
+        employeeNum: [
+          { required: true, message: '请填写公司员工总数' },
+          { pattern: RegExp.integer, message: '只能填写正整数' }
+        ],
+        registeredCapital: [
+          { required: true, message: '请填写公司注册资金' },
+          { pattern: RegExp.integer, message: '只能填写正整数' }
+        ],
+        linkName: [{ required: true, message: '请填写联系人姓名' }],
+        linkPhone: [
+          { required: true, message: '请填写联系人姓名' },
+          { pattern: RegExp.mobile, message: '请填写正确手机号' }
+        ],
+        companyEmail: [
+          { required: true, message: '请填写电子邮箱' },
+          { type: 'email', message: '请输入正确的邮箱' }
+        ],
+        licenseNum: [
+          { required: true, message: '请填写营业执照号' },
+          { pattern: RegExp.licenseNum, message: '请输入正确的营业执照号' }
+        ],
+        scope: [{ required: true, message: '请填写营业执照所示经营范围' }],
+        legalPhoto: [{ required: true, message: '请上传法人身份证照片' }],
+        licencePhoto: [{ required: true, message: '请上传营业执照' }],
+        legalName: [{ required: true, message: '请输入法人姓名' }],
+        legalId: [
+          { required: true, message: '请输入法人证件号' },
+          { pattern: RegExp.IDCard, message: '请输入正确的证件号' }
+        ]
+      },
+      uploadLoading1: false,
+      uploadLoading: false
+    };
+  },
+  methods: {
+    next () {
+      this.$refs.firstForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.legalPhoto = this.form.legalPhoto.toString();
+          params.licencePhoto = this.form.licencePhoto.toString();
+          applyFirst(params)
+            .then((res) => {
+              this.loading = false;
+              if (res.success) this.$emit('change', 1);
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          console.log('error');
+        }
+      });
+    },
+    selectedRegion (item) {
+      // 地址选择回显
+      this.$set(this.form, 'addressIdPath', item[0].toString());
+      this.$set(
+        this.form,
+        'addressPath',
+        item[1].toString().replace(/\s/g, '')
+      );
+    },
+    beforeUpload () {
+      this.uploadLoading = true;
+    },
+    beforeUpload1 () {
+      this.uploadLoading1 = true;
+    },
+    handleSuccess (res, file) {
+      this.uploadLoading = false;
+      this.form.licencePhoto.push(res.result);
+    },
+    handleSuccess1 (res, file) {
+      this.uploadLoading1 = false;
+      this.form.legalPhoto.push(res.result);
+      console.log(res);
+      console.log(file);
+    },
+    handleFormatError (file) {
+      this.uploadLoading = false;
+      this.uploadLoading1 = false;
+      this.$Notice.warning({
+        title: 'The file format is incorrect',
+        desc: '上传文件格式不正确'
+      });
+    },
+    handleMaxSize (file) {
+      this.uploadLoading = false;
+      this.uploadLoading1 = false;
+      this.$Notice.warning({
+        title: 'Exceeding file size limit',
+        desc: '文件大小不能超过2M'
+      });
+    },
+    uploadErr () {
+      this.uploadLoading = false;
+      this.uploadLoading1 = false;
+    },
+    handleView (item) {
+      this.previewPicture = item;
+      this.visible = true;
+    },
+    handleRemove (index, listName) {
+      this.form[listName].splice(index, 1);
+    }
+  },
+  mounted () {
+    this.accessToken.accessToken = storage.getItem('accessToken');
+    this.form = JSON.parse(JSON.stringify(this.content));
+    if (this.form.licencePhoto) {
+      this.form.legalPhoto = this.content.legalPhoto.split(',');
+      this.form.licencePhoto = this.content.licencePhoto.split(',');
+      this.address = this.form.addressIdPath;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.ivu-input-wrapper {
+  width: 300px;
+}
+.img-list {
+  display: inline-block;
+  margin: 10px;
+  width: 100px;
+  position: relative;
+  .cover {
+    display: none;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0, 0, 0, 0.6);
+    width: inherit;
+    height: inherit;
+    align-items: center;
+    justify-content: space-around;
+    i {
+      color: #fff;
+      font-size: 30px;
+      cursor: pointer;
+    }
+  }
+  &:hover .cover {
+    display: flex;
+  }
+}
+.describe {
+  font-size: 12px;
+  color: #999;
+}
+</style>
diff --git a/buyer/src/pages/shopEntry/index.vue b/buyer/src/pages/shopEntry/index.vue
new file mode 100644
index 00000000..d040f517
--- /dev/null
+++ b/buyer/src/pages/shopEntry/index.vue
@@ -0,0 +1,5 @@
+<template>
+    <div class="shop-list">
+        <Button>申请入驻</Button>
+    </div>
+</template>
diff --git a/buyer/src/pages/shopEntry/second-apply.vue b/buyer/src/pages/shopEntry/second-apply.vue
new file mode 100644
index 00000000..5f05371d
--- /dev/null
+++ b/buyer/src/pages/shopEntry/second-apply.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="photo-msg">
+    <Form ref="secondForm" :model="form" :rules="rules" :label-width="140">
+      <h4>基础信息</h4>
+      <FormItem prop="settlementBankAccountName" label="银行开户名">
+        <Input
+          type="text"
+          v-model="form.settlementBankAccountName"
+          placeholder="请填写银行开户名称"
+        />
+      </FormItem>
+      <FormItem prop="settlementBankAccountNum" label="银行账号">
+        <Input
+          type="text"
+          v-model="form.settlementBankAccountNum"
+          placeholder="请填写银行账号"
+        />
+      </FormItem>
+      <FormItem prop="settlementBankBranchName" label="开户银行支行名称">
+        <Input
+          type="text"
+          v-model="form.settlementBankBranchName"
+          placeholder="请填写开户银行支行名称"
+        />
+      </FormItem>
+      <FormItem prop="settlementBankJointName" label="支行联行号">
+        <Input
+          type="text"
+          v-model="form.settlementBankJointName"
+          placeholder="请填写支行联行号"
+        />
+      </FormItem>
+
+      <FormItem>
+        <Button @click="$emit('change', 0)">返回</Button>
+        <Button type="primary" :loading="loading" @click="next"
+          >填写其他信息</Button
+        >
+      </FormItem>
+    </Form>
+  </div>
+</template>
+<script>
+import { applySecond } from '@/api/shopentry';
+import * as RegExp from '@/plugins/RegExp.js';
+export default {
+  props: {
+    content: {
+      default: {},
+      type: Object
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      form: {},
+      rules: {
+        settlementBankAccountName: [
+          { required: true, message: '请填写银行开户名称' }
+        ],
+        settlementBankAccountNum: [
+          { required: true, message: '请填写银行账号' }
+        ],
+        settlementBankBranchName: [
+          { required: true, message: '请填写开户银行支行名称' }
+        ],
+        settlementBankJointName: [
+          { required: true, message: '请填写支行联行号' }
+        ]
+      }
+    };
+  },
+  methods: {
+    next () {
+      this.$refs.secondForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          applySecond(this.form)
+            .then((res) => {
+              this.loading = false;
+              if (res.success) this.$emit('change', 2);
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          console.log('error');
+        }
+      });
+    }
+  },
+  mounted () {
+    if (this.content != {}) {
+      this.form = JSON.parse(JSON.stringify(this.content));
+      this.$forceUpdate();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.ivu-input-wrapper {
+  width: 300px;
+}
+</style>
\ No newline at end of file
diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/shop-entry.vue
new file mode 100644
index 00000000..9645dc5e
--- /dev/null
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="shop-entry">
+    <div style="height: 20px"></div>
+    <div class="content">
+      <h3>店铺入驻</h3>
+      <Steps :current="currentIndex" size="small" class="margin">
+        <Step title="企业资质信息"></Step>
+        <Step title="财务资质信息"></Step>
+        <Step title="其他信息"></Step>
+        <Step title="提交审核"></Step>
+      </Steps>
+      <first-apply
+        v-if="currentIndex == 0 && dataReview"
+        :content="firstData"
+        @change="nextPage"
+      ></first-apply>
+
+      <second-apply
+        v-if="currentIndex == 1 && dataReview"
+        :content="secondData"
+        @change="nextPage"
+      ></second-apply>
+
+      <third-apply
+        v-if="currentIndex == 2 && dataReview"
+        :content="thirdData"
+        @change="nextPage"
+      ></third-apply>
+
+      <div class="success-page" v-if="currentIndex == 3">
+        <span v-if="storeDisable == '' || storeDisable == 'APPLYING'"
+          >入驻申请提交成功，等待平台审核</span
+        >
+        <span v-if="storeDisable == 'OPEN'">申请已通过，请联系管理员</span>
+        <span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
+      </div>
+      <Button v-if="currentIndex == 3" @click="currentIndex = 2">返回</Button>
+    </div>
+
+    <Modal
+      title="店铺入驻协议"
+      v-model="showAgreement"
+      width="1200"
+      :closable="false"
+      :mask-closable="false"
+    >
+      <div class="agreeent-con" v-html="agreementCon"></div>
+
+      <div slot="footer" style="text-align: center">
+        <p><Checkbox v-model="checked">我已同意以上协议</Checkbox></p>
+        <Button
+          type="primary"
+          :disabled="!checked"
+          class="margin"
+          @click="showAgreement = false"
+          >同意协议填写资质信息</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import { agreement, applyStatus } from '@/api/shopentry';
+import firstApply from './first-apply';
+import secondApply from './second-apply';
+import thirdApply from './third-apply';
+export default {
+  components: {
+    firstApply,
+    secondApply,
+    thirdApply
+  },
+  data () {
+    return {
+      currentIndex: 0,
+      showAgreement: false,
+      agreementCon: '',
+      checked: false,
+      applyData: {},
+      firstData: {},
+      secondData: {},
+      thirdData: {},
+      storeDisable: '', // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
+      dataReview: true
+    };
+  },
+  methods: {
+    getArticle () {
+      // 入驻协议
+      agreement().then((res) => {
+        console.log(res);
+        this.agreementCon = res.result;
+      });
+    },
+    getData () {
+      applyStatus().then((res) => {
+        if (res.success) {
+          if (!res.result) {
+            this.showAgreement = true;
+          } else {
+            this.dataReview = false;
+            let data = res.result;
+            let first = [
+              'addressIdPath',
+              'addressPath',
+              'companyAddress',
+              'companyEmail',
+              'companyName',
+              'employeeNum',
+              'legalId',
+              'legalName',
+              'licencePhoto',
+              'legalPhoto',
+              'licenseNum',
+              'linkName',
+              'linkPhone',
+              'registeredCapital',
+              'scope'
+            ];
+            let second = [
+              'settlementBankAccountName',
+              'settlementBankAccountNum',
+              'settlementBankBranchName',
+              'settlementBankJointName'
+            ];
+            let third = [
+              'goodsManagementCategory',
+              'storeCenter',
+              'storeDesc',
+              'storeLogo',
+              'storeName'
+            ];
+
+            this.storeDisable = data.storeDisable;
+
+            first.forEach((e) => {
+              this.firstData[e] = data[e];
+            });
+            second.forEach((e) => {
+              this.secondData[e] = data[e];
+            });
+            third.forEach((e) => {
+              this.thirdData[e] = data[e];
+            });
+
+            if (this.storeDisable === 'APPLY') {
+              this.currentIndex = 0;
+            } else {
+              this.currentIndex = 3;
+            }
+            this.dataReview = true;
+            this.$forceUpdate();
+          }
+        }
+      });
+    },
+    nextPage (step) {
+      this.currentIndex = step;
+    }
+  },
+  mounted () {
+    this.getData();
+  }
+};
+</script>
+<style lang="scss" scoped>
+.content {
+  width: 1200px;
+  margin: 0 auto;
+  border: 1px solid #eee;
+  min-height: 500px;
+  border-radius: 5px;
+  box-shadow: 3px 3px 10px #999;
+  background: #fff;
+  padding: 10px 20px;
+
+  h3 {
+    text-align: center;
+    margin-bottom: 10px;
+  }
+}
+
+.margin {
+  margin: 10px 0;
+}
+.agreeent-con {
+  max-height: 500px;
+}
+.success-page {
+  height: 500px;
+  width: 100%;
+  line-height: 500px;
+  text-align: center;
+  font-size: 20px;
+}
+</style>
diff --git a/buyer/src/pages/shopEntry/third-apply.vue b/buyer/src/pages/shopEntry/third-apply.vue
new file mode 100644
index 00000000..b9e272e7
--- /dev/null
+++ b/buyer/src/pages/shopEntry/third-apply.vue
@@ -0,0 +1,270 @@
+<template>
+  <div class="person-msg">
+    <Form ref="thirdForm" :model="form" :rules="rules" :label-width="140">
+      <h4>基础信息</h4>
+      <FormItem prop="storeName" label="店铺名称">
+        <Input
+          type="text"
+          v-model="form.storeName"
+          placeholder="请填写店铺名称"
+        />
+      </FormItem>
+
+      <FormItem prop="storeLogo" label="店铺logo">
+        <Upload
+          ref="uploadLogo"
+          :show-upload-list="false"
+          :on-success="handleSuccess"
+          :format="['jpg', 'jpeg', 'png', 'gif']"
+          :max-size="2048"
+          :before-upload="beforeUpload"
+          :on-format-error="handleFormatError"
+          :on-exceeded-size="handleMaxSize"
+          :on-error="uploadErr"
+          multiple
+          :action="action"
+          :headers="accessToken"
+        >
+          <Button type="info" :loading="uploadLoading">上传logo</Button>
+        </Upload>
+        <div class="describe">请压缩图片在2M以内，格式为gif，jpg，png</div>
+        <div
+          class="img-list"
+          v-for="(item, index) in form.storeLogo"
+          :key="index"
+        >
+          <img :src="item" width="100" height="" alt="" />
+          <div class="cover">
+            <Icon
+              type="ios-eye-outline"
+              @click.native="handleView(item)"
+            ></Icon>
+            <Icon
+              type="ios-trash-outline"
+              @click.native="handleRemove(index, 'storeLogo')"
+            ></Icon>
+          </div>
+        </div>
+      </FormItem>
+      <FormItem prop="goodsManagementCategory" label="店铺经营类目">
+        <Select
+          v-model="form.goodsManagementCategory"
+          multiple
+          style="width: 300px"
+        >
+          <Option
+            v-for="item in categoryList"
+            :value="item.id"
+            :key="item.id"
+            >{{ item.name }}</Option
+          >
+        </Select>
+      </FormItem>
+      <FormItem prop="storeCenter" label="经纬度">
+        <Input
+          type="text"
+          v-model="form.storeCenter"
+          readonly
+          placeholder="点击右侧按钮选择店铺位置"
+        />
+        <Button
+          icon="ios-locate-outline"
+          @click="$refs.liliMap.showMap = true"
+        ></Button>
+      </FormItem>
+      <FormItem prop="storeDesc" label="店铺简介">
+        <Input
+          type="textarea"
+          v-model="form.storeDesc"
+          maxlength="300"
+          show-word-limit
+          :rows="4"
+          placeholder="请输入店铺简介"
+        />
+      </FormItem>
+
+      <FormItem>
+        <Button @click="$emit('change', 1)">返回</Button>
+        <Button type="primary" :loading="loading" @click="next"
+          >提交平台审核</Button
+        >
+      </FormItem>
+    </Form>
+    <Modal title="View Image" v-model="visible">
+      <img :src="previewPicture" v-if="visible" style="width: 100%" />
+    </Modal>
+    <lili-map ref="liliMap" @getAddress="getAddress" :useApi="false"></lili-map>
+  </div>
+</template>
+<script>
+import { applyThird } from '@/api/shopentry';
+import { getCategory } from '@/api/goods';
+import * as RegExp from '@/plugins/RegExp.js';
+import Map from '@/components/map/index';
+import storage from '@/plugins/storage';
+import { commonUrl } from '@/plugins/request.js';
+export default {
+  props: {
+    content: {
+      default: {},
+      type: Object
+    }
+  },
+  components: { liliMap: Map },
+  data () {
+    return {
+      loading: false,
+      uploadLoading: false,
+      action: commonUrl + '/common/upload/file',
+      accessToken: {},
+      previewPicture: '',
+      visible: false,
+      form: {
+        storeLogo: []
+      },
+      rules: {
+        goodsManagementCategory: [
+          { required: true, message: '请选择店铺经营类目' }
+        ],
+        storeName: [{ required: true, message: '请填写店铺名称' }],
+        storeLogo: [{ required: true, message: '请上传店铺logo' }],
+        storeDesc: [{ required: true, message: '请填写店铺简介' }],
+        storeCenter: [{ required: true, message: '请选择店铺位置' }]
+      },
+      categoryList: []
+    };
+  },
+  methods: {
+    next () {
+      this.$refs.thirdForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.storeLogo = this.form.storeLogo.toString();
+          params.goodsManagementCategory = this.form.goodsManagementCategory.toString();
+          applyThird(params)
+            .then((res) => {
+              this.loading = false;
+              if (res.success) this.$emit('change', 3);
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          console.log('error');
+        }
+      });
+    },
+    beforeUpload () {
+      this.uploadLoading = true;
+    },
+
+    handleSuccess (res, file) {
+      this.uploadLoading = false;
+      this.form.storeLogo.push(res.result);
+    },
+
+    handleFormatError (file) {
+      this.uploadLoading = false;
+      this.$Notice.warning({
+        title: 'The file format is incorrect',
+        desc: '上传文件格式不正确'
+      });
+    },
+    handleMaxSize (file) {
+      this.uploadLoading = false;
+      this.$Notice.warning({
+        title: 'Exceeding file size limit',
+        desc: '文件大小不能超过2M'
+      })
+    },
+    uploadErr () {
+      this.uploadLoading = false;
+    },
+    handleView (item) {
+      this.previewPicture = item;
+      this.visible = true;
+    },
+    handleRemove (index, listName) {
+      this.form[listName].splice(index, 1);
+    },
+    getAddress (item) {
+      console.log(item);
+      this.$set(
+        this.form,
+        'storeCenter',
+        item.position.lng + ',' + item.position.lat
+      );
+    },
+    getCategoryList () {
+      getCategory(0).then((res) => {
+        if (res.success) this.categoryList = res.result;
+      });
+    }
+  },
+  mounted () {
+    this.accessToken.accessToken = storage.getItem('accessToken');
+    this.getCategoryList();
+    if (this.content != {}) {
+      this.form = JSON.parse(JSON.stringify(this.content));
+      if (this.form.storeLogo) {
+        this.form.storeLogo = this.content.storeLogo.split(',');
+        this.form.goodsManagementCategory = this.content.goodsManagementCategory.split(
+          ','
+        );
+      } else {
+        this.form.storeLogo = [];
+      }
+      this.$forceUpdate();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.ivu-input-wrapper {
+  width: 300px;
+}
+.img-list {
+  display: inline-block;
+  margin: 10px;
+  width: 100px;
+  height: auto;
+  position: relative;
+  .cover {
+    display: none;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0, 0, 0, 0.6);
+    width: inherit;
+    height: inherit;
+    align-items: center;
+    justify-content: space-around;
+    i {
+      color: #fff;
+      font-size: 30px;
+      cursor: pointer;
+    }
+  }
+  &:hover .cover {
+    display: flex;
+  }
+}
+.describe {
+  font-size: 12px;
+  color: #999;
+}
+</style>
diff --git a/buyer/src/pages/signUp/CheckPhone.vue b/buyer/src/pages/signUp/CheckPhone.vue
new file mode 100644
index 00000000..553b0027
--- /dev/null
+++ b/buyer/src/pages/signUp/CheckPhone.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="info-form">
+    <Form ref="formValidate" :model="formValidate" :label-width="80" :rules="ruleValidate">
+      <FormItem label="手机号" prop="phone">
+          <i-input v-model="formValidate.phone" clearable size="large"  placeholder="请输入手机号"></i-input>
+      </FormItem>
+      <FormItem label="验证码" prop="checkNum">
+          <i-input v-model="formValidate.checkNum" size="large"  placeholder="请输入验证码">
+            <Button slot="append" @click="getcheckNum">获取验证码</Button>
+          </i-input>
+      </FormItem>
+      <Button type="error" size="large" long @click="handleSubmit('formValidate')">验证手机号</Button>
+    </Form>
+  </div>
+</template>
+
+<script>
+import store from '@/vuex/store';
+import { mapMutations } from 'vuex';
+export default {
+  name: 'CheckPhone',
+  data () {
+    return {
+      formValidate: {
+        phone: '',
+        checkNum: ''
+      },
+      ruleValidate: {
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+          { type: 'string', pattern: /^1[3|4|5|7|8][0-9]{9}$/, message: '手机号格式出错', trigger: 'blur' }
+        ],
+        checkNum: [
+          { required: true, message: '必须填写验证码', trigger: 'blur' },
+          { type: 'string', min: 4, max: 4, message: '验证码长度错误', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  methods: {
+    ...mapMutations(['SET_SIGN_UP_SETP']),
+    getcheckNum () {
+      if (this.formValidate.phone.length === 11) {
+        this.$Message.success({
+          content: '验证码为: 1234',
+          duration: 6,
+          closable: true
+        });
+      } else {
+        this.$Message.error({
+          content: '请输入正确的手机号',
+          duration: 6,
+          closable: true
+        });
+      }
+    },
+    handleSubmit (name) { // 提交验证
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          this.$router.push({ path: '/SignUp/inputInfo', query: { phone: this.formValidate.phone } });
+          this.SET_SIGN_UP_SETP(1);
+        } else {
+          this.$Message.error({
+            content: '请填写正确的信息',
+            duration: 6,
+            closable: true
+          });
+        }
+      });
+    }
+  },
+  store
+};
+</script>
+
+<style scoped>
+.info-form {
+  width: 90% !important;
+}
+</style>
diff --git a/buyer/src/pages/signUp/InputInfo.vue b/buyer/src/pages/signUp/InputInfo.vue
new file mode 100644
index 00000000..772c37d1
--- /dev/null
+++ b/buyer/src/pages/signUp/InputInfo.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="info-form">
+     <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" >
+        <FormItem label="用户名" prop="name">
+            <i-input v-model="formValidate.name" clearable size="large" placeholder="请输入你的姓名"></i-input>
+        </FormItem>
+        <FormItem label="邮箱" prop="mail">
+            <i-input v-model="formValidate.mail" clearable size="large" placeholder="请输入你的邮箱"></i-input>
+        </FormItem>
+        <FormItem label="密码" prop="password">
+            <i-input type="password" v-model="formValidate.password" clearable size="large" placeholder="请输入你的密码"></i-input>
+        </FormItem>
+        <FormItem label="确认密码" prop="repassword">
+            <i-input type="password" v-model="formValidate.repassword" clearable size="large" placeholder="请再次输入你的密码"></i-input>
+        </FormItem>
+        <Button type="error" size="large" long @click="handleSubmit('formValidate')">注册</Button>
+    </Form>
+  </div>
+</template>
+
+<script>
+import store from '@/vuex/store';
+import { mapMutations, mapActions } from 'vuex';
+export default {
+  name: 'InputInfo',
+  data () {
+    const validatePassCheck = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.formValidate.password) {
+        callback(new Error('两次输入的密码不一样'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      formValidate: {
+        name: '',
+        mail: '',
+        password: '',
+        repassword: ''
+      },
+      ruleValidate: {
+        name: [
+          { required: true, message: '用户名不能为空', trigger: 'blur' }
+        ],
+        mail: [
+          { required: true, message: '邮箱不能为空', trigger: 'blur' },
+          { type: 'email', message: '邮箱格式错误', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '密码不能为空', trigger: 'blur' },
+          { type: 'string', min: 6, message: '密码长度不能小于6', trigger: 'blur' }
+        ],
+        repassword: [
+          { validator: validatePassCheck, trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  methods: {
+    ...mapMutations(['SET_SIGN_UP_SETP']),
+    ...mapActions(['addSignUpUser']),
+    handleSubmit (name) {
+      const father = this;
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          this.$Message.success('注册成功');
+          const userinfo = {
+            username: this.formValidate.name,
+            password: this.formValidate.password,
+            mail: this.formValidate.mail,
+            phone: this.$route.query.phone
+          };
+          this.addSignUpUser(userinfo);
+          father.SET_SIGN_UP_SETP(2);
+          this.$router.push({ path: '/SignUp/signUpDone' });
+        } else {
+          this.$Message.error('注册失败');
+        }
+      });
+    }
+  },
+  store
+};
+</script>
+
+<style scoped>
+.info-form {
+  width: 90% !important;
+}
+</style>
diff --git a/buyer/src/pages/signUp/SignUpDone.vue b/buyer/src/pages/signUp/SignUpDone.vue
new file mode 100644
index 00000000..d4fc24c0
--- /dev/null
+++ b/buyer/src/pages/signUp/SignUpDone.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="container">
+    <p><Icon type="ios-checkmark-outline"></Icon></p>
+    <router-link to="/login"><Button type="success" size="large" long class="btn-success">注册成功</Button></router-link>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SignUpDone'
+};
+</script>
+
+<style scoped>
+.container {
+  width: 100%;
+  text-align: center;
+}
+.container p {
+  font-size: 90px;
+  color: #2d8cf0;
+  text-align: center;
+}
+.btn-success {
+  margin-top: 30px;
+}
+</style>
diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue
new file mode 100644
index 00000000..78989131
--- /dev/null
+++ b/buyer/src/pages/user/Home.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <BaseHeader></BaseHeader>
+
+    <div class="container width_1200">
+      <Layout class="layoutAll">
+        <Sider class="side-bar" ref="side" :collapsed-width="78">
+          <Menu
+            class="side-menu"
+            theme="light"
+            width="auto"
+            :active-name="$route.name"
+            :open-names="['订单中心', '会员中心', '账户中心']"
+            @on-select="onSelect"
+          >
+            <div class="user-icon">
+              <div class="user-img">
+                <img :src="userInfo.face" />
+              </div>
+              <p>{{userInfo.username | secrecyMobile}}</p>
+            </div>
+
+            <!--   循环导航栏       -->
+            <Submenu
+              v-for="(menu, index) in menuList"
+              :key="index"
+              :name="menu.title"
+            >
+              <template slot="title" v-if="menu.display">
+                <Icon type="location"></Icon>
+                <span>{{ menu.title }}</span>
+              </template>
+              <MenuItem
+                v-for="(chlidren, i) in menu.menus"
+                :key="i"
+                :name="chlidren.path"
+                >{{ chlidren.title }}</MenuItem
+              >
+            </Submenu>
+
+          </Menu>
+        </Sider>
+        <Layout class="layout ml_10">
+          <Content class="content">
+            <transition mode="out-in">
+              <router-view></router-view>
+            </transition>
+          </Content>
+        </Layout>
+      </Layout>
+    </div>
+  </div>
+</template>
+
+<script>
+import menuList from './menu';
+import Storage from '@/plugins/storage.js';
+
+export default {
+  name: 'Home',
+  data () {
+    return {
+      menuList
+    };
+  },
+  computed: {
+    userInfo () {
+      return JSON.parse(Storage.getItem('userInfo'));
+    }
+  },
+
+  methods: {
+    // 每次点击左侧bar的callback
+    onSelect (name) {
+      this.$router.push({name: name});
+    },
+    // 跳转到个人中心的首页
+    toUserMain () {
+      this.$router.push(`/home`);
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.content {
+  padding: 15px 50px;
+}
+
+.header {
+  @include background_color($light_background_color);
+}
+
+.side-menu,
+.side-bar,
+.content {
+  @include white_background_color();
+  @include title_color($light_title_color);
+}
+
+.side-bar {
+  min-height: 600px;
+  height: auto;
+}
+
+.layoutAll {
+  min-height: 1200px;
+  @include background_color($light_background_color);
+}
+
+.container {
+  margin: 0 auto;
+  padding: 20px 0;
+}
+
+.side-bar a {
+  @include title_color($light_title_color);
+}
+
+.user-icon {
+  height: 200px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.user-icon span {
+  font-size: 96px;
+}
+
+.user-img {
+  margin-bottom: 15px;
+  width: 96px;
+  height: 96px;
+  border-radius: 48px;
+  overflow: hidden;
+}
+
+.user-img img {
+  width: 100%;
+}
+
+.layout-footer-center {
+  padding: 0px 15px;
+
+  padding-bottom: 15px;
+  text-align: center;
+}
+</style>
diff --git a/buyer/src/pages/user/menu.js b/buyer/src/pages/user/menu.js
new file mode 100644
index 00000000..78c3c093
--- /dev/null
+++ b/buyer/src/pages/user/menu.js
@@ -0,0 +1,166 @@
+//  * icon  图标
+//  * title 一级菜单
+//  * display 是否显示菜单
+//  * menus 菜单栏
+//  * path路径  router 配置的
+
+// 订单中心
+const order = [{
+  icon: '',
+  title: '订单中心',
+  menus: [{
+    icon: '',
+    title: '我的订单',
+    path: 'MyOrder'
+  },
+  {
+    icon: '',
+    title: '收货地址',
+    path: 'MyAddress'
+  },
+  {
+    icon: '',
+    title: '售后订单',
+    path: 'AfterSale'
+  }
+  ],
+  display: true
+}];
+
+// 会员中心
+const member = [{
+  icon: '',
+  title: '会员中心',
+  menus: [{
+    icon: '',
+    title: '用户信息',
+    path: 'Profile'
+  },
+  {
+    icon: '',
+    title: '账户安全',
+    path: 'AccountSafe'
+  },
+  {
+    icon: '',
+    title: '我的足迹',
+    path: 'MyTracks'
+  },
+
+  {
+    icon: '',
+    title: '我的收藏',
+    path: 'Favorites'
+  },
+  {
+    icon: '',
+    title: '分销推荐',
+    path: 'Distribution'
+  },
+  {
+    icon: '',
+    title: '我的评论',
+    path: 'CommentList'
+  },
+  {
+    icon: '',
+    title: '我的投诉',
+    path: 'ComplainList'
+  },
+  {
+    icon: '',
+    title: '我的积分',
+    path: 'Point'
+  }
+  ],
+  display: true
+}];
+
+// 账户中心
+const user = [{
+  icon: '',
+  title: '账户中心',
+  menus: [{
+    icon: '',
+    title: '我的优惠券',
+    path: 'Coupons'
+  },
+  {
+    icon: '',
+    title: '资金管理',
+    path: 'MoneyManagement'
+  }],
+  display: true
+}]
+
+// 活动中心
+// const activity = [{
+//   icon: '',
+//   title: '活动中心',
+//   menus: [
+//     // {
+//     //   icon: '',
+//     //   title: '拍卖活动',
+//     //   path: 'MyOrder',
+//     // },
+//     // {
+//     //   icon: '',
+//     //   title: '夺宝奇兵',
+//     //   path: 'MyOrder',
+//     // },
+//   ],
+//   display: true
+// }]
+
+// 批发中心
+// const wholesale = [
+//   {
+//     icon: '',
+//     title: '批发中心',
+//     menus: [
+//       {
+//         icon: '',
+//         title: '我的采购单',
+//         path: 'MyOrder',
+//       },
+//       {
+//         icon: '',
+//         title: '采购退货单',
+//         path: 'MyOrder',
+//       },
+//       {
+//         icon: '',
+//         title: '我的求购单',
+//         path: 'MyOrder',
+//       },
+//
+//     ],
+//     display: true
+//   }
+// ]
+
+// 店铺
+// const shop = [
+//   {
+//     icon: '',
+//     title: '店铺管理',
+//     menus: [
+//       {
+//         icon: '',
+//         title: '店铺后台',
+//         path: 'MyOrder',
+//       },
+//       {
+//         icon: '',
+//         title: '商家等级',
+//         path: 'MyOrder',
+//       },
+//     ],
+//     display: true
+//   }
+// ]
+// wholesale[0], shop[0]
+let menuList = []
+menuList.push(order[0], member[0], user[0])
+
+export default menuList
diff --git a/buyer/src/plugins/Foundation.js b/buyer/src/plugins/Foundation.js
new file mode 100644
index 00000000..72490aac
--- /dev/null
+++ b/buyer/src/plugins/Foundation.js
@@ -0,0 +1,132 @@
+/**
+ * 一些常用的基础方法
+ * unixToDate    将unix时间戳转换为指定格式
+ * dateToUnix    将时间转unix时间戳
+ * deepClone     对一个对象进行深拷贝
+ * formatPrice   货币格式化
+ * secrecyMobile 手机号隐私保护
+ * randomString  随机生成指定长度的字符串
+ */
+
+/**
+ * 将unix时间戳转换为指定格式
+ * @param unix   时间戳【秒】
+ * @param format 转换格式
+ * @returns {*|string}
+ */
+function unixToDate (unix, format) {
+  if (!unix) return unix
+  let _format = format || 'yyyy-MM-dd hh:mm:ss'
+  const d = new Date(unix)
+  const o = {
+    'M+': d.getMonth() + 1,
+    'd+': d.getDate(),
+    'h+': d.getHours(),
+    'm+': d.getMinutes(),
+    's+': d.getSeconds(),
+    'q+': Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
+  }
+  if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (const k in o)
+    if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) :
+      (('00' + o[k]).substr(('' + o[k]).length)))
+  return _format
+}
+
+/**
+ * 将时间转unix时间戳
+ * @param date
+ * @returns {number} 【秒】
+ */
+function dateToUnix (date) {
+  let newStr = date.replace(/:/g, '-')
+  newStr = newStr.replace(/ /g, '-')
+  const arr = newStr.split('-')
+  const datum = new Date(Date.UTC(
+    arr[0],
+    arr[1] - 1,
+    arr[2],
+    arr[3] - 8 || -8,
+    arr[4] || 0,
+    arr[5] || 0
+  ))
+  return parseInt(datum.getTime() / 1000)
+}
+
+/**
+ * 货币格式化
+ * @param price
+ * @returns {string}
+ */
+function formatPrice (price) {
+  if (typeof price !== 'number') return price
+  return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+}
+
+/**
+ * 手机号隐私保护
+ * 隐藏中间四位数字
+ * @param mobile
+ * @returns {*}
+ */
+function secrecyMobile (mobile) {
+  mobile = String(mobile)
+  if (!/\d{11}/.test(mobile)) {
+    return mobile
+  }
+  return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+}
+
+/**
+ * 随机生成指定长度的字符串
+ * @param length
+ * @returns {string}
+ */
+function randomString (length = 32) {
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+  const maxPos = chars.length
+  let _string = ''
+  for (let i = 0; i < length; i++) {
+    _string += chars.charAt(Math.floor(Math.random() * maxPos))
+  }
+  return _string
+}
+
+/**
+ * 计算传秒数的倒计时【天、时、分、秒】
+ * @param seconds
+ * @returns {{day : *, hours : *, minutes : *, seconds : *}}
+ */
+
+function countTimeDown (seconds) {
+  const leftTime = (time) => {
+    if (time < 10) time = '0' + time
+    return time + ''
+  }
+  return {
+    day: leftTime(parseInt(seconds / 60 / 60 / 24, 10)),
+    hours: leftTime(parseInt(seconds / 60 / 60 % 24, 10)),
+    minutes: leftTime(parseInt(seconds / 60 % 60, 10)),
+    seconds: leftTime(parseInt(seconds % 60, 10))
+  }
+}
+
+/**
+ * 计算当前时间到第二天0点的倒计时[秒]
+ * @returns {number}
+ */
+function theNextDayTime () {
+  const nowDate = new Date()
+  const time = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate() + 1, 0, 0, 0).getTime() - nowDate.getTime()
+  return parseInt(time / 1000)
+}
+export {
+  unixToDate,
+  dateToUnix,
+  formatPrice,
+  secrecyMobile,
+  randomString,
+  countTimeDown,
+  theNextDayTime
+}
diff --git a/buyer/src/plugins/RegExp.js b/buyer/src/plugins/RegExp.js
new file mode 100644
index 00000000..700ecaca
--- /dev/null
+++ b/buyer/src/plugins/RegExp.js
@@ -0,0 +1,50 @@
+/**
+ * 各种正则表达式
+ * mobile   手机号
+ * email    电子邮箱
+ * password 密码【6-20位】
+ * integer  正整数【不包含0】
+ * money    金钱
+ * TINumber 纳税识别号
+ * IDCard   身份证
+ * userName 账户名称【汉字、字母、数字、“-”、“_”的组合】
+ * URL      URL
+ * TEL      固定电话
+ */
+
+// 手机号
+export const mobile = /^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/;
+
+// 电子邮箱
+export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+
+// 密码【6-20位】
+export const password = /^[@A-Za-z0-9!#$%^&*.~,]{6,20}$/;
+
+// 正整数【不包含0】
+export const integer = /^[1-9]\d*$/;
+
+// 正整数【包含0】
+export const Integer = /^[0-9]\d*$/;
+
+// 金钱
+export const money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+
+// 纳税识别号
+export const TINumber = /^((\d{6}[0-9A-Z]{9})|([0-9A-Za-z]{2}\d{6}[0-9A-Za-z]{10,12}))$/;
+
+// 身份证
+export const IDCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+
+// 账户名称【汉字、字母、数字、“-”、“_”的组合】
+export const userName = /[A-Za-z0-9_\-\u4e00-\u9fa5]$/;
+
+// URL
+export const URL =
+  /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+
+// 固话
+export const TEL = /0\d{2,3}-\d{7,8}/;
+
+// 营业执照号
+export const licenseNum = /(^(?:(?![IOZSV])[\dA-Z]){2}\d{6}(?:(?![IOZSV])[\dA-Z]){10}$)|(^\d{15}$)/;
diff --git a/buyer/src/plugins/filters.js b/buyer/src/plugins/filters.js
new file mode 100644
index 00000000..1a516714
--- /dev/null
+++ b/buyer/src/plugins/filters.js
@@ -0,0 +1,122 @@
+import * as Foundation from './Foundation.js';
+
+/**
+ * 金钱单位置换  2999 --> 2,999.00
+ * @param val
+ * @param unit
+ * @param location
+ * @returns {*}
+ */
+export function unitPrice (val, unit, location) {
+  if (!val) val = 0;
+  let price = Foundation.formatPrice(val);
+  if (location === 'before') {
+    return price.substr(0, price.length - 3);
+  }
+  if (location === 'after') {
+    return price.substr(-2);
+  }
+  return (unit || '') + price;
+}
+
+/**
+ * 处理unix时间戳，转换为可阅读时间格式
+ * @param unix
+ * @param format
+ * @returns {*|string}
+ */
+export function unixToDate (unix, format) {
+  if (!unix) return '';
+  let _format = format || 'yyyy-MM-dd hh:mm:ss';
+  const d = new Date(unix * 1000);
+  const o = {
+    'M+': d.getMonth() + 1,
+    'd+': d.getDate(),
+    'h+': d.getHours(),
+    'm+': d.getMinutes(),
+    's+': d.getSeconds(),
+    'q+': Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
+  };
+  if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
+  for (const k in o) {
+    if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+  };
+  return _format;
+}
+
+/**
+ * 替换地址栏 逗号分隔为空格分隔
+ */
+export function unitAddress (val) {
+  if (!val) return '';
+  return val.replace(/,/g, ' ');
+}
+
+export function pointStatus (status) {
+  switch (status) {
+    case 'COMPLETE':
+      return '已成交';
+    case 'WITHDRAW':
+      return '已撤回';
+    case 'DEALING':
+      return '交易中';
+    case 'AUDITING':
+      return '待审核';
+    case 'NODEAL':
+      return '未成交';
+    case 'CANCEL':
+      return '已取消';
+  }
+};
+
+/**
+ * 根据订单状态码返回订单状态
+ * @param status_code
+ * @returns {string}
+ */
+export function unixOrderStatus (statusCode) {
+  switch (statusCode) {
+    case 'NEW':
+      return '新订单';
+    case 'INTODB_ERROR':
+      return '入库失败';
+    case 'CONFIRM':
+      return '已确认';
+    case 'PAID_OFF':
+      return '已付款';
+    case 'SHIPPED':
+      return '已发货';
+    case 'ROG':
+      return '已收货';
+    case 'COMPLETE':
+      return '已完成';
+    case 'CANCELLED':
+      return '已取消';
+    case 'AFTER_SERVICE':
+      return '售后中';
+  }
+}
+
+/**
+ * 13888888888 -> 138****8888
+ * @param mobile
+ * @returns {*}
+ */
+export function secrecyMobile (mobile) {
+  mobile = String(mobile);
+  if (!/\d{11}/.test(mobile)) {
+    return mobile;
+  }
+  return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3');
+}
+
+/**
+ * 格式化货品的规格
+ * @param sku
+ * @returns {*}
+ */
+export function formatterSkuSpec (sku) {
+  if (!sku.spec_list || !sku.spec_list.length) return '';
+  return sku.spec_list.map(spec => spec.spec_value).join(' - ');
+}
diff --git a/buyer/src/plugins/md5.js b/buyer/src/plugins/md5.js
new file mode 100644
index 00000000..e5741303
--- /dev/null
+++ b/buyer/src/plugins/md5.js
@@ -0,0 +1,223 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 1.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Code also contributed by Greg Holt
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y) {
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF)
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+  return (msw << 16) | (lsw & 0xFFFF)
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function rol(num, cnt) {
+  return (num << cnt) | (num >>> (32 - cnt))
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function cmn(q, a, b, x, s, t) {
+  return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)
+}
+
+function ff(a, b, c, d, x, s, t) {
+  return cmn((b & c) | ((~b) & d), a, b, x, s, t)
+}
+
+function gg(a, b, c, d, x, s, t) {
+  return cmn((b & d) | (c & (~d)), a, b, x, s, t)
+}
+
+function hh(a, b, c, d, x, s, t) {
+  return cmn(b ^ c ^ d, a, b, x, s, t)
+}
+
+function ii(a, b, c, d, x, s, t) {
+  return cmn(c ^ (b | (~d)), a, b, x, s, t)
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, producing an array
+ * of little-endian words.
+ */
+function coreMD5(x) {
+  var a = 1732584193
+  var b = -271733879
+  var c = -1732584194
+  var d = 271733878
+
+  for (var i = 0; i < x.length; i += 16) {
+    var olda = a
+    var oldb = b
+    var oldc = c
+    var oldd = d
+
+    a = ff(a, b, c, d, x[i + 0], 7, -680876936)
+    d = ff(d, a, b, c, x[i + 1], 12, -389564586)
+    c = ff(c, d, a, b, x[i + 2], 17, 606105819)
+    b = ff(b, c, d, a, x[i + 3], 22, -1044525330)
+    a = ff(a, b, c, d, x[i + 4], 7, -176418897)
+    d = ff(d, a, b, c, x[i + 5], 12, 1200080426)
+    c = ff(c, d, a, b, x[i + 6], 17, -1473231341)
+    b = ff(b, c, d, a, x[i + 7], 22, -45705983)
+    a = ff(a, b, c, d, x[i + 8], 7, 1770035416)
+    d = ff(d, a, b, c, x[i + 9], 12, -1958414417)
+    c = ff(c, d, a, b, x[i + 10], 17, -42063)
+    b = ff(b, c, d, a, x[i + 11], 22, -1990404162)
+    a = ff(a, b, c, d, x[i + 12], 7, 1804603682)
+    d = ff(d, a, b, c, x[i + 13], 12, -40341101)
+    c = ff(c, d, a, b, x[i + 14], 17, -1502002290)
+    b = ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+    a = gg(a, b, c, d, x[i + 1], 5, -165796510)
+    d = gg(d, a, b, c, x[i + 6], 9, -1069501632)
+    c = gg(c, d, a, b, x[i + 11], 14, 643717713)
+    b = gg(b, c, d, a, x[i + 0], 20, -373897302)
+    a = gg(a, b, c, d, x[i + 5], 5, -701558691)
+    d = gg(d, a, b, c, x[i + 10], 9, 38016083)
+    c = gg(c, d, a, b, x[i + 15], 14, -660478335)
+    b = gg(b, c, d, a, x[i + 4], 20, -405537848)
+    a = gg(a, b, c, d, x[i + 9], 5, 568446438)
+    d = gg(d, a, b, c, x[i + 14], 9, -1019803690)
+    c = gg(c, d, a, b, x[i + 3], 14, -187363961)
+    b = gg(b, c, d, a, x[i + 8], 20, 1163531501)
+    a = gg(a, b, c, d, x[i + 13], 5, -1444681467)
+    d = gg(d, a, b, c, x[i + 2], 9, -51403784)
+    c = gg(c, d, a, b, x[i + 7], 14, 1735328473)
+    b = gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+    a = hh(a, b, c, d, x[i + 5], 4, -378558)
+    d = hh(d, a, b, c, x[i + 8], 11, -2022574463)
+    c = hh(c, d, a, b, x[i + 11], 16, 1839030562)
+    b = hh(b, c, d, a, x[i + 14], 23, -35309556)
+    a = hh(a, b, c, d, x[i + 1], 4, -1530992060)
+    d = hh(d, a, b, c, x[i + 4], 11, 1272893353)
+    c = hh(c, d, a, b, x[i + 7], 16, -155497632)
+    b = hh(b, c, d, a, x[i + 10], 23, -1094730640)
+    a = hh(a, b, c, d, x[i + 13], 4, 681279174)
+    d = hh(d, a, b, c, x[i + 0], 11, -358537222)
+    c = hh(c, d, a, b, x[i + 3], 16, -722521979)
+    b = hh(b, c, d, a, x[i + 6], 23, 76029189)
+    a = hh(a, b, c, d, x[i + 9], 4, -640364487)
+    d = hh(d, a, b, c, x[i + 12], 11, -421815835)
+    c = hh(c, d, a, b, x[i + 15], 16, 530742520)
+    b = hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+    a = ii(a, b, c, d, x[i + 0], 6, -198630844)
+    d = ii(d, a, b, c, x[i + 7], 10, 1126891415)
+    c = ii(c, d, a, b, x[i + 14], 15, -1416354905)
+    b = ii(b, c, d, a, x[i + 5], 21, -57434055)
+    a = ii(a, b, c, d, x[i + 12], 6, 1700485571)
+    d = ii(d, a, b, c, x[i + 3], 10, -1894986606)
+    c = ii(c, d, a, b, x[i + 10], 15, -1051523)
+    b = ii(b, c, d, a, x[i + 1], 21, -2054922799)
+    a = ii(a, b, c, d, x[i + 8], 6, 1873313359)
+    d = ii(d, a, b, c, x[i + 15], 10, -30611744)
+    c = ii(c, d, a, b, x[i + 6], 15, -1560198380)
+    b = ii(b, c, d, a, x[i + 13], 21, 1309151649)
+    a = ii(a, b, c, d, x[i + 4], 6, -145523070)
+    d = ii(d, a, b, c, x[i + 11], 10, -1120210379)
+    c = ii(c, d, a, b, x[i + 2], 15, 718787259)
+    b = ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+    a = safe_add(a, olda)
+    b = safe_add(b, oldb)
+    c = safe_add(c, oldc)
+    d = safe_add(d, oldd)
+  }
+  return [a, b, c, d]
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray) {
+  var hex_tab = "0123456789abcdef"
+  var str = ""
+  for (var i = 0; i < binarray.length * 4; i++) {
+    str += hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xF) +
+      hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xF)
+  }
+  return str
+}
+
+/*
+ * Convert an array of little-endian words to a base64 encoded string.
+ */
+function binl2b64(binarray) {
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+  var str = ""
+  for (var i = 0; i < binarray.length * 32; i += 6) {
+    str += tab.charAt(((binarray[i >> 5] << (i % 32)) & 0x3F) |
+      ((binarray[i >> 5 + 1] >> (32 - i % 32)) & 0x3F))
+  }
+  return str
+}
+
+/*
+ * Convert an 8-bit character string to a sequence of 16-word blocks, stored
+ * as an array, and append appropriate padding for MD4/5 calculation.
+ * If any of the characters are >255, the high byte is silently ignored.
+ */
+function str2binl(str) {
+  var nblk = ((str.length + 8) >> 6) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 2] |= (str.charCodeAt(i) & 0xFF) << ((i % 4) * 8)
+  blks[i >> 2] |= 0x80 << ((i % 4) * 8)
+  blks[nblk * 16 - 2] = str.length * 8
+  return blks
+}
+
+/*
+ * Convert a wide-character string to a sequence of 16-word blocks, stored as
+ * an array, and append appropriate padding for MD4/5 calculation.
+ */
+function strw2binl(str) {
+  var nblk = ((str.length + 4) >> 5) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 1] |= str.charCodeAt(i) << ((i % 2) * 16)
+  blks[i >> 1] |= 0x80 << ((i % 2) * 16)
+  blks[nblk * 16 - 2] = str.length * 16
+  return blks
+}
+
+/*
+ * External interface
+ */
+function hexMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+function hexMD5w(str) {
+  return binl2hex(coreMD5(strw2binl(str)))
+}
+
+function b64MD5(str) {
+  return binl2b64(coreMD5(str2binl(str)))
+}
+
+function b64MD5w(str) {
+  return binl2b64(coreMD5(strw2binl(str)))
+}
+/* Backward compatibility */
+function calcMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+module.exports = {
+  md5: hexMD5
+}
diff --git a/buyer/src/plugins/mock.js b/buyer/src/plugins/mock.js
new file mode 100644
index 00000000..e69de29b
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
new file mode 100644
index 00000000..383b5098
--- /dev/null
+++ b/buyer/src/plugins/request.js
@@ -0,0 +1,203 @@
+// import Vue from 'vue';
+import axios from 'axios';
+import https from 'https';
+import {
+  Message,
+  Spin,
+  Modal
+} from 'view-design';
+import Storage from './storage';
+import config from '@/config';
+import router from '../router/index.js';
+import {
+  handleRefreshToken
+} from '@/api/index';
+const qs = require('qs');
+
+export const buyerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.buyer : config.api_prod.buyer);
+export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common);
+export const managerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager);
+export const sellerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller);
+// 创建axios实例
+var isRefreshToken = 0;
+const refreshToken = getTokenDebounce()
+const service = axios.create({
+  timeout: 10000, // 请求超时时间
+  baseURL: buyerUrl, // API
+  httpsAgent: new https.Agent({
+    rejectUnauthorized: false
+  }),
+  paramsSerializer: params => qs.stringify(params, {
+    arrayFormat: 'repeat'
+  })
+});
+
+// request拦截器
+service.interceptors.request.use(config => {
+  const {
+    loading
+  } = config;
+  // 如果是put/post请求，用qs.stringify序列化参数
+  const isPutPost = config.method === 'put' || config.method === 'post';
+  const isJson = config.headers['Content-Type'] === 'application/json';
+  const isFile = config.headers['Content-Type'] === 'multipart/form-data';
+  if (isPutPost && isJson) {
+    config.data = JSON.stringify(config.data);
+  }
+  if (isPutPost && !isFile && !isJson) {
+    config.data = qs.stringify(config.data, {
+      arrayFormat: 'repeat'
+    });
+  }
+  /** 配置全屏加载 */
+  if (process.client && loading !== false) {
+    config.loading = Spin.show();
+  }
+
+  const uuid = Storage.getItem('uuid');
+  config.headers['uuid'] = uuid;
+
+  // 获取访问Token
+  let accessToken = Storage.getItem('accessToken');
+  if (accessToken && config.needToken) {
+    config.headers['accessToken'] = accessToken;
+  }
+  return config;
+}, error => {
+  Promise.reject(error);
+});
+
+// respone拦截器
+service.interceptors.response.use(
+  async response => {
+    await closeLoading(response);
+    return response.data;
+  },
+  async error => {
+    if (process.server) return Promise.reject(error);
+    await closeLoading(error);
+    const errorResponse = error.response || {};
+    const errorData = errorResponse.data || {};
+
+    if (errorResponse.status === 403) {
+
+      isRefreshToken++;
+
+      if (isRefreshToken === 1) {
+        const getTokenRes = await refreshToken();
+        if (getTokenRes === 'success') { // 刷新token
+          if (isRefreshToken === 1) {
+            error.response.config.headers.accessToken = Storage.getItem('accessToken')
+            return service(error.response.config)
+          } else {
+            router.go(0)
+          }
+        } else {
+          Storage.removeItem('accessToken');
+          Storage.removeItem('refreshToken');
+          Storage.removeItem('userInfo');
+          Modal.confirm({
+            title: '请登录',
+            content: '<p>请登录后执行此操作</p>',
+            okText: '立即登录',
+            cancelText: '继续浏览',
+            onOk: () => {
+              router.push({
+                path: '/login',
+                query: {
+                  rePath: router.history.current.path,
+                  query: JSON.stringify(router.history.current.query)
+                }
+              });
+            },
+            onCancel: () => {
+              Modal.remove();
+            }
+          });
+        }
+        isRefreshToken = 0
+      }
+    } else {
+      if (error.message) {
+        let _message = error.code === 'ECONNABORTED' ? '连接超时，请稍候再试！' : '网络错误，请稍后再试！';
+        Message.error(errorData.message || _message);
+      }
+    }
+    return Promise.reject(error);
+  }
+);
+
+/**
+ * 关闭全局加载
+ * @param target
+ */
+const closeLoading = (target) => {
+  if (!target.config || !target.config.loading) return true;
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      target.config.loading.hide();
+      resolve();
+    }, 200);
+  });
+};
+
+export const Method = {
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete'
+};
+
+export default function request (options) {
+  // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。
+  //   if (process.server || options.url.indexOf('passport/token') !== -1) {
+  return service(options);
+  //   }
+  // service(options).then(resolve).catch(reject)
+}
+
+// 防抖闭包来一波
+function getTokenDebounce () {
+  let lock = false
+  let success = false
+  return function () {
+    if (!lock) {
+      lock = true
+      let oldRefreshToken = Storage.getItem('refreshToken');
+      handleRefreshToken(oldRefreshToken).then(res => {
+        if (res.code === 200) {
+          let {
+            accessToken,
+            refreshToken
+          } = res.result;
+          Storage.setItem('accessToken', accessToken);
+          Storage.setItem('refreshToken', refreshToken);
+
+          success = true
+          lock = false
+        } else {
+          success = false
+          lock = false
+          // router.push('/login')
+        }
+      }).catch((err) => {
+        console.log(err);
+        success = false
+        lock = false
+      })
+    }
+    return new Promise(resolve => {
+      // 一直看lock,直到请求失败或者成功
+      const timer = setInterval(() => {
+        if (!lock) {
+          clearInterval(timer)
+          if (success) {
+            resolve('success')
+          } else {
+            resolve('fail')
+          }
+        }
+      }, 500) // 轮询时间间隔
+    })
+  }
+}
diff --git a/buyer/src/plugins/storage.js b/buyer/src/plugins/storage.js
new file mode 100644
index 00000000..2d01e9bc
--- /dev/null
+++ b/buyer/src/plugins/storage.js
@@ -0,0 +1,30 @@
+/**
+ * Created by Andste on 2018/5/3.
+ */
+
+import Cookies from 'js-cookie';
+const psl = require('psl');
+
+export default {
+  setItem: (key, value, options = {}) => {
+    if (process.client) {
+      const p_psl = psl.parse(document.domain);
+      let domain = p_psl.domain;
+      if (/\d+\.\d+\.\d+\.\d+/.test(p_psl.input)) domain = p_psl.input;
+      options = { domain, ...options };
+    }
+    Cookies.set(key, value, options);
+  },
+  getItem: (key) => {
+    return Cookies.get(key);
+  },
+  removeItem: (key, options = {}) => {
+    if (process.client) {
+      const p_psl = psl.parse(document.domain);
+      let domain = p_psl.domain;
+      if (/\d+\.\d+\.\d+\.\d+/.test(p_psl.input)) domain = p_psl.input;
+      options = { domain, ...options };
+    }
+    Cookies.remove(key, options);
+  }
+};
diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js
new file mode 100644
index 00000000..3b90cd44
--- /dev/null
+++ b/buyer/src/router/index.js
@@ -0,0 +1,357 @@
+import Vue from 'vue';
+import Router from 'vue-router';
+import Index from '@/pages/Index';
+const Login = resolve => require(['@/pages/Login'], resolve);
+const SignUp = resolve => require(['@/pages/SignUp'], resolve);
+const ForgetPassword = resolve => require(['@/pages/forgetPassword'], resolve);
+const GoodsList = resolve => require(['@/pages/GoodsList'], resolve);
+const GoodsDetail = resolve => require(['@/pages/GoodsDetail'], resolve);
+const ShoppingCart = resolve => require(['@/pages/ShoppingCart'], resolve);
+const Cart = resolve => require(['@/pages/Cart'], resolve);
+const Pay = resolve => require(['@/pages/payment/Pay'], resolve);
+const PayDone = resolve => require(['@/pages/payment/PayDone'], resolve);
+const PayMent = resolve => require(['@/pages/payment/PayMent'], resolve);
+const ThirdPay = resolve => require(['@/pages/payment/thirdPay'], resolve);
+const Feedback = resolve => require(['@/pages/Feedback'], resolve);
+const Coupon = resolve => require(['@/pages/couponCenter'], resolve);
+const seckill = resolve => require(['@/pages/promotion/seckill'], resolve);
+const article = resolve => require(['@/pages/article/index'], resolve);
+const PointMall = resolve => require(['@/pages/PointMall'], resolve);
+
+/*
+ * 会员中心
+ * 订单列表
+ */
+const MyOrder = resolve => require([`@/pages/home/orderCenter/MyOrder`], resolve);
+const OrderDetail = resolve => require([`@/pages/home/orderCenter/OrderDetail`], resolve);
+const MyAddress = resolve => require(['@/pages/home/orderCenter/MyAddress'], resolve);
+const AddAddress = resolve => require(['@/pages/home/orderCenter/AddAddress'], resolve);
+const Complain = resolve => require(['@/pages/home/orderCenter/Complain'], resolve);
+const AfterSale = resolve => require(['@/pages/home/orderCenter/AfterSale'], resolve);
+const AfterSaleDetail = resolve => require(['@/pages/home/orderCenter/AfterSaleDetail'], resolve);
+const ApplyAfterSale = resolve => require(['@/pages/home/orderCenter/ApplyAfterSale'], resolve);
+
+/*
+ * 会员中心
+ */
+const Profile = resolve => require(['@/pages/home/memberCenter/Profile'], resolve);
+const AccountSafe = resolve => require(['@/pages/home/memberCenter/AccountSafe'], resolve);
+const ModifyPwd = resolve => require(['@/pages/home/memberCenter/ModifyPwd'], resolve);
+const AccountBind = resolve => require(['@/pages/home/memberCenter/AccountBind'], resolve);
+const Favorites = resolve => require(['@/pages/home/memberCenter/Favorites'], resolve);
+const Distribution = resolve => require(['@/pages/home/memberCenter/Distribution'], resolve);
+const CommentList = resolve => require(['@/pages/home/memberCenter/CommentList'], resolve); // 评价列表
+const AddEval = resolve => require(['@/pages/home/memberCenter/evaluation/AddEval'], resolve); // 添加评价
+const EvalDetail = resolve => require(['@/pages/home/memberCenter/evaluation/EvalDetail'], resolve);
+const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList'], resolve);
+const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve);
+const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve);
+const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve);
+
+/*
+ * 会员中心
+ * 账户中心
+ * */
+const Coupons = resolve => require(['@/pages/home/userCenter/Coupons'], resolve);
+const MyTracks = resolve => require(['@/pages/home/userCenter/MyTracks'], resolve);
+const MoneyManagement = resolve => require(['@/pages/home/userCenter/MoneyManagement'], resolve);
+
+const Home = resolve => require(['@/pages/user/Home'], resolve);
+
+const MyShoppingCart = resolve => require(['@/pages/home/MyShoppingCart'], resolve);
+const Merchant = resolve => require(['@/pages/Merchant'], resolve);
+// const AllCategories = resolve => require(['@/pages/AllCategories'], resolve);
+const UserMain = resolve => require(['@/pages/home/Main'], resolve);
+
+/**
+ * 店铺入驻 首页
+ * 店铺入驻  申请页
+ */
+const ShopEntryIndex = resolve => require(['@/pages/shopEntry/index'], resolve);
+const ShopEntry = resolve => require(['@/pages/shopEntry/shop-entry'], resolve);
+
+Vue.use(Router);
+
+export default new Router({
+  mode: 'history',
+  routes: [{
+    path: '/', // 首页
+    name: 'Index',
+    component: Index
+  },
+  {
+    path: '/login', // 登陆
+    name: 'Login',
+    component: Login,
+    meta: {
+      title: 'LiLi 登录'
+    }
+  },
+  {
+    path: '/SignUp', // 注册
+    name: 'SignUp',
+    component: SignUp,
+    meta: {
+      title: 'LiLi 注册'
+    }
+  },
+  {
+    path: '/forgetPassword', // 忘记密码
+    name: 'forgetPassword',
+    component: ForgetPassword,
+    meta: {
+      title: 'LiLi 忘记密码'
+    }
+  },
+  {
+    path: '/goodsList', // 商品列表
+    name: 'GoodsList',
+    component: GoodsList
+  },
+  {
+    path: '/goodsDetail', // 商品详情
+    name: 'GoodsDetail',
+    component: GoodsDetail,
+    meta: {title: '商品详情'}
+  },
+  {
+    path: '/shoppingCart', // 头部购物车
+    name: 'ShoppingCart',
+    component: ShoppingCart
+  },
+  {
+    path: '/cart', // 购物车
+    name: 'Cart',
+    component: Cart,
+    meta: {title: '购物车'}
+  },
+  {
+    path: '/pay', // 支付页面
+    name: 'Pay',
+    component: Pay,
+    meta: {title: '订单结算'}
+  },
+  {
+    path: '/payMent',
+    name: 'PayMent',
+    component: PayMent
+  },
+  {
+    path: '/PointMall',
+    name: 'PointMall',
+    component: PointMall,
+    meta: {title: '积分商城'}
+  },
+  {
+    path: '/qrpay', // 三方支付
+    name: 'qrpay',
+    component: ThirdPay
+  },
+  {
+    path: '/payDone', // 支付成功页面
+    name: 'PayDone',
+    component: PayDone
+  },
+  {
+    path: '/feedback', // 反馈页面
+    name: 'Feedback',
+    component: Feedback,
+    meta: {
+      title: 'LiLi 登录'
+    }
+  },
+  {
+    path: '/article', // 文章页面
+    name: 'article',
+    component: article,
+    meta: {
+      title: '帮助中心'
+    }
+  },
+  {
+    path: '/shopEntryList',
+    name: 'shopEntryList',
+    component: ShopEntryIndex
+  },
+  {
+    path: '/shopEntry',
+    name: 'shopEntry',
+    component: ShopEntry,
+    meta: {
+      title: '店铺入驻'
+    }
+  },
+  {
+    path: '/coupon',
+    name: 'coupon',
+    component: Coupon,
+    meta: {
+      title: '领券中心'
+    }
+  },
+  {
+    path: '/seckill',
+    name: 'seckill',
+    component: seckill,
+    meta: {
+      title: '限时秒杀'
+    }
+  },
+  {
+    path: '/home', // 主页
+    component: Home,
+    children: [{
+      path: '/',
+      name: 'Home',
+      component: UserMain,
+      meta: {
+        title: '会员中心'
+      }
+    },
+    {
+      path: 'MyTracks',
+      name: 'MyTracks',
+      component: MyTracks,
+      meta: {title: '我的足迹'}
+    },
+    {
+      path: 'MoneyManagement',
+      name: 'MoneyManagement',
+      component: MoneyManagement
+    },
+    {
+      path: 'Complain',
+      name: 'Complain',
+      component: Complain
+    },
+    {
+      path: 'Coupons',
+      name: 'Coupons',
+      component: Coupons
+    },
+    {
+      path: 'CommentList',
+      name: 'CommentList',
+      component: CommentList,
+      mate: {title: '评价列表'}
+    },
+    {
+      path: 'AddEval',
+      name: 'AddEval',
+      component: AddEval,
+      mate: {title: '添加评价'}
+    },
+    {
+      path: 'EvalDetail',
+      name: 'EvalDetail',
+      component: EvalDetail,
+      mate: {title: '评价详情'}
+    },
+    {
+      path: 'ComplainList',
+      name: 'ComplainList',
+      component: ComplainList
+    },
+    {
+      path: 'ComplainDetail',
+      name: 'ComplainDetail',
+      component: ComplainDetail
+    },
+    {
+      path: 'Invoice',
+      name: 'Invoice',
+      component: Invoice
+    },
+    {
+      path: 'AccountSafe',
+      name: 'AccountSafe',
+      component: AccountSafe
+    },
+    {
+      path: 'ModifyPwd',
+      name: 'ModifyPwd',
+      component: ModifyPwd
+    },
+    {
+      path: 'Favorites',
+      name: 'Favorites',
+      component: Favorites
+    },
+    {
+      path: 'Distribution',
+      name: 'Distribution',
+      component: Distribution,
+      meta: {title: '我的投诉'}
+    },
+    {
+      path: 'Point',
+      name: 'Point',
+      component: Point,
+      meta: {title: '我的积分'}
+    },
+    {
+      path: 'Profile',
+      name: 'Profile',
+      component: Profile
+    },
+    {
+      path: 'AccountBind',
+      name: 'AccountBind',
+      component: AccountBind
+    },
+    {
+      path: 'AfterSale',
+      name: 'AfterSale',
+      component: AfterSale,
+      meta: {title: 'LiLi 售后'}
+    },
+    {
+      path: 'ApplyAfterSale',
+      name: 'ApplyAfterSale',
+      component: ApplyAfterSale,
+      meta: {title: '申请售后'}
+    },
+    {
+      path: '/home/MyAddress',
+      name: 'MyAddress',
+      component: MyAddress,
+      meta: {title: '收货地址'}
+    },
+    {
+      path: 'AddAddress',
+      name: 'AddAddress',
+      component: AddAddress
+    },
+    {
+      path: 'MyOrder',
+      name: 'MyOrder',
+      component: MyOrder,
+      meta: {title: '我的订单'}
+    },
+    {
+      path: 'OrderDetail',
+      name: 'OrderDetail',
+      component: OrderDetail,
+      meta: {title: '订单详情'}
+    },
+    {
+      path: 'AfterSaleDetail',
+      name: 'AfterSaleDetail',
+      component: AfterSaleDetail,
+      meta: {title: '售后详情'}
+    },
+    {
+      path: 'MyShoppingCart',
+      name: 'MyShoppingCart',
+      component: MyShoppingCart
+    }
+    ]
+  },
+  {
+    path: '/merchant',
+    name: 'Merchant',
+    component: Merchant,
+    meta: {title: '店铺'}
+  }
+  ]
+});
diff --git a/buyer/src/vuex/actions.js b/buyer/src/vuex/actions.js
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/buyer/src/vuex/actions.js
@@ -0,0 +1 @@
+
diff --git a/buyer/src/vuex/getters.js b/buyer/src/vuex/getters.js
new file mode 100644
index 00000000..e69de29b
diff --git a/buyer/src/vuex/mutations.js b/buyer/src/vuex/mutations.js
new file mode 100644
index 00000000..e83da86c
--- /dev/null
+++ b/buyer/src/vuex/mutations.js
@@ -0,0 +1,11 @@
+
+// 全部商品分类
+export const SET_CATEGORY = (state, data) => {
+  state.category = data
+}
+export const SET_NAVLIST = (state, data) => {
+  state.navList = data
+}
+export const SET_CARTNUM = (state, data) => {
+  state.cartNum = data
+}
diff --git a/buyer/src/vuex/store.js b/buyer/src/vuex/store.js
new file mode 100644
index 00000000..105eded6
--- /dev/null
+++ b/buyer/src/vuex/store.js
@@ -0,0 +1,19 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import * as actions from './actions';
+import * as mutations from './mutations';
+import * as getters from './getters';
+import storage from '@/plugins/storage.js'
+
+Vue.use(Vuex);
+
+export default new Vuex.Store({
+  state: {
+    category: [], // 全部分类
+    navList: [],
+    cartNum: storage.getItem('cartNum') || 0
+  },
+  getters,
+  actions,
+  mutations
+});
diff --git a/buyer/static/logo.ico b/buyer/static/logo.ico
new file mode 100644
index 00000000..136bd7e9
Binary files /dev/null and b/buyer/static/logo.ico differ
diff --git a/buyer/static/small.cur b/buyer/static/small.cur
new file mode 100644
index 00000000..1d7eb1b4
Binary files /dev/null and b/buyer/static/small.cur differ
diff --git a/buyer/static/sprite@2x.png b/buyer/static/sprite@2x.png
new file mode 100644
index 00000000..19dcc0a2
Binary files /dev/null and b/buyer/static/sprite@2x.png differ
diff --git a/buyer/vue.config.js b/buyer/vue.config.js
new file mode 100644
index 00000000..078d9a0b
--- /dev/null
+++ b/buyer/vue.config.js
@@ -0,0 +1,11 @@
+/*
+ * @Author: LMR 
+ * @Date: 2020-08-11 10:53:53 
+ * @Last Modified by: LMR
+ * @Last Modified time: 2020-08-11 11:26:19
+ */
+
+//  关闭eslint
+module.exports = {
+    
+}
diff --git a/buyer/yarn.lock b/buyer/yarn.lock
new file mode 100644
index 00000000..6dbcc1c8
--- /dev/null
+++ b/buyer/yarn.lock
@@ -0,0 +1,8692 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@amap/amap-jsapi-loader@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-0.0.7.tgz#76b5cbcc22f6844003474e37eed1dcd879cb117c"
+  integrity sha512-DNqyIo9AfN0ic2I+9F6qiGFOmoeLVhcqUU2MT4/t3vTAiZhnlMWqr6kXXwh7IjXhD1Na7XaK8/IL2b7Ml+g4tw==
+
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1608076799939&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
+  integrity sha1-KgJkM2jegJFhYr5whlyXd08629k=
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.44"
+
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1608076804367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fgenerator%2Fdownload%2F%40babel%2Fgenerator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
+  integrity sha1-x+Z7m1KEr89pswm1DX038+UDPUI=
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/helper-function-name/download/@babel/helper-function-name-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1608076808489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-function-name%2Fdownload%2F%40babel%2Fhelper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
+  integrity sha1-4YVSqq4iMRAKbkheA4VLw1MtRN0=
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1607584550563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-get-function-arity%2Fdownload%2F%40babel%2Fhelper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+  integrity sha1-0Dym3SufewseazLFbHKDYUDbOhU=
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1608076804774&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  integrity sha1-wLNRc14PvLOCLIrY205YOwXr2dw=
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1593522818552&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
+  integrity sha1-GMlM5UORaoBVPtzc9oGJCyAHR9U=
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/template/download/@babel/template-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1605904643326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
+  integrity sha1-+IMvT9zuXVm/UV5ZX8UQbFKbOU8=
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.0.0-beta.44.tgz?cache=0&sync_timestamp=1607569286563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
+  integrity sha1-qXCixFR3rRgBfi5GWgYG/u4NKWY=
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
+  integrity sha1-axsWRZH3fewKA0KsqZXy0Eazp1c=
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.npm.taobao.org/@types/json5/download/@types/json5-0.0.29.tgz?cache=0&sync_timestamp=1605053935006&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson5%2Fdownload%2F%40types%2Fjson5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@types/q@^1.5.1":
+  version "1.5.4"
+  resolved "https://registry.npm.taobao.org/@types/q/download/@types/q-1.5.4.tgz?cache=0&sync_timestamp=1605055096527&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
+  integrity sha1-FZJUFOCtLNdlv+9YhC9+JqesyyQ=
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha1-UxvHJlF6OytB+FACHGzBXqq1B80=
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  integrity sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=
+  dependencies:
+    acorn "^4.0.3"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-3.0.1.tgz?cache=0&sync_timestamp=1599499085730&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-jsx%2Fdownload%2Facorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.npm.taobao.org/acorn/download/acorn-3.3.0.tgz?cache=0&sync_timestamp=1602534280466&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+
+acorn@^4.0.3:
+  version "4.0.13"
+  resolved "https://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz?cache=0&sync_timestamp=1602534280466&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
+
+acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
+  version "5.7.4"
+  resolved "https://registry.npm.taobao.org/acorn/download/acorn-5.7.4.tgz?cache=0&sync_timestamp=1602534280466&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha1-Po2KmUfQWZoXltECJddDL0pKz14=
+
+ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-2.1.1.tgz?cache=0&sync_timestamp=1608062556009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
+
+ajv-keywords@^3.1.0:
+  version "3.5.2"
+  resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1608062556009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0=
+
+ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz?cache=0&sync_timestamp=1608057780421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ajv@^6.1.0, ajv@^6.12.3:
+  version "6.12.6"
+  resolved "https://registry.npm.taobao.org/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1608057780421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.npm.taobao.org/align-text/download/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+alphanum-sort@^1.0.0, alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-escapes@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.npm.taobao.org/ansi-html/download/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1606792255762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1606792255762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792255762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha1-7dgDYornHATIWuegkG7a00tkiTc=
+  dependencies:
+    color-convert "^2.0.1"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha1-vLJLTzeTTZqnrBe0ra+J58du8us=
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha1-xV7PAhheJGklk5kxDBc84xIzsUI=
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha1-aALmJk79GMeQobDVF/DyYnvyyUo=
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha1-SzXClE8GKov82mZBB2A1D+nd/CE=
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/arr-flatten/download/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/arr-union/download/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk=
+
+array-includes@^3.0.3, array-includes@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.npm.taobao.org/array-includes/download/array-includes-3.1.2.tgz?cache=0&sync_timestamp=1606263195023&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-includes%2Fdownload%2Farray-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
+  integrity sha1-qNsD4LiMjGrt3EnLEy+byrTr+cg=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+    get-intrinsic "^1.0.1"
+    is-string "^1.0.5"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/array-uniq/download/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+array.prototype.flat@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.npm.taobao.org/array.prototype.flat/download/array.prototype.flat-1.2.4.tgz?cache=0&sync_timestamp=1605688437987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray.prototype.flat%2Fdownload%2Farray.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha1-bvY4tDMSvUAbTGGZ/ex+LcnpoSM=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.npm.taobao.org/asn1.js/download/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha1-EamAuE67kXgc41sP3C7ilON4Pwc=
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.npm.taobao.org/assert/download/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/assign-symbols/download/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=
+
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=
+
+async-validator@^3.3.0:
+  version "3.5.1"
+  resolved "https://registry.npm.taobao.org/async-validator/download/async-validator-3.5.1.tgz?cache=0&sync_timestamp=1605751734916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-3.5.1.tgz#cd62b9688b2465f48420e27adb47760ab1b5559f"
+  integrity sha1-zWK5aIskZfSEIOJ620d2CrG1VZ8=
+
+async@^2.1.2, async@^2.4.1, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=
+  dependencies:
+    lodash "^4.17.14"
+
+async@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npm.taobao.org/async/download/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha1-s6JoXF67ZB094C0WEALGD8n4VyA=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz?cache=0&sync_timestamp=1607413393711&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^7.1.2:
+  version "7.2.6"
+  resolved "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-7.2.6.tgz?cache=0&sync_timestamp=1607413393711&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  integrity sha1-JWZy+G98c12oScTwfQCKuwVgZ9w=
+  dependencies:
+    browserslist "^2.11.3"
+    caniuse-lite "^1.0.30000805"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.17"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.npm.taobao.org/aws4/download/aws4-1.11.0.tgz?cache=0&sync_timestamp=1604101244098&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=
+
+axios@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.npm.taobao.org/axios/download/axios-0.19.2.tgz?cache=0&sync_timestamp=1603468826655&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha1-PqNsXYgY0NX4qKl6bTa4bNwAyyc=
+  dependencies:
+    follow-redirects "1.5.10"
+
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.22.1, babel-core@^6.26.0:
+  version "6.26.3"
+  resolved "https://registry.npm.taobao.org/babel-core/download/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha1-suLwnjQtDwyI4vAuBneUEl51wgc=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-eslint@^8.2.1:
+  version "8.2.6"
+  resolved "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
+  integrity sha1-YnDQxzIFYoBnwPeuFpOp55es79k=
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    eslint-scope "3.7.1"
+    eslint-visitor-keys "^1.0.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.npm.taobao.org/babel-generator/download/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-bindify-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  integrity sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-builder-binary-assignment-operator-visitor/download/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-call-delegate/download/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-helper-define-map/download/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-explode-assignable-expression/download/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-explode-class@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  integrity sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=
+  dependencies:
+    babel-helper-bindify-decorators "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-function-name/download/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-get-function-arity/download/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-hoist-variables/download/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-optimise-call-expression/download/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-helper-regex/download/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-remap-async-to-generator/download/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helper-replace-supers/download/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-vue-jsx-merge-props@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
+  integrity sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-helpers/download/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^7.1.1:
+  version "7.1.5"
+  resolved "https://registry.npm.taobao.org/babel-loader/download/babel-loader-7.1.5.tgz?cache=0&sync_timestamp=1606424647115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68"
+  integrity sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.npm.taobao.org/babel-messages/download/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-check-es2015-constants/download/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-async-functions/download/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+
+babel-plugin-syntax-async-generators@^6.5.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+  integrity sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-class-properties/download/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+  integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
+
+babel-plugin-syntax-decorators@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+  integrity sha1-MSVjtNvePMgGzuPkFszurd0RrAs=
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-exponentiation-operator/download/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+
+babel-plugin-syntax-jsx@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-jsx/download/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
+
+babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-object-rest-spread/download/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-syntax-trailing-function-commas/download/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+
+babel-plugin-transform-async-generator-functions@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  integrity sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-generators "^6.5.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-async-to-generator/download/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-class-properties/download/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  integrity sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=
+  dependencies:
+    babel-helper-explode-class "^6.24.1"
+    babel-plugin-syntax-decorators "^6.13.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-arrow-functions/download/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-block-scoped-functions/download/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-block-scoping/download/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-classes/download/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-computed-properties/download/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-destructuring/download/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-duplicate-keys/download/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-for-of/download/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-function-name/download/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-literals/download/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-amd/download/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-commonjs/download/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha1-WKeThjqefKhwvcWogRF/+sJ9tvM=
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-systemjs/download/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-umd/download/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-object-super/download/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-parameters/download/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-shorthand-properties/download/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-spread/download/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-sticky-regex/download/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-template-literals/download/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-typeof-symbol/download/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-es2015-unicode-regex/download/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-exponentiation-operator/download/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-object-rest-spread/download/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-regenerator/download/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-runtime@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-strict-mode/download/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-vue-jsx@^3.5.0:
+  version "3.7.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-vue-jsx/download/babel-plugin-transform-vue-jsx-3.7.0.tgz#d40492e6692a36b594f7e9a1928f43e969740960"
+  integrity sha1-1ASS5mkqNrWU9+mhko9D6Wl0CWA=
+  dependencies:
+    esutils "^2.0.2"
+
+babel-preset-env@^1.3.2:
+  version "1.7.0"
+  resolved "https://registry.npm.taobao.org/babel-preset-env/download/babel-preset-env-1.7.0.tgz?cache=0&sync_timestamp=1591204557603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-preset-env%2Fdownload%2Fbabel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha1-3qefpOvriDzTXasH4mDBycBN93o=
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-preset-stage-2@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  integrity sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-plugin-transform-class-properties "^6.24.1"
+    babel-plugin-transform-decorators "^6.24.1"
+    babel-preset-stage-3 "^6.24.1"
+
+babel-preset-stage-3@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  integrity sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.24.1"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
+    babel-plugin-transform-object-rest-spread "^6.22.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-register/download/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-template/download/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-traverse/download/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.npm.taobao.org/babel-types/download/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.npm.taobao.org/babylon/download/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
+  integrity sha1-iRWeFebjDFCW4i1zjYwK+KDoyh0=
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.npm.taobao.org/babylon/download/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha1-ry87iPpvXB5MY00aD46sT1WzleM=
+
+balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-js@^1.0.2:
+  version "1.5.1"
+  resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha1-GxtEAWClv3rUC2UPCVljSBkDkwo=
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.npm.taobao.org/base/download/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha1-e95c7RRbbVUakNuH+DxVi060io8=
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+batch-processor@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/batch-processor/download/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
+  integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bfj-node4@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.npm.taobao.org/bfj-node4/download/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
+  integrity sha1-4j2LJwV/HQIU/FYRQq2duZjyaDA=
+  dependencies:
+    bluebird "^3.5.1"
+    check-types "^7.3.0"
+    tryer "^1.0.0"
+
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=
+
+binary-extensions@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+  integrity sha1-MPpAyef+B9vIlWeM0ocCTeokHdk=
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
+  dependencies:
+    inherits "~2.0.0"
+
+bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.1:
+  version "3.7.2"
+  resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28=
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.npm.taobao.org/bn.js/download/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha1-JtVWgpRY+dHoH8SJUkk9C6NQeCg=
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.1.3"
+  resolved "https://registry.npm.taobao.org/bn.js/download/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+  integrity sha1-vsoAVAj2Quvr6oCwQrTRjSrA7ms=
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boolbase@^1.0.0, boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc=
+  dependencies:
+    fill-range "^7.0.1"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.1.0.tgz?cache=0&sync_timestamp=1605194257215&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserify-rsa%2Fdownload%2Fbrowserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha1-sv0Gtbda4pf3zi3GUfkY9b4VjI0=
+  dependencies:
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.2.1.tgz?cache=0&sync_timestamp=1596557809886&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserify-sign%2Fdownload%2Fbrowserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha1-6vSt1G3VS+O7OzbAzxWrvrp5VsM=
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/browserify-zlib/download/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz?cache=0&sync_timestamp=1607663784354&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+browserslist@^2.11.3:
+  version "2.11.3"
+  resolved "https://registry.npm.taobao.org/browserslist/download/browserslist-2.11.3.tgz?cache=0&sync_timestamp=1607663784354&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  integrity sha1-/jYWeu0bvN5IJ+v+cTR6LMcLmbI=
+  dependencies:
+    caniuse-lite "^1.0.30000792"
+    electron-to-chromium "^1.3.30"
+
+browserslist@^3.2.6:
+  version "3.2.8"
+  resolved "https://registry.npm.taobao.org/browserslist/download/browserslist-3.2.8.tgz?cache=0&sync_timestamp=1607663784354&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha1-sABTYdZHHw9ZUnl6dvyYXx+Xj8Y=
+  dependencies:
+    caniuse-lite "^1.0.30000844"
+    electron-to-chromium "^1.3.47"
+
+browserslist@^4.0.0:
+  version "4.16.0"
+  resolved "https://registry.npm.taobao.org/browserslist/download/browserslist-4.16.0.tgz?cache=0&sync_timestamp=1607663784354&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b"
+  integrity sha1-QQJ3YnUAvjyyihv+A3WG++35SIs=
+  dependencies:
+    caniuse-lite "^1.0.30001165"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.621"
+    escalade "^3.1.1"
+    node-releases "^1.1.67"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/buffer-indexof/download/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow=
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.npm.taobao.org/buffer/download/buffer-4.9.2.tgz?cache=0&sync_timestamp=1606098175437&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha1-Iw6tNEACmIZEhBqwJEr4xEu+Pvg=
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/bytes/download/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=
+
+cacache@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.npm.taobao.org/cacache/download/cacache-10.0.4.tgz?cache=0&sync_timestamp=1594428006433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.1"
+    mississippi "^2.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/cache-base/download/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.0.tgz?cache=0&sync_timestamp=1604117008862&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha1-JBJwVLs/m9y0sfuCQYGGBy93uM4=
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/caller-callsite/download/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npm.taobao.org/caller-path/download/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
+  dependencies:
+    callsites "^0.2.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/caller-path/download/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/callsites/download/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/callsites/download/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/camel-case/download/camel-case-3.0.0.tgz?cache=0&sync_timestamp=1606867311564&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamel-case%2Fdownload%2Fcamel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-4.1.0.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha1-Xk2Q4idJYdRikZl99Znj7QCO5MA=
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30001166"
+  resolved "https://registry.npm.taobao.org/caniuse-db/download/caniuse-db-1.0.30001166.tgz#b584487982e4656e95216f760cc13efd345c4fa8"
+  integrity sha1-tYRIeYLkZW6VIW92DME+/TRcT6g=
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001165:
+  version "1.0.30001166"
+  resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001166.tgz?cache=0&sync_timestamp=1607938232587&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001166.tgz#ca73e8747acfd16a4fd6c4b784f1b995f9698cf8"
+  integrity sha1-ynPodHrP0WpP1sS3hPG5lflpjPg=
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.npm.taobao.org/center-align/download/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1591687042638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1591687042638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1591687042638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha1-ThSHCmGNni7dl92DRf2dncMVZGo=
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.npm.taobao.org/chardet/download/chardet-0.4.2.tgz?cache=0&sync_timestamp=1601032463282&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchardet%2Fdownload%2Fchardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
+
+check-types@^7.3.0:
+  version "7.4.0"
+  resolved "https://registry.npm.taobao.org/check-types/download/check-types-7.4.0.tgz?cache=0&sync_timestamp=1579455903027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcheck-types%2Fdownload%2Fcheck-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
+  integrity sha1-A3jsG5YW7HH3dJMaPGUW+tjBUvQ=
+
+chokidar@^2.1.2, chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1602585354255&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chokidar@^3.4.1:
+  version "3.4.3"
+  resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-3.4.3.tgz?cache=0&sync_timestamp=1602585354255&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
+  integrity sha1-wd84IxRI5FykrFiObHlXO6alfVs=
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
+chownr@^1.0.1:
+  version "1.1.4"
+  resolved "https://registry.npm.taobao.org/chownr/download/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs=
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.npm.taobao.org/circular-json/download/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=
+
+clap@^1.0.9:
+  version "1.2.3"
+  resolved "https://registry.npm.taobao.org/clap/download/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  integrity sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=
+  dependencies:
+    chalk "^1.1.3"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.npm.taobao.org/class-utils/download/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha1-+TNprouafOAv1B+q0MqDAzGQxGM=
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-css@4.2.x:
+  version "4.2.3"
+  resolved "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha1-UHtd59l7SO5T2ErbAWD/YhY4D3g=
+  dependencies:
+    source-map "~0.6.0"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-spinners@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/cli-spinners/download/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
+  integrity sha1-ACwZkJEtDVlYDJO9NsBW3pnkJZo=
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha1-sEM9C06chH7xiGik7xb9X8gnHEg=
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+clone-deep@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/clone-deep/download/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.0"
+    shallow-clone "^1.0.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+coa@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/coa/download/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+  integrity sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM=
+  dependencies:
+    "@types/q" "^1.5.1"
+    chalk "^2.4.1"
+    q "^1.1.2"
+
+coa@~1.0.1:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/coa/download/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
+  dependencies:
+    q "^1.1.2"
+
+coalescy@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/coalescy/download/coalescy-1.0.0.tgz#4b065846b836361ada6c4b4a4abf4bc1cac31bf1"
+  integrity sha1-SwZYRrg2NhrabEtKSr9LwcrDG/E=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/color-string/download/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
+  dependencies:
+    color-name "^1.0.0"
+
+color-string@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.npm.taobao.org/color-string/download/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+  integrity sha1-3VHNJc/ulT0Tj+QAI3LMPQ5QTLY=
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.npm.taobao.org/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+color@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.npm.taobao.org/color/download/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+  integrity sha1-ymf7TnuX1hHc3jns7tQiBn2RWW4=
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.4"
+
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/colorette/download/colorette-1.2.1.tgz?cache=0&sync_timestamp=1593955783467&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs=
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/colormin/download/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/colors/download/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.17.x:
+  version "2.17.1"
+  resolved "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1607933602027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha1-vXerfebelCBc6sxy8XFtKfIKd78=
+
+commander@^2.13.0:
+  version "2.20.3"
+  resolved "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1607933602027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=
+
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz?cache=0&sync_timestamp=1607933602027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=
+
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.npm.taobao.org/commander/download/commander-2.19.0.tgz?cache=0&sync_timestamp=1607933602027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha1-9hmKqE5bg8RgVLlN3tv+1e6f8So=
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o=
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.3:
+  version "1.7.4"
+  resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48=
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0, concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.npm.taobao.org/concat-stream/download/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+connect-history-api-fallback@^1.3.0:
+  version "1.6.0"
+  resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w=
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/console-browserify/download/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha1-ZwY871fOts9Jk6KrOlWECujEkzY=
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+consolidate@^0.14.0:
+  version "0.14.5"
+  resolved "https://registry.npm.taobao.org/consolidate/download/consolidate-0.14.5.tgz?cache=0&sync_timestamp=1599596654038&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconsolidate%2Fdownload%2Fconsolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
+  integrity sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=
+  dependencies:
+    bluebird "^3.1.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npm.taobao.org/contains-path/download/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha1-4TjMdeBAxyexlm/l5fjJruJW/js=
+
+convert-source-map@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha1-F6LLiC1/d9NJBYXizmxSRCSjpEI=
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npm.taobao.org/cookie/download/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo=
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+copy-webpack-plugin@^4.0.1:
+  version "4.6.0"
+  resolved "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-4.6.0.tgz?cache=0&sync_timestamp=1607603363826&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
+  integrity sha1-5/QN2KaEd9QF3Rt6hUquMksVi64=
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    globby "^7.1.1"
+    is-glob "^4.0.0"
+    loader-utils "^1.1.0"
+    minimatch "^3.0.4"
+    p-limit "^1.0.0"
+    serialize-javascript "^1.4.0"
+
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.6.12"
+  resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1607216048810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
+
+core-js@^3.4.4:
+  version "3.8.1"
+  resolved "https://registry.npm.taobao.org/core-js/download/core-js-3.8.1.tgz?cache=0&sync_timestamp=1607216048810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
+  integrity sha1-9RUjZorIopTRKFw7nbRAJf2mbUc=
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-2.2.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  integrity sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-5.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha1-BA9yaAnFked6F8CjYmykW08Wixo=
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.4.tgz?cache=0&sync_timestamp=1596557441827&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcreate-ecdh%2Fdownload%2Fcreate-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha1-1uf0v/pmc2CFoHYv06YyaE2rzE4=
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+css-color-names@0.0.4, css-color-names@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
+
+css-declaration-sorter@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/css-declaration-sorter/download/css-declaration-sorter-4.0.1.tgz?cache=0&sync_timestamp=1604519287320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
+  integrity sha1-wZiUD2OnbX42wecQGLABchBUyyI=
+  dependencies:
+    postcss "^7.0.1"
+    timsort "^0.3.0"
+
+css-loader@^0.28.0:
+  version "0.28.11"
+  resolved "https://registry.npm.taobao.org/css-loader/download/css-loader-0.28.11.tgz?cache=0&sync_timestamp=1604507262318&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
+  integrity sha1-w/mGSnAL4nEbtaJGKyOJsaOS2rc=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano "^3.10.0"
+    icss-utils "^2.1.0"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.1.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.2.0"
+    postcss-modules-local-by-default "^1.2.0"
+    postcss-modules-scope "^1.1.0"
+    postcss-modules-values "^1.3.0"
+    postcss-value-parser "^3.3.0"
+    source-list-map "^2.0.0"
+
+css-select-base-adapter@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
+  integrity sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc=
+
+css-select@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz?cache=0&sync_timestamp=1607468192973&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-select%2Fdownload%2Fcss-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-select@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/css-select/download/css-select-2.1.0.tgz?cache=0&sync_timestamp=1607468192973&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-select%2Fdownload%2Fcss-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
+  integrity sha1-ajRlM1ZjWTSoG6ymjQJVQyEF2+8=
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^3.2.1"
+    domutils "^1.7.0"
+    nth-check "^1.0.2"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.3"
+  resolved "https://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.3.tgz?cache=0&sync_timestamp=1595335280942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-selector-tokenizer%2Fdownload%2Fcss-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
+  integrity sha1-c18mGG5nx0mq8nV4NAXPBmH66PE=
+  dependencies:
+    cssesc "^3.0.0"
+    fastparse "^1.1.2"
+
+css-tree@1.0.0-alpha.37:
+  version "1.0.0-alpha.37"
+  resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.0.0-alpha.37.tgz?cache=0&sync_timestamp=1606404008501&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-tree%2Fdownload%2Fcss-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+  integrity sha1-mL69YsTB2flg7DQM+fdSLjBwmiI=
+  dependencies:
+    mdn-data "2.0.4"
+    source-map "^0.6.1"
+
+css-tree@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.1.2.tgz?cache=0&sync_timestamp=1606404008501&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-tree%2Fdownload%2Fcss-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha1-muOTtdr9fa6KYiR1yux409j717U=
+  dependencies:
+    mdn-data "2.0.14"
+    source-map "^0.6.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI=
+
+css-what@^3.2.1:
+  version "3.4.2"
+  resolved "https://registry.npm.taobao.org/css-what/download/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
+  integrity sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ=
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=
+
+cssnano-preset-default@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.npm.taobao.org/cssnano-preset-default/download/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
+  integrity sha1-UexmLM/KD4izltzZZ5zbkxvhf3Y=
+  dependencies:
+    css-declaration-sorter "^4.0.1"
+    cssnano-util-raw-cache "^4.0.1"
+    postcss "^7.0.0"
+    postcss-calc "^7.0.1"
+    postcss-colormin "^4.0.3"
+    postcss-convert-values "^4.0.1"
+    postcss-discard-comments "^4.0.2"
+    postcss-discard-duplicates "^4.0.2"
+    postcss-discard-empty "^4.0.1"
+    postcss-discard-overridden "^4.0.1"
+    postcss-merge-longhand "^4.0.11"
+    postcss-merge-rules "^4.0.3"
+    postcss-minify-font-values "^4.0.2"
+    postcss-minify-gradients "^4.0.2"
+    postcss-minify-params "^4.0.2"
+    postcss-minify-selectors "^4.0.2"
+    postcss-normalize-charset "^4.0.1"
+    postcss-normalize-display-values "^4.0.2"
+    postcss-normalize-positions "^4.0.2"
+    postcss-normalize-repeat-style "^4.0.2"
+    postcss-normalize-string "^4.0.2"
+    postcss-normalize-timing-functions "^4.0.2"
+    postcss-normalize-unicode "^4.0.1"
+    postcss-normalize-url "^4.0.1"
+    postcss-normalize-whitespace "^4.0.2"
+    postcss-ordered-values "^4.1.2"
+    postcss-reduce-initial "^4.0.3"
+    postcss-reduce-transforms "^4.0.2"
+    postcss-svgo "^4.0.2"
+    postcss-unique-selectors "^4.0.1"
+
+cssnano-util-get-arguments@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/cssnano-util-get-arguments/download/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
+  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
+
+cssnano-util-get-match@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/cssnano-util-get-match/download/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
+  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
+
+cssnano-util-raw-cache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/cssnano-util-raw-cache/download/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
+  integrity sha1-sm1f1fcqEd/np4RvtMZyYPlr8oI=
+  dependencies:
+    postcss "^7.0.0"
+
+cssnano-util-same-parent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/cssnano-util-same-parent/download/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
+  integrity sha1-V0CC+yhZ0ttDOFWDXZqEVuoYu/M=
+
+cssnano@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.npm.taobao.org/cssnano/download/cssnano-3.10.0.tgz?cache=0&sync_timestamp=1603212982008&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcssnano%2Fdownload%2Fcssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+cssnano@^4.1.10:
+  version "4.1.10"
+  resolved "https://registry.npm.taobao.org/cssnano/download/cssnano-4.1.10.tgz?cache=0&sync_timestamp=1603212982008&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcssnano%2Fdownload%2Fcssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
+  integrity sha1-CsQfCxPRPUZUh+ERt3jULaYxuLI=
+  dependencies:
+    cosmiconfig "^5.0.0"
+    cssnano-preset-default "^4.0.7"
+    is-resolvable "^1.0.0"
+    postcss "^7.0.0"
+
+csso@^4.0.2:
+  version "4.2.0"
+  resolved "https://registry.npm.taobao.org/csso/download/csso-4.2.0.tgz?cache=0&sync_timestamp=1606408761368&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcsso%2Fdownload%2Fcsso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  integrity sha1-6jpWE0bo3J9UbW/r7dUBh884lSk=
+  dependencies:
+    css-tree "^1.1.2"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.npm.taobao.org/csso/download/csso-2.3.2.tgz?cache=0&sync_timestamp=1606408761368&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcsso%2Fdownload%2Fcsso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npm.taobao.org/cuint/download/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  dependencies:
+    array-find-index "^1.0.1"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/d/download/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+de-indent@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
+
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1607566551397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=
+  dependencies:
+    ms "2.0.0"
+
+debug@=3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1607566551397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0, debug@^3.1.1:
+  version "3.2.7"
+  resolved "https://registry.npm.taobao.org/debug/download/debug-3.2.7.tgz?cache=0&sync_timestamp=1607566551397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o=
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.1.0:
+  version "4.3.1"
+  resolved "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566551397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha1-8NIpxQXgxtjEmsVT0bE9wYP2su4=
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+deep-equal@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860101281&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+deepmerge@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
+  integrity sha1-XT/yKgHAD2RUBaL7wX0HeKGAEXA=
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha1-1Flono1lS6d+AqgX+HENcCyxbp0=
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/del/download/del-3.0.0.tgz?cache=0&sync_timestamp=1601076936089&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/des.js/download/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha1-U4IULhvcU/hdhtU+X0qn3rkeCEM=
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/detect-indent/download/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
+
+detect-node@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/detect-node/download/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha1-AU7o+PZpxcWAI9pkuBecCDooxGw=
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ=
+  dependencies:
+    path-type "^3.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/dns-packet/download/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha1-EqpCaYEHW+UAuRDu3NC0fdfe2lo=
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npm.taobao.org/doctrine/download/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/doctrine/download/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=
+  dependencies:
+    esutils "^2.0.2"
+
+dom-converter@^0.2:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+  integrity sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g=
+  dependencies:
+    utila "~0.4"
+
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1607193036175&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E=
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+dom7@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/dom7/download/dom7-3.0.0.tgz#b861ce5d67a6becd7aaa3ad02942ff14b1240331"
+  integrity sha1-uGHOXWemvs16qjrQKUL/FLEkAzE=
+  dependencies:
+    ssr-window "^3.0.0-alpha.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1604239910191&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=
+
+domelementtype@1, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1606866004215&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8=
+
+domelementtype@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.1.0.tgz?cache=0&sync_timestamp=1606866004215&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha1-qFHAgKbRw9lDRK7RUdmfZp7fWF4=
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.npm.taobao.org/domhandler/download/domhandler-2.4.2.tgz?cache=0&sync_timestamp=1606872205374&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomhandler%2Fdownload%2Fdomhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.npm.taobao.org/domutils/download/domutils-1.5.1.tgz?cache=0&sync_timestamp=1607393052726&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomutils%2Fdownload%2Fdomutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1, domutils@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npm.taobao.org/domutils/download/domutils-1.7.0.tgz?cache=0&sync_timestamp=1607393052726&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomutils%2Fdownload%2Fdomutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+dot-prop@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778235569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog=
+  dependencies:
+    is-obj "^2.0.0"
+
+duplexer@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY=
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.npm.taobao.org/duplexify/download/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+ejs@^2.5.7:
+  version "2.7.4"
+  resolved "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz?cache=0&sync_timestamp=1597678376225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fejs%2Fdownload%2Fejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
+  integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=
+
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.621:
+  version "1.3.627"
+  resolved "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.627.tgz?cache=0&sync_timestamp=1608057156437&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.627.tgz#4acdbbbbe31eb605fba8380063fd9c8a7e5ca4a0"
+  integrity sha1-Ss27u+MetgX7qDgAY/2cin5cpKA=
+
+element-resize-detector@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/element-resize-detector/download/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
+  integrity sha1-sDBRlER6SGMVXljxMyOgrvMIUdE=
+  dependencies:
+    batch-processor "1.0.0"
+
+elliptic@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492844326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha1-y1nrLv2vc6C9eMzXAVpirW4Pk9Y=
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY=
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha1-VXBmIEatKeLpFucariYKvf9Pang=
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-3.4.1.tgz?cache=0&sync_timestamp=1606945801227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  integrity sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.7"
+
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/entities/download/entities-1.1.2.tgz?cache=0&sync_timestamp=1602896995436&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fentities%2Fdownload%2Fentities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha1-vfpzUplmTfr9NFKe1PhSKidf6lY=
+
+entities@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/entities/download/entities-2.1.0.tgz?cache=0&sync_timestamp=1602896995436&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fentities%2Fdownload%2Fentities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha1-mS0xKc999ocLlsV4WMJJoSD4uLU=
+
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0, error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8=
+  dependencies:
+    is-arrayish "^0.2.1"
+
+error-stack-parser@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.npm.taobao.org/error-stack-parser/download/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
+  integrity sha1-WpmnB716TFinl5AtSNgoA+3mqtg=
+  dependencies:
+    stackframe "^1.1.1"
+
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
+  version "1.17.7"
+  resolved "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+  integrity sha1-pN5hsvZpifx0IWdsHLl4dXOs5Uw=
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.1"
+  resolved "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha1-bjoKS9pxflAjqzuOkL7DYQjSLGg=
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14:
+  version "0.10.53"
+  resolved "https://registry.npm.taobao.org/es5-ext/download/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha1-k8WjrP2+8nUiCtcmRK0C7hg2jeE=
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
+
+es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/es6-iterator/download/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/es6-map/download/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/es6-set/download/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-symbol@^3.1.1, es6-symbol@~3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha1-utXTwbzawoJp9MszHkMceKxwXRg=
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
+es6-weak-map@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/es6-weak-map/download/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  integrity sha1-ttofFswswNm+Q+a9v8Xn383zHVM=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.1"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/escalade/download/escalade-3.1.1.tgz?cache=0&sync_timestamp=1602567261690&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescalade%2Fdownload%2Fescalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA=
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.npm.taobao.org/escope/download/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-standard@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.npm.taobao.org/eslint-config-standard/download/eslint-config-standard-10.2.1.tgz?cache=0&sync_timestamp=1605662653337&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-standard%2Fdownload%2Feslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
+  integrity sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=
+
+eslint-friendly-formatter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/eslint-friendly-formatter/download/eslint-friendly-formatter-3.0.0.tgz#278874435a6c46ec1d94fa0b1ff494e30ef04290"
+  integrity sha1-J4h0Q1psRuwdlPoLH/SU4w7wQpA=
+  dependencies:
+    chalk "^1.0.0"
+    coalescy "1.0.0"
+    extend "^3.0.0"
+    minimist "^1.2.0"
+    text-table "^0.2.0"
+
+eslint-import-resolver-node@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.npm.taobao.org/eslint-import-resolver-node/download/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha1-hf+oGULCUBLYIxCW3fZ5wDBCxxc=
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.13.1"
+
+eslint-loader@^1.7.1:
+  version "1.9.0"
+  resolved "https://registry.npm.taobao.org/eslint-loader/download/eslint-loader-1.9.0.tgz?cache=0&sync_timestamp=1601214436656&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-loader%2Fdownload%2Feslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13"
+  integrity sha1-fhvp/t3KMo09z67xrUnVvv/oOhM=
+  dependencies:
+    loader-fs-cache "^1.0.0"
+    loader-utils "^1.0.2"
+    object-assign "^4.0.1"
+    object-hash "^1.1.4"
+    rimraf "^2.6.1"
+
+eslint-module-utils@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.npm.taobao.org/eslint-module-utils/download/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+  integrity sha1-V569CU9Wr3eX0ZyYZsnJSGYpv6Y=
+  dependencies:
+    debug "^2.6.9"
+    pkg-dir "^2.0.0"
+
+eslint-plugin-import@^2.7.0:
+  version "2.22.1"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-import/download/eslint-plugin-import-2.22.1.tgz?cache=0&sync_timestamp=1601248228092&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-import%2Fdownload%2Feslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha1-CJbH5qDPRBCaLZe5WQPCu2iddwI=
+  dependencies:
+    array-includes "^3.1.1"
+    array.prototype.flat "^1.2.3"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.4"
+    eslint-module-utils "^2.6.0"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.1"
+    read-pkg-up "^2.0.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
+
+eslint-plugin-node@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-node/download/eslint-plugin-node-5.2.1.tgz?cache=0&sync_timestamp=1585396173828&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-node%2Fdownload%2Feslint-plugin-node-5.2.1.tgz#80df3253c4d7901045ec87fa660a284e32bdca29"
+  integrity sha1-gN8yU8TXkBBF7If6ZgooTjK9yik=
+  dependencies:
+    ignore "^3.3.6"
+    minimatch "^3.0.4"
+    resolve "^1.3.3"
+    semver "5.3.0"
+
+eslint-plugin-promise@^3.4.0:
+  version "3.8.0"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-promise/download/eslint-plugin-promise-3.8.0.tgz#65ebf27a845e3c1e9d6f6a5622ddd3801694b621"
+  integrity sha1-ZevyeoRePB6db2pWIt3TgBaUtiE=
+
+eslint-plugin-standard@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-standard/download/eslint-plugin-standard-3.1.0.tgz?cache=0&sync_timestamp=1606091906004&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-standard%2Fdownload%2Feslint-plugin-standard-3.1.0.tgz#2a9e21259ba4c47c02d53b2d0c9135d4b1022d47"
+  integrity sha1-Kp4hJZukxHwC1TstDJE11LECLUc=
+
+eslint-plugin-vue@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-vue/download/eslint-plugin-vue-4.7.1.tgz?cache=0&sync_timestamp=1607053911597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-vue%2Fdownload%2Feslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
+  integrity sha1-yCm5/GJYLBiXtaC5Sv1E7MpRHmM=
+  dependencies:
+    vue-eslint-parser "^2.0.3"
+
+eslint-scope@3.7.1:
+  version "3.7.1"
+  resolved "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-3.7.1.tgz?cache=0&sync_timestamp=1599933677754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^3.7.1:
+  version "3.7.3"
+  resolved "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-3.7.3.tgz?cache=0&sync_timestamp=1599933677754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
+  integrity sha1-u1ByANPRf2AkdjYWC0gmKEsQhTU=
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-visitor-keys@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.3.0.tgz?cache=0&sync_timestamp=1597435545176&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-visitor-keys%2Fdownload%2Feslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha1-MOvR73wv3/AcOk8VEESvJfqwUj4=
+
+eslint@^4.15.0:
+  version "4.19.1"
+  resolved "https://registry.npm.taobao.org/eslint/download/eslint-4.19.1.tgz?cache=0&sync_timestamp=1607153232609&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+  integrity sha1-MtHWU+HZBAiFS/spbwdux+GGowA=
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
+    esquery "^1.0.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.0.1"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
+
+espree@^3.5.2, espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.npm.taobao.org/espree/download/espree-3.5.4.tgz?cache=0&sync_timestamp=1607143957865&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fespree%2Fdownload%2Fespree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  integrity sha1-sPRHGHyKi+2US4FaZgvd9d610ac=
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.npm.taobao.org/esprima/download/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=
+
+esquery@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/esquery/download/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha1-t4tYKKqOIU4p+3TE1bdS4cAz2lc=
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha1-eteWTWeauyi+5yzsY3WLHF0smSE=
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1596642941915&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.npm.taobao.org/estraverse/download/estraverse-5.2.0.tgz?cache=0&sync_timestamp=1596642941915&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Festraverse%2Fdownload%2Festraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha1-MH30JUfmzHMk088DwVXVzbjFOIA=
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.npm.taobao.org/event-emitter/download/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz?cache=0&sync_timestamp=1598517724259&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8=
+
+events@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.npm.taobao.org/events/download/events-3.2.0.tgz?cache=0&sync_timestamp=1595422602348&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fevents%2Fdownload%2Fevents-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=
+
+eventsource@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
+  dependencies:
+    original ">=0.0.5"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npm.taobao.org/execa/download/execa-0.7.0.tgz?cache=0&sync_timestamp=1606970920652&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexeca%2Fdownload%2Fexeca-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+express@^4.16.2:
+  version "4.17.1"
+  resolved "https://registry.npm.taobao.org/express/download/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+ext@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/ext/download/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  integrity sha1-ia56BxWPedNVF4gpBDJAd+Q3kkQ=
+  dependencies:
+    type "^2.0.0"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=
+
+external-editor@^2.0.4:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/external-editor/download/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+  integrity sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/extract-text-webpack-plugin/download/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  integrity sha1-XwQ+qgL5dQqSWLeMCm4NwUCPsvc=
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz?cache=0&sync_timestamp=1591599675178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599675178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz?cache=0&sync_timestamp=1595428000133&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-levenshtein%2Fdownload%2Ffast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastparse@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/fastparse/download/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha1-kXKMWllC7O2FMSg8eUQe5BIsNak=
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.0:
+  version "0.11.3"
+  resolved "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha1-XA6aiWjokSwoZjn96XeosgnyUI4=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/file-entry-cache/download/file-entry-cache-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-entry-cache%2Fdownload%2Ffile-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@^1.1.4:
+  version "1.1.11"
+  resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
+  integrity sha1-b+iGRJsPKpNuQ8q6rAzb+zaVBvg=
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.4.5"
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=
+
+filesize@^3.5.11:
+  version "3.6.1"
+  resolved "https://registry.npm.taobao.org/filesize/download/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
+  integrity sha1-CQuz7gG2+AGoqL6Z0xcQs0Irsxc=
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha1-GRmmp8df44ssfHflGYU12prN2kA=
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  integrity sha1-yN765XyKUqinhPnjHFfHQumToLk=
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=
+  dependencies:
+    locate-path "^3.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.4"
+  resolved "https://registry.npm.taobao.org/flat-cache/download/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
+  integrity sha1-LC73dSXMKSkAff/6HdMUqpyd7m8=
+  dependencies:
+    circular-json "^0.3.1"
+    graceful-fs "^4.1.2"
+    rimraf "~2.6.2"
+    write "^0.2.1"
+
+flatten@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/flatten/download/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+  integrity sha1-wSg6yfJ7Noq8HjbR/3sEUBowNWs=
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@1.5.10:
+  version "1.5.10"
+  resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&sync_timestamp=1607916846877&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=
+  dependencies:
+    debug "=3.1.0"
+
+follow-redirects@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.1.tgz?cache=0&sync_timestamp=1607916846877&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha1-X2m4Ezds7k/QR0o6uoNd8Eq3Y7c=
+
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.npm.taobao.org/for-in/download/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
+for-in@^1.0.1, for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/for-own/download/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  dependencies:
+    for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha1-3M5SwF9kTymManq5Nr1yTO/786Y=
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+friendly-errors-webpack-plugin@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.npm.taobao.org/friendly-errors-webpack-plugin/download/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136"
+  integrity sha1-78hsu4FiJFZYYaG+ep2E0Kr+oTY=
+  dependencies:
+    chalk "^1.1.3"
+    error-stack-parser "^2.0.0"
+    string-width "^2.0.0"
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.13"
+  resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.13.tgz?cache=0&sync_timestamp=1608033993741&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+fsevents@~2.1.2:
+  version "2.1.3"
+  resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.3.tgz?cache=0&sync_timestamp=1608033993741&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha1-+3OHA66NL5/pAMM4Nt3r7ouX8j4=
+
+fstream@^1.0.0, fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gaze@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=
+  dependencies:
+    globule "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=
+
+get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/get-intrinsic/download/get-intrinsic-1.0.1.tgz?cache=0&sync_timestamp=1604120592084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-intrinsic%2Fdownload%2Fget-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha1-lKl2j8vdBZWhySc6rPTInQdWMb4=
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz?cache=0&sync_timestamp=1597056535605&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-stream%2Fdownload%2Fget-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1584836110944&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@~5.1.0:
+  version "5.1.1"
+  resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz?cache=0&sync_timestamp=1584836110944&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha1-tsHvQXxOVmPqSY8cRa+saRa7wik=
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@~7.1.1:
+  version "7.1.6"
+  resolved "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^11.0.1, globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1607413603346&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.npm.taobao.org/globals/download/globals-9.18.0.tgz?cache=0&sync_timestamp=1607413603346&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npm.taobao.org/globby/download/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
+globule@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.npm.taobao.org/globule/download/globule-1.3.2.tgz?cache=0&sync_timestamp=1591641966255&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobule%2Fdownload%2Fglobule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
+  integrity sha1-2L3Z6eTu+PluJFmZpd7n612FKcQ=
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+  version "4.2.4"
+  resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha1-Ila94U02MpWMRl68ltxGfKB6Kfs=
+
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/growly/download/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+gzip-size@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/gzip-size/download/gzip-size-4.1.0.tgz?cache=0&sync_timestamp=1605523140245&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgzip-size%2Fdownload%2Fgzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
+  integrity sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=
+  dependencies:
+    duplexer "^0.1.1"
+    pify "^3.0.0"
+
+handle-thing@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04=
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.npm.taobao.org/har-validator/download/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha1-HwgDufjLIMD6E4It8ezds2veHv0=
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=
+
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg=
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npm.taobao.org/has-values/download/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/has-values/download/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/hash-base/download/hash-base-3.1.0.tgz?cache=0&sync_timestamp=1588317988964&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhash-base%2Fdownload%2Fhash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha1-VcOB2eBuHSmXqIO0o/3f5/DTrzM=
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+hash-sum@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+  integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.npm.taobao.org/hash.js/download/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+he@1.2.x, he@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8=
+
+hex-color-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/hex-color-regex/download/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
+  integrity sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/home-or-tmp/download/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+  version "2.8.8"
+  resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.8.tgz?cache=0&sync_timestamp=1602801378957&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha1-dTm9S8Hg4KiVgVouAmJCCxKFhIg=
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+hsl-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/hsl-regex/download/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
+  integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
+
+hsla-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/hsla-regex/download/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
+  integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
+
+html-comment-regex@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/html-comment-regex/download/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha1-l9RoiutcgYhqNk+qDK0d2hTUM6c=
+
+html-entities@^1.2.0:
+  version "1.3.3"
+  resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-1.3.3.tgz?cache=0&sync_timestamp=1607916510028&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-entities%2Fdownload%2Fhtml-entities-1.3.3.tgz#3dca638a43ee7de316fc23067398491152ad4736"
+  integrity sha1-PcpjikPufeMW/CMGc5hJEVKtRzY=
+
+html-minifier@^3.2.3:
+  version "3.5.21"
+  resolved "https://registry.npm.taobao.org/html-minifier/download/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
+    he "1.2.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.4.x"
+
+html-webpack-plugin@^2.30.1:
+  version "2.30.1"
+  resolved "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-2.30.1.tgz?cache=0&sync_timestamp=1608059475485&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
+  integrity sha1-f5xCG36pHsRg9WUn1430hO51N9U=
+  dependencies:
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    toposort "^1.0.0"
+
+htmlparser2@^3.3.0:
+  version "3.10.1"
+  resolved "https://registry.npm.taobao.org/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1607394274032&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8=
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.npm.taobao.org/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1593407611415&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1593407611415&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.npm.taobao.org/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1593407611415&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha1-bGGeT5xgMIw4UZSYwU+7EKrOuwY=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.2"
+  resolved "https://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
+  integrity sha1-2i4x0jezk6rnKs5DiC3X4nCo/3c=
+
+http-proxy-middleware@^0.19.1:
+  version "0.19.2"
+  resolved "https://registry.npm.taobao.org/http-proxy-middleware/download/http-proxy-middleware-0.19.2.tgz#ee73dcc8348165afefe8de2ff717751d181608ee"
+  integrity sha1-7nPcyDSBZa/v6N4v9xd1HRgWCO4=
+  dependencies:
+    http-proxy "^1.18.1"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk=
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+iconv-lite@0.4.24, iconv-lite@^0.4.17:
+  version "0.4.24"
+  resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1594184325364&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
+
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-2.1.0.tgz?cache=0&sync_timestamp=1605801266348&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+  dependencies:
+    postcss "^6.0.1"
+
+ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/ieee754/download/ieee754-1.2.1.tgz?cache=0&sync_timestamp=1603838364836&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fieee754%2Fdownload%2Fieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha1-jrehCmP/8l0VpXsAFYbRd9Gw01I=
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/iferr/download/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
+  version "3.3.10"
+  resolved "https://registry.npm.taobao.org/ignore/download/ignore-3.3.10.tgz?cache=0&sync_timestamp=1590809380232&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fignore%2Fdownload%2Fignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-2.0.0.tgz?cache=0&sync_timestamp=1604256115691&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/import-from/download/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  dependencies:
+    resolve-from "^3.0.0"
+
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/import-local/download/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha1-Xk/9wD9P5sAJxnKb6yljHC+CJ7w=
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+in-publish@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
+  integrity sha1-lIsaU1yAMFYc6lIvc/ePS+NX4Aw=
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+  dependencies:
+    repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.npm.taobao.org/inquirer/download/inquirer-3.3.0.tgz?cache=0&sync_timestamp=1595471629455&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finquirer%2Fdownload%2Finquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  integrity sha1-ndLyrXZdyrH/BEO0kUQqILoifck=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+internal-ip@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/internal-ip/download/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+  integrity sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=
+  dependencies:
+    meow "^3.3.0"
+
+interpret@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4=
+
+invariant@^2.2.0, invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
+ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha1-v/OFQ+64mEglB5/zoqjmy9RngbM=
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arguments@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.1.0.tgz?cache=0&sync_timestamp=1607117404740&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha1-YjUwMd++4HzrNGVqa95Z7+yujdk=
+  dependencies:
+    call-bind "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha1-RXSirlb3qyBolvtDHq7tBm/fjwM=
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha1-76ouqdqg16suoTqXsritUf776L4=
+
+is-callable@^1.1.4, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.2.tgz?cache=0&sync_timestamp=1600719276620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-callable%2Fdownload%2Fis-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk=
+
+is-color-stop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-color-stop/download/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
+  integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
+  dependencies:
+    css-color-names "^0.0.4"
+    hex-color-regex "^1.1.0"
+    hsl-regex "^1.0.0"
+    hsla-regex "^1.0.0"
+    rgb-regex "^1.0.1"
+    rgba-regex "^1.0.0"
+
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/is-core-module/download/is-core-module-2.2.0.tgz?cache=0&sync_timestamp=1606411621990&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-core-module%2Fdownload%2Fis-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha1-lwN+89UiJNhRY/VZeytj2a/tmBo=
+  dependencies:
+    has "^1.0.3"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha1-vac28s2P0G0yhE53Q7+nSUw7/X4=
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.npm.taobao.org/is-directory/download/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-finite@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-finite/download/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha1-kEE1x3+0LAZB1qobzbxNqo2ggvM=
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-negative-zero@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.1.tgz?cache=0&sync_timestamp=1607123314998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-negative-zero%2Fdownload%2Fis-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ=
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI=
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/is-path-in-cwd/download/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha1-WsSLNF72dTOb1sekipEhELJBz1I=
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/is-path-inside/download/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz?cache=0&sync_timestamp=1602541485176&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-plain-obj%2Fdownload%2Fis-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz?cache=0&sync_timestamp=1599667279942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-plain-object%2Fdownload%2Fis-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=
+  dependencies:
+    isobject "^3.0.1"
+
+is-regex@^1.0.4, is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/is-regex/download/is-regex-1.1.1.tgz?cache=0&sync_timestamp=1596555650246&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k=
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-resolvable/download/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-stream/download/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/is-string/download/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha1-QEk+0ZjvP/R3uMf5L2ROyCpc06Y=
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/is-svg/download/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-svg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/is-svg/download/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+  integrity sha1-kyHb0pwhLlypnE+peUxxS8r6L3U=
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha1-OOEBS55jKb4N6dJKQU/XRB7GGTc=
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz?cache=0&sync_timestamp=1562592096220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisarray%2Fdownload%2Fisarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/isobject/download/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+js-base64@^2.1.8, js-base64@^2.1.9:
+  version "2.6.4"
+  resolved "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1604450430432&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  integrity sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=
+
+js-calendar@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.npm.taobao.org/js-calendar/download/js-calendar-1.2.3.tgz#a583b0644b4e695ba394f344d103dbcc7a7a7d3e"
+  integrity sha1-pYOwZEtOaVujlPNE0QPbzHp6fT4=
+
+js-cookie@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk=
+
+js-yaml@^3.13.1, js-yaml@^3.4.3, js-yaml@^3.9.1:
+  version "3.14.1"
+  resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz?cache=0&sync_timestamp=1607370540152&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-yaml%2Fdownload%2Fjs-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc=
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz?cache=0&sync_timestamp=1607370540152&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-yaml%2Fdownload%2Fjs-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-1.3.0.tgz?cache=0&sync_timestamp=1603891242793&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsesc%2Fdownload%2Fjsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz?cache=0&sync_timestamp=1603891242793&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsesc%2Fdownload%2Fjsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz?cache=0&sync_timestamp=1603891242793&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsesc%2Fdownload%2Fjsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-loader@^0.5.4:
+  version "0.5.7"
+  resolved "https://registry.npm.taobao.org/json-loader/download/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  integrity sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz?cache=0&sync_timestamp=1608000211395&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz?cache=0&sync_timestamp=1608000211395&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-schema-traverse%2Fdownload%2Fjson-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA=
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json3@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.npm.taobao.org/json3/download/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha1-f8EON1/FrkLEcFpcwKpvYr4wW4E=
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.npm.taobao.org/json5/download/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha1-ybD3+pIzv+WAf+ZvzzpWF+1ZfUM=
+  dependencies:
+    minimist "^1.2.5"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+killable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha1-TIzkQRh6Bhx0dPuHygjipjgZSJI=
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=
+
+last-call-webpack-plugin@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/last-call-webpack-plugin/download/last-call-webpack-plugin-2.1.2.tgz#ad80c6e310998294d2ed2180a68e9589e4768c44"
+  integrity sha1-rYDG4xCZgpTS7SGApo6VieR2jEQ=
+  dependencies:
+    lodash "^4.17.4"
+    webpack-sources "^1.0.1"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/lazy-cache/download/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
+less-loader@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npm.taobao.org/less-loader/download/less-loader-5.0.0.tgz?cache=0&sync_timestamp=1605095927771&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless-loader%2Fdownload%2Fless-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha1-SY3eOmxsT4h0WO6e0/CGoSrRtGY=
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^4.0.1"
+
+less@^3.12.2:
+  version "3.13.0"
+  resolved "https://registry.npm.taobao.org/less/download/less-3.13.0.tgz?cache=0&sync_timestamp=1607752017143&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless%2Fdownload%2Fless-3.13.0.tgz#6a47bb19d97edcf7a53d444b099275dd6b17c85a"
+  integrity sha1-ake7Gdl+3PelPURLCZJ13WsXyFo=
+  dependencies:
+    tslib "^1.10.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    native-request "^1.0.5"
+    source-map "~0.6.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+loader-fs-cache@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/loader-fs-cache/download/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9"
+  integrity sha1-8IZXZG1gcHi+LwoDL4vWndbyd9k=
+  dependencies:
+    find-cache-dir "^0.1.1"
+    mkdirp "^0.5.1"
+
+loader-runner@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c=
+
+loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha1-xXm140yzSxp07cbB+za/o3HVphM=
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha1-5MrOW4FtQloWa18JfhDNErNgZLA=
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz?cache=0&sync_timestamp=1597082033698&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1597082033698&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npm.taobao.org/lodash.camelcase/download/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
+lodash.tail@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
+
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
+  version "4.17.20"
+  resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597336147792&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=
+
+log-symbols@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/log-symbols/download/log-symbols-2.2.0.tgz?cache=0&sync_timestamp=1589682056270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flog-symbols%2Fdownload%2Flog-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=
+  dependencies:
+    chalk "^2.0.1"
+
+loglevel@^1.4.1:
+  version "1.7.1"
+  resolved "https://registry.npm.taobao.org/loglevel/download/loglevel-1.7.1.tgz?cache=0&sync_timestamp=1606312222145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha1-AF/eL15uRwaPk1/yhXPhJe9y8Zc=
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz?cache=0&sync_timestamp=1606867384237&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
+lru-cache@^4.0.1, lru-cache@^4.1.1:
+  version "4.1.5"
+  resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=
+  dependencies:
+    pify "^3.0.0"
+
+make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+math-expression-evaluator@^1.2.14:
+  version "1.3.6"
+  resolved "https://registry.npm.taobao.org/math-expression-evaluator/download/math-expression-evaluator-1.3.6.tgz?cache=0&sync_timestamp=1607091729121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmath-expression-evaluator%2Fdownload%2Fmath-expression-evaluator-1.3.6.tgz#fb8c447110093dd5f32e7aec877dd247e3c98eb1"
+  integrity sha1-+4xEcRAJPdXzLnrsh33SR+PJjrE=
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdn-data@2.0.14:
+  version "2.0.14"
+  resolved "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  integrity sha1-cRP8QoGRfWPOKbQ0RvcB5owlulA=
+
+mdn-data@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  integrity sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/mem/download/mem-1.1.0.tgz?cache=0&sync_timestamp=1602347317514&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmem%2Fdownload%2Fmem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+meow@^3.3.0, meow@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1603923086669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmeow%2Fdownload%2Fmeow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha1-cIWbyVyYQJUvNZoGij/En57PrCM=
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/miller-rabin/download/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.npm.taobao.org/mime-db/download/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I=
+
+"mime-db@>= 1.43.0 < 2":
+  version "1.45.0"
+  resolved "https://registry.npm.taobao.org/mime-db/download/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha1-zO7aIczXw6dF66LezVXUtz54eeo=
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.27"
+  resolved "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8=
+  dependencies:
+    mime-db "1.44.0"
+
+mime@1.3.x:
+  version "1.3.6"
+  resolved "https://registry.npm.taobao.org/mime/download/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+  integrity sha1-WR2E02U6awtKO5343lqoEI5y5eA=
+
+mime@1.6.0, mime@^1.4.1, mime@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz?cache=0&sync_timestamp=1596094012686&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+  version "3.0.4"
+  resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=
+
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY=
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/mixin-object/download/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.5"
+  resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8=
+  dependencies:
+    minimist "^1.2.5"
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=
+
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.3.tgz?cache=0&sync_timestamp=1607433856030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha1-V0yBOM4dK1hh8LRFedut1gxmFbI=
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.npm.taobao.org/multicast-dns/download/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik=
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+nan@^2.12.1, nan@^2.13.2:
+  version "2.14.2"
+  resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591700047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+native-request@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.npm.taobao.org/native-request/download/native-request-1.0.8.tgz?cache=0&sync_timestamp=1603410586468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnative-request%2Fdownload%2Fnative-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
+  integrity sha1-j2a/YG4PfqJ8DlmV6y9dA+M65vs=
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs=
+
+neo-async@^2.5.0:
+  version "2.6.2"
+  resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz?cache=0&sync_timestamp=1594317437265&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneo-async%2Fdownload%2Fneo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8=
+
+next-tick@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/next-tick/download/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.npm.taobao.org/no-case/download/no-case-2.3.2.tgz?cache=0&sync_timestamp=1606867284055&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fno-case%2Fdownload%2Fno-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=
+  dependencies:
+    lower-case "^1.1.1"
+
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010730714&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+  integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M=
+
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz?cache=0&sync_timestamp=1602898466165&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-gyp%2Fdownload%2Fnode-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
+node-libs-browser@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha1-tk9RPRgzhiX5A0bSew0jXmMfZCU=
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-notifier@^5.1.2:
+  version "5.4.3"
+  resolved "https://registry.npm.taobao.org/node-notifier/download/node-notifier-5.4.3.tgz?cache=0&sync_timestamp=1608044638570&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-notifier%2Fdownload%2Fnode-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha1-y3La+UyTkECY4oucWQ/YZuRkvVA=
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-releases@^1.1.67:
+  version "1.1.67"
+  resolved "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.67.tgz?cache=0&sync_timestamp=1605581302570&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
+  integrity sha1-KOv8zNC6pqrY6NTY/ky8Sa4jnBI=
+
+node-sass@^4.14.1, node-sass@^4.7.2:
+  version "4.14.1"
+  resolved "https://registry.npm.taobao.org/node-sass/download/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
+  integrity sha1-mch+wu+3BH7WOPtMnbfzpC4iF7U=
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash "^4.17.15"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "2.2.5"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+"nopt@2 || 3":
+  version "3.0.6"
+  resolved "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649930270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+  version "2.5.0"
+  resolved "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.npm.taobao.org/normalize-url/download/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+normalize-url@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npm.taobao.org/normalize-url/download/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha1-suHE3E98bVd0PfczpPWXjRhlBVk=
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+nth-check@^1.0.2, nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1606860690670&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=
+  dependencies:
+    boolbase "~1.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npm.taobao.org/object-copy/download/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^1.1.4:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/object-hash/download/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha1-/eRSCYqVHLFF8Dm7fUVUSd3BJt8=
+
+object-inspect@^1.8.0:
+  version "1.9.0"
+  resolved "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.9.0.tgz?cache=0&sync_timestamp=1606804226254&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha1-yQUh104RJ7ZyZt7TOUrWEWmGUzo=
+
+object-is@^1.0.1:
+  version "1.1.4"
+  resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.4.tgz?cache=0&sync_timestamp=1606460503743&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-is%2Fdownload%2Fobject-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
+  integrity sha1-Y9bIPACkP0y8lDTrl1fIpbhWUGg=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha1-HEfyct8nfzsdrwYWd9nILiMixg4=
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.npm.taobao.org/object.assign/download/object.assign-4.1.2.tgz?cache=0&sync_timestamp=1604115183005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.assign%2Fdownload%2Fobject.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha1-DtVKNC7Os3s4/3brgxoOeIy2OUA=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.1.tgz?cache=0&sync_timestamp=1606458152492&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha1-Df2o0QgHTZxWPoBJDIg7ZmEJFUQ=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/object.pick/download/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+object.values@^1.1.0, object.values@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/object.values/download/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha1-eiAV4G/LD1Rr1lJIbOhYOkcxxzE=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+    has "^1.0.3"
+
+obuf@^1.0.0, obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/on-headers/download/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha1-dysK5qqlJcOZ5Imt+tkMQD6zwo8=
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+opener@^1.4.3:
+  version "1.5.2"
+  resolved "https://registry.npm.taobao.org/opener/download/opener-1.5.2.tgz?cache=0&sync_timestamp=1598733439329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fopener%2Fdownload%2Fopener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha1-XTfh81B3udysQwE3InGv3rKhNZg=
+
+opn@^5.1.0:
+  version "5.5.0"
+  resolved "https://registry.npm.taobao.org/opn/download/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha1-/HFk+rVtI1kExRw7J9pnWMo7m/w=
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimize-css-assets-webpack-plugin@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.npm.taobao.org/optimize-css-assets-webpack-plugin/download/optimize-css-assets-webpack-plugin-3.2.1.tgz#9d18654a0e058c090bdd991b04bcb0f6f2486573"
+  integrity sha1-nRhlSg4FjAkL3ZkbBLyw9vJIZXM=
+  dependencies:
+    cssnano "^4.1.10"
+    last-call-webpack-plugin "^2.1.2"
+
+optionator@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+ora@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/ora/download/ora-1.4.0.tgz?cache=0&sync_timestamp=1599425777660&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fora%2Fdownload%2Fora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5"
+  integrity sha1-iERYIVs6XUCXWSKF+TMhu3p54uU=
+  dependencies:
+    chalk "^2.1.0"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.0.1"
+    log-symbols "^2.1.0"
+
+original@>=0.0.5:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/original/download/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=
+  dependencies:
+    url-parse "^1.4.3"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+  dependencies:
+    lcid "^1.0.0"
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@0:
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha1-hc36+uso6Gd/QW4odZK18/SepBA=
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-limit@^1.0.0, p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz?cache=0&sync_timestamp=1606288333421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1606288333421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz?cache=0&sync_timestamp=1597081369770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-locate%2Fdownload%2Fp-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz?cache=0&sync_timestamp=1597081369770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-locate%2Fdownload%2Fp-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/p-map/download/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.npm.taobao.org/pako/download/pako-1.0.11.tgz?cache=0&sync_timestamp=1605741996457&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpako%2Fdownload%2Fpako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha1-kEnKN9bLIYLDsdLHIL6U0UpYFPw=
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/param-case/download/param-case-2.1.1.tgz?cache=0&sync_timestamp=1606867311360&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparam-case%2Fdownload%2Fparam-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+  dependencies:
+    no-case "^2.2.0"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.6.tgz?cache=0&sync_timestamp=1597167448404&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-asn1%2Fdownload%2Fparse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha1-OFCAo+wTy2KmLTlAnLPoiETNrtQ=
+  dependencies:
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz?cache=0&sync_timestamp=1598129273895&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/parse-json/download/parse-json-4.0.0.tgz?cache=0&sync_timestamp=1598129273895&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha1-5sTd1+06onxoogzE5Q4aTug7vEo=
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz?cache=0&sync_timestamp=1601400247487&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-to-regexp%2Fdownload%2Fpath-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/path-type/download/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  dependencies:
+    pify "^2.0.0"
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/path-type/download/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=
+  dependencies:
+    pify "^3.0.0"
+
+pbkdf2@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha1-y4cksPramEWWhW0abrr9NYRlS5Q=
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.4, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-1.0.0.tgz?cache=0&sync_timestamp=1602858957553&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpkg-dir%2Fdownload%2Fpkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
+  dependencies:
+    find-up "^1.0.0"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz?cache=0&sync_timestamp=1602858957553&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpkg-dir%2Fdownload%2Fpkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npm.taobao.org/pluralize/download/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=
+
+popper.js@^1.14.6:
+  version "1.16.1"
+  resolved "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  integrity sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=
+
+portfinder@^1.0.13, portfinder@^1.0.9:
+  version "1.0.28"
+  resolved "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.28.tgz?cache=0&sync_timestamp=1596018172434&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fportfinder%2Fdownload%2Fportfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha1-Z8RiKFK9U3TdHdkA93n1NGL6x3g=
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.5"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.npm.taobao.org/postcss-calc/download/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-calc@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.npm.taobao.org/postcss-calc/download/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
+  integrity sha1-+KbpnxLmGcLrwjz2xIb9wVhgkz4=
+  dependencies:
+    postcss "^7.0.27"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.2"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/postcss-colormin/download/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-colormin@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npm.taobao.org/postcss-colormin/download/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
+  integrity sha1-rgYLzpPteUrHEmTwgTLVUJVr04E=
+  dependencies:
+    browserslist "^4.0.0"
+    color "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-convert-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
+  integrity sha1-yjgT7U2g+BL51DcDWE5Enr4Ymn8=
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/postcss-discard-comments/download/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-comments@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-discard-comments/download/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
+  integrity sha1-H7q9LCRr/2qq15l7KwkY9NevQDM=
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/postcss-discard-duplicates/download/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-duplicates@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-discard-duplicates/download/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
+  integrity sha1-P+EzzTyCKC5VD8myORdqkge3hOs=
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/postcss-discard-empty/download/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-empty@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-discard-empty/download/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
+  integrity sha1-yMlR6fc+2UKAGUWERKAq2Qu592U=
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/postcss-discard-overridden/download/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-overridden@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-discard-overridden/download/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
+  integrity sha1-ZSrvipZybwKfXj4AFG7npOdV/1c=
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.npm.taobao.org/postcss-discard-unused/download/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/postcss-filter-plugins/download/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
+  integrity sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-import@^11.0.0:
+  version "11.1.0"
+  resolved "https://registry.npm.taobao.org/postcss-import/download/postcss-import-11.1.0.tgz?cache=0&sync_timestamp=1603232699651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-import%2Fdownload%2Fpostcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
+  integrity sha1-Vck2LJGSmU7GiGXSJEGd8dspgfA=
+  dependencies:
+    postcss "^6.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-load-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-1.2.0.tgz?cache=0&sync_timestamp=1601607668112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-load-config%2Fdownload%2Fpostcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  integrity sha1-U56a/J3chiASHr+djDZz4M5Q0oo=
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+    postcss-load-options "^1.2.0"
+    postcss-load-plugins "^2.3.0"
+
+postcss-load-config@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-2.1.2.tgz?cache=0&sync_timestamp=1601607668112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-load-config%2Fdownload%2Fpostcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha1-xepQTyxK7zPHNZo03jVzdyrXUCo=
+  dependencies:
+    cosmiconfig "^5.0.0"
+    import-cwd "^2.0.0"
+
+postcss-load-options@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/postcss-load-options/download/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  integrity sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+
+postcss-load-plugins@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/postcss-load-plugins/download/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  integrity sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=
+  dependencies:
+    cosmiconfig "^2.1.1"
+    object-assign "^4.1.0"
+
+postcss-loader@^2.0.8:
+  version "2.1.6"
+  resolved "https://registry.npm.taobao.org/postcss-loader/download/postcss-loader-2.1.6.tgz?cache=0&sync_timestamp=1605790914769&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-loader%2Fdownload%2Fpostcss-loader-2.1.6.tgz#1d7dd7b17c6ba234b9bed5af13e0bea40a42d740"
+  integrity sha1-HX3XsXxrojS5vtWvE+C+pApC10A=
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^6.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^0.4.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.npm.taobao.org/postcss-merge-idents/download/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-merge-longhand/download/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-longhand@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.npm.taobao.org/postcss-merge-longhand/download/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
+  integrity sha1-YvSaE+Sg7gTnuY9CuxYGLKJUniQ=
+  dependencies:
+    css-color-names "0.0.4"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    stylehacks "^4.0.0"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/postcss-merge-rules/download/postcss-merge-rules-2.1.2.tgz?cache=0&sync_timestamp=1603212988598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-merge-rules@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npm.taobao.org/postcss-merge-rules/download/postcss-merge-rules-4.0.3.tgz?cache=0&sync_timestamp=1603212988598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
+  integrity sha1-NivqT/Wh+Y5AdacTxsslrv75plA=
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    cssnano-util-same-parent "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/postcss-message-helpers/download/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/postcss-minify-font-values/download/postcss-minify-font-values-1.0.5.tgz?cache=0&sync_timestamp=1603212988693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-font-values%2Fdownload%2Fpostcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-font-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-minify-font-values/download/postcss-minify-font-values-4.0.2.tgz?cache=0&sync_timestamp=1603212988693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-font-values%2Fdownload%2Fpostcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
+  integrity sha1-zUw0TM5HQ0P6xdgiBqssvLiv1aY=
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/postcss-minify-gradients/download/postcss-minify-gradients-1.0.5.tgz?cache=0&sync_timestamp=1603212988789&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-gradients%2Fdownload%2Fpostcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-gradients@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-minify-gradients/download/postcss-minify-gradients-4.0.2.tgz?cache=0&sync_timestamp=1603212988789&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-gradients%2Fdownload%2Fpostcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
+  integrity sha1-k7KcL/UJnFNe7NpWxKpuZlpmNHE=
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    is-color-stop "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.npm.taobao.org/postcss-minify-params/download/postcss-minify-params-1.2.2.tgz?cache=0&sync_timestamp=1603212989080&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-params@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-minify-params/download/postcss-minify-params-4.0.2.tgz?cache=0&sync_timestamp=1603212989080&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
+  integrity sha1-a5zvAwwR41Jh+V9hjJADbWgNuHQ=
+  dependencies:
+    alphanum-sort "^1.0.0"
+    browserslist "^4.0.0"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/postcss-minify-selectors/download/postcss-minify-selectors-2.1.1.tgz?cache=0&sync_timestamp=1603212989181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-minify-selectors@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-minify-selectors/download/postcss-minify-selectors-4.0.2.tgz?cache=0&sync_timestamp=1603212989181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
+  integrity sha1-4uXrQL/uUA0M2SQ1APX46kJi+9g=
+  dependencies:
+    alphanum-sort "^1.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+
+postcss-modules-extract-imports@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.2.1.tgz?cache=0&sync_timestamp=1602588260997&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-extract-imports%2Fdownload%2Fpostcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
+  integrity sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-modules-local-by-default@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-1.2.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-scope@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-1.1.0.tgz?cache=0&sync_timestamp=1602593195049&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-scope%2Fdownload%2Fpostcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-values@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-1.3.0.tgz?cache=0&sync_timestamp=1602586215124&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-values%2Fdownload%2Fpostcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+  dependencies:
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-charset/download/postcss-normalize-charset-1.1.1.tgz?cache=0&sync_timestamp=1603212989274&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-charset@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-charset/download/postcss-normalize-charset-4.0.1.tgz?cache=0&sync_timestamp=1603212989274&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
+  integrity sha1-izWt067oOhNrBHHg1ZvlilAoXdQ=
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-normalize-display-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-display-values/download/postcss-normalize-display-values-4.0.2.tgz?cache=0&sync_timestamp=1603212989356&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
+  integrity sha1-Db4EpM6QY9RmftK+R2u4MMglk1o=
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-positions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-positions/download/postcss-normalize-positions-4.0.2.tgz?cache=0&sync_timestamp=1603212989457&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-positions%2Fdownload%2Fpostcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
+  integrity sha1-BfdX+E8mBDc3g2ipH4ky1LECkX8=
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-repeat-style@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
+  integrity sha1-xOu8KJ85kaAo1EdRy90RkYsXkQw=
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-string@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-string/download/postcss-normalize-string-4.0.2.tgz?cache=0&sync_timestamp=1603212989626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-string%2Fdownload%2Fpostcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
+  integrity sha1-zUTECrB6DHo23F6Zqs4eyk7CaQw=
+  dependencies:
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-timing-functions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-4.0.2.tgz?cache=0&sync_timestamp=1603212989711&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-timing-functions%2Fdownload%2Fpostcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
+  integrity sha1-jgCcoqOUnNr4rSPmtquZy159KNk=
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-unicode@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-unicode/download/postcss-normalize-unicode-4.0.1.tgz?cache=0&sync_timestamp=1603212989791&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-unicode%2Fdownload%2Fpostcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
+  integrity sha1-hBvUj9zzAZrUuqdJOj02O1KuHPs=
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-url/download/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-normalize-url@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-url/download/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
+  integrity sha1-EOQ3+GvHx+WPe5ZS7YeNqqlfquE=
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-whitespace@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-normalize-whitespace/download/postcss-normalize-whitespace-4.0.2.tgz?cache=0&sync_timestamp=1603212989985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
+  integrity sha1-vx1AcP5Pzqh9E0joJdjMDF+qfYI=
+  dependencies:
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.npm.taobao.org/postcss-ordered-values/download/postcss-ordered-values-2.2.3.tgz?cache=0&sync_timestamp=1603212990084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-ordered-values@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.npm.taobao.org/postcss-ordered-values/download/postcss-ordered-values-4.1.2.tgz?cache=0&sync_timestamp=1603212990084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
+  integrity sha1-DPdcgg7H1cTSgBiVWeC1ceusDu4=
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.npm.taobao.org/postcss-reduce-idents/download/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-reduce-initial/download/postcss-reduce-initial-1.0.1.tgz?cache=0&sync_timestamp=1603212990186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-reduce-initial%2Fdownload%2Fpostcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-initial@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npm.taobao.org/postcss-reduce-initial/download/postcss-reduce-initial-4.0.3.tgz?cache=0&sync_timestamp=1603212990186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-reduce-initial%2Fdownload%2Fpostcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
+  integrity sha1-f9QuvqXpyBRgljniwuhK4nC6SN8=
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/postcss-reduce-transforms/download/postcss-reduce-transforms-1.0.4.tgz?cache=0&sync_timestamp=1603212990408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-reduce-transforms%2Fdownload%2Fpostcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-transforms@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-reduce-transforms/download/postcss-reduce-transforms-4.0.2.tgz?cache=0&sync_timestamp=1603212990408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-reduce-transforms%2Fdownload%2Fpostcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
+  integrity sha1-F++kBerMbge+NBSlyi0QdGgdTik=
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-selector-parser@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+  integrity sha1-sxD1xMD9r3b5SQK7qjDbaqhPUnA=
+  dependencies:
+    dot-prop "^5.2.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-selector-parser@^6.0.2:
+  version "6.0.4"
+  resolved "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha1-VgdaE4CgRgTDiwY+p3Z6Epr1wrM=
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+    util-deprecate "^1.0.2"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.npm.taobao.org/postcss-svgo/download/postcss-svgo-2.1.6.tgz?cache=0&sync_timestamp=1603212990509&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-svgo@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-svgo/download/postcss-svgo-4.0.2.tgz?cache=0&sync_timestamp=1603212990509&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
+  integrity sha1-F7mXvHEbMzurFDqu07jT1uPTglg=
+  dependencies:
+    is-svg "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    svgo "^1.0.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/postcss-unique-selectors/download/postcss-unique-selectors-2.0.2.tgz?cache=0&sync_timestamp=1603212990717&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-unique-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/postcss-unique-selectors/download/postcss-unique-selectors-4.0.1.tgz?cache=0&sync_timestamp=1603212990717&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
+  integrity sha1-lEaRHzKJv9ZMbWgPBzwDsfnuS6w=
+  dependencies:
+    alphanum-sort "^1.0.0"
+    postcss "^7.0.0"
+    uniqs "^2.0.0"
+
+postcss-url@^7.2.1:
+  version "7.3.2"
+  resolved "https://registry.npm.taobao.org/postcss-url/download/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120"
+  integrity sha1-X+onOAf7hLOMRhw8mp6KvSNfcSA=
+  dependencies:
+    mime "^1.4.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^6.0.1"
+    xxhashjs "^0.2.1"
+
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha1-n/giVH4okyE88cMO+lGsX9G6goE=
+
+postcss-value-parser@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha1-RD9qIM7WSBor2k+oUypuVdeJoss=
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/postcss-zindex/download/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz?cache=0&sync_timestamp=1607512981267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  integrity sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.17, postcss@^6.0.8:
+  version "6.0.23"
+  resolved "https://registry.npm.taobao.org/postcss/download/postcss-6.0.23.tgz?cache=0&sync_timestamp=1607512981267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
+  version "7.0.35"
+  resolved "https://registry.npm.taobao.org/postcss/download/postcss-7.0.35.tgz?cache=0&sync_timestamp=1607512981267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha1-0r4AuZj38hHYonaXQHny6SuXDiQ=
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/prepend-http/download/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prettier@^1.7.0:
+  version "1.19.1"
+  resolved "https://registry.npm.taobao.org/prettier/download/prettier-1.19.1.tgz?cache=0&sync_timestamp=1606521077298&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=
+
+pretty-error@^2.0.2:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/pretty-error/download/pretty-error-2.1.2.tgz?cache=0&sync_timestamp=1603050483661&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpretty-error%2Fdownload%2Fpretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
+  integrity sha1-von4LYGxyG7I/fvDhQRYgnJ/k7Y=
+  dependencies:
+    lodash "^4.17.20"
+    renderkid "^2.0.4"
+
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npm.taobao.org/private/download/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha1-eCDZsWEgzFXKmud5JoCufbptf+I=
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/progress/download/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha1-/cIzZQVEfT8vLGOO0nLK9hS7sr8=
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/pseudomap/download/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.28, psl@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0, pump@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/pump/download/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.npm.taobao.org/pumpify/download/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew=
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=
+
+qs@^6.9.4:
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
+  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.npm.taobao.org/query-string/download/query-string-4.3.4.tgz?cache=0&sync_timestamp=1604609929956&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/randomfill/download/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.0.3, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npm.taobao.org/raw-body/download/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha1-oc5vucm8NWylLoklarWQWeE9AzI=
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  dependencies:
+    pify "^2.3.0"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg=
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha1-DodiKjMlqjPokihcr4tOhGUppSU=
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha1-m6dMAZsV02UnjS6Ru4xI17TULJ4=
+  dependencies:
+    picomatch "^2.2.1"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.npm.taobao.org/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
+  dependencies:
+    resolve "^1.1.6"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/reduce-css-calc/download/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/reduce-function-call/download/reduce-function-call-1.0.3.tgz#60350f7fb252c0a67eb10fd4694d16909971300f"
+  integrity sha1-YDUPf7JSwKZ+sQ/UaU0WkJlxMA8=
+  dependencies:
+    balanced-match "^1.0.0"
+
+regenerate@^1.2.1:
+  version "1.4.2"
+  resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz?cache=0&sync_timestamp=1604218378158&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerate%2Fdownload%2Fregenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.10.1.tgz?cache=0&sync_timestamp=1593557271381&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexp.prototype.flags@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha1-erqJs8E6ZFCdq888qNn7ub31y3U=
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/regexpp/download/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+  integrity sha1-DjUW3Qt5BPQT0tQZPc5GGMOmias=
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/regexpu-core/download/regexpu-core-2.0.0.tgz?cache=0&sync_timestamp=1600413480386&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregexpu-core%2Fdownload%2Fregexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/regjsgen/download/regjsgen-0.2.0.tgz?cache=0&sync_timestamp=1590335923060&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregjsgen%2Fdownload%2Fregjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.npm.taobao.org/regjsparser/download/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+renderkid@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.npm.taobao.org/renderkid/download/renderkid-2.0.4.tgz?cache=0&sync_timestamp=1603039740061&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frenderkid%2Fdownload%2Frenderkid-2.0.4.tgz#d325e532afb28d3f8796ffee306be8ffd6fc864c"
+  integrity sha1-0yXlMq+yjT+Hlv/uMGvo/9b8hkw=
+  dependencies:
+    css-select "^1.1.0"
+    dom-converter "^0.2"
+    htmlparser2 "^3.3.0"
+    lodash "^4.17.20"
+    strip-ansi "^3.0.0"
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=
+
+repeat-string@^1.5.2, repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/repeating/download/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
+request@^2.87.0, request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.npm.taobao.org/request/download/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM=
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.npm.taobao.org/require-from-string/download/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  integrity sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=
+
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/require-uncached/download/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz?cache=0&sync_timestamp=1585438700247&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve-url%2Fdownload%2Fresolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.3, resolve@^1.4.0:
+  version "1.19.0"
+  resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.19.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha1-GvW/YwQJc0oGfK4pMYqsf6KaJnw=
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=
+
+rgb-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/rgb-regex/download/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
+  integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
+
+rgba-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/rgba-regex/download/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
+  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.npm.taobao.org/right-align/download/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+  version "2.7.1"
+  resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha1-stEE/g2Psnz54KHNqCYt04M8bKs=
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+run-async@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.npm.taobao.org/run-async/download/run-async-2.4.1.tgz?cache=0&sync_timestamp=1587966119578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frun-async%2Fdownload%2Frun-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha1-hEDsz5nqPnC9QJ1JqriOEMGJpFU=
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/run-queue/download/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npm.taobao.org/rx-lite-aggregates/download/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0=
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY=
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=
+
+sass-graph@2.2.5:
+  version "2.2.5"
+  resolved "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
+  integrity sha1-qYHIdEa4MZ2W3OBnHkh4eb0kwug=
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^13.3.2"
+
+sass-loader@^6.0.6:
+  version "6.0.7"
+  resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
+  integrity sha1-3S/bPn7v9KU/NbpqxAhxVIg1PQA=
+  dependencies:
+    clone-deep "^2.0.1"
+    loader-utils "^1.0.1"
+    lodash.tail "^4.1.1"
+    neo-async "^2.5.0"
+    pify "^3.0.0"
+
+sass-loader@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
+  integrity sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=
+  dependencies:
+    clone-deep "^4.0.1"
+    loader-utils "^1.0.1"
+    neo-async "^2.5.0"
+    pify "^4.0.1"
+    semver "^6.3.0"
+
+sass-resources-loader@^2.0.3:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/sass-resources-loader/download/sass-resources-loader-2.1.1.tgz#a231b7c4e326d9c8d141909c901233bef9453151"
+  integrity sha1-ojG3xOMm2cjRQZCckBIzvvlFMVE=
+  dependencies:
+    async "^3.2.0"
+    chalk "^4.1.0"
+    glob "^7.1.6"
+    loader-utils "^2.0.0"
+
+sax@~1.2.1, sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz?cache=0&sync_timestamp=1589682064084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsax%2Fdownload%2Fsax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk=
+
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.3.0.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
+  dependencies:
+    ajv "^5.0.0"
+
+schema-utils@^0.4.0, schema-utils@^0.4.5:
+  version "0.4.7"
+  resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1601922251376&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+
+selfsigned@^1.9.1:
+  version "1.10.8"
+  resolved "https://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.8.tgz?cache=0&sync_timestamp=1600186291720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fselfsigned%2Fdownload%2Fselfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
+  integrity sha1-DRcgi30Swz+OrIXEGDXyf8PYGjA=
+  dependencies:
+    node-forge "^0.10.0"
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1606851912015&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=
+
+semver@5.3.0, semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1606851912015&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1606851912015&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg=
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serialize-javascript@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.9.1.tgz?cache=0&sync_timestamp=1599740666792&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+  integrity sha1-z8IArvd7YAxH2pu4FJyUPnmML9s=
+
+serve-index@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.npm.taobao.org/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/set-value/download/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha1-oY1AUw5vB95CKMfe/kInr4ytAFs=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM=
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shallow-clone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha1-RIDNBuiC72iyrYij6lSDLixItXE=
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^5.0.0"
+    mixin-object "^2.0.1"
+
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha1-jymBrZJTH1UDWwH7IwdppA4C76M=
+  dependencies:
+    kind-of "^6.0.2"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shelljs@^0.7.6:
+  version "0.7.8"
+  resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npm.taobao.org/shellwords/download/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha1-oUEMLt2PB3sItOJTyOrPyvBXRhw=
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npm.taobao.org/simple-swizzle/download/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/slash/download/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  integrity sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/snapdragon-util/download/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+sockjs-client@1.1.5:
+  version "1.1.5"
+  resolved "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.1.5.tgz?cache=0&sync_timestamp=1596409908572&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsockjs-client%2Fdownload%2Fsockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
+  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
+  dependencies:
+    debug "^2.6.6"
+    eventsource "0.1.6"
+    faye-websocket "~0.11.0"
+    inherits "^2.0.1"
+    json3 "^3.3.2"
+    url-parse "^1.1.8"
+
+sockjs@0.3.19:
+  version "0.3.19"
+  resolved "https://registry.npm.taobao.org/sockjs/download/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^3.0.1"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz?cache=0&sync_timestamp=1602621857262&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsort-keys%2Fdownload%2Fsort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha1-GQhmvs51U+H48mei7oLGBrVQmho=
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.4.18.tgz?cache=0&sync_timestamp=1587719517036&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+  version "0.5.7"
+  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.1.1.tgz?cache=0&sync_timestamp=1590161967473&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fspdx-correct%2Fdownload%2Fspdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha1-3s6BrJweZxPl99G28X1Gj6U9iak=
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.npm.taobao.org/spdx-exceptions/download/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha1-PyjOGnegA3JoPq3kpDMYNSeiFj0=
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/spdx-expression-parse/download/spdx-expression-parse-3.0.1.tgz?cache=0&sync_timestamp=1589682217985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fspdx-expression-parse%2Fdownload%2Fspdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha1-z3D1BILu/cmOPOCmgz5KU87rpnk=
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.7"
+  resolved "https://registry.npm.taobao.org/spdx-license-ids/download/spdx-license-ids-3.0.7.tgz?cache=0&sync_timestamp=1606610760991&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fspdx-license-ids%2Fdownload%2Fspdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha1-6cGKQQ5e1+EkQqVJ+9ivp2cDjWU=
+
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=
+  dependencies:
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
+
+spdy@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s=
+  dependencies:
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssr-window@^3.0.0, ssr-window@^3.0.0-alpha.1:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/ssr-window/download/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
+  integrity sha1-/VuCgBY4lD4MxwTEaRgBQ1r3rDc=
+
+ssri@^5.2.4:
+  version "5.3.0"
+  resolved "https://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=
+  dependencies:
+    safe-buffer "^5.1.1"
+
+stable@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.npm.taobao.org/stable/download/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  integrity sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=
+
+stackframe@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/stackframe/download/stackframe-1.2.0.tgz?cache=0&sync_timestamp=1590854186823&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstackframe%2Fdownload%2Fstackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
+  integrity sha1-UkKUktY8YuuYmATBFVLj0i53kwM=
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stdout-stream@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=
+  dependencies:
+    readable-stream "^2.0.1"
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz?cache=0&sync_timestamp=1588701035785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstream-http%2Fdownload%2Fstream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha1-1wiCgVWasneEJCebCHfaPDktWj0=
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha1-InZ74htirxCBV0MG9prFG2IgOWE=
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string.prototype.trimend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.3.tgz?cache=0&sync_timestamp=1606008018729&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimend%2Fdownload%2Fstring.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha1-oivVPMpcfPRNfJ1ccyEYhz1s0Ys=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.3.tgz?cache=0&sync_timestamp=1606008018620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha1-m0y1kOEjuzZWRAHVmCQpjeUP1ao=
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4=
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/strip-bom/download/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+  dependencies:
+    get-stdin "^4.0.1"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz?cache=0&sync_timestamp=1594567582667&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+stylehacks@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npm.taobao.org/stylehacks/download/stylehacks-4.0.3.tgz?cache=0&sync_timestamp=1603212990812&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylehacks%2Fdownload%2Fstylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
+  integrity sha1-Zxj8r00eB9ihMYaQiB6NlnJqcdU=
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=
+  dependencies:
+    has-flag "^4.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.npm.taobao.org/svgo/download/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+svgo@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.npm.taobao.org/svgo/download/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+  integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc=
+  dependencies:
+    chalk "^2.4.1"
+    coa "^2.0.2"
+    css-select "^2.0.0"
+    css-select-base-adapter "^0.1.1"
+    css-tree "1.0.0-alpha.37"
+    csso "^4.0.2"
+    js-yaml "^3.13.1"
+    mkdirp "~0.5.1"
+    object.values "^1.1.0"
+    sax "~1.2.4"
+    stable "^0.1.8"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
+
+swiper@^6.4.1:
+  version "6.4.1"
+  resolved "https://registry.npm.taobao.org/swiper/download/swiper-6.4.1.tgz?cache=0&sync_timestamp=1607518804170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-6.4.1.tgz#6d4e9252ed4226821d4005e77924e929848de8af"
+  integrity sha1-bU6SUu1CJoIdQAXneSTpKYSN6K8=
+  dependencies:
+    dom7 "^3.0.0"
+    ssr-window "^3.0.0"
+    tslib "^2.0.0"
+
+table@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/table/download/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  integrity sha1-ozRHN1OR52atNNNIbm4q7chNLjY=
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+tapable@^0.2.7:
+  version "0.2.9"
+  resolved "https://registry.npm.taobao.org/tapable/download/tapable-0.2.9.tgz?cache=0&sync_timestamp=1607088824436&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
+  integrity sha1-ry2LvJsE907hevK02QSPgHrNGKg=
+
+tar@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.npm.taobao.org/tar/download/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.12"
+    inherits "2"
+
+text-table@^0.2.0, text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz?cache=0&sync_timestamp=1593478647766&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+thunky@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  integrity sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30=
+
+time-stamp@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npm.taobao.org/time-stamp/download/time-stamp-2.2.0.tgz#917e0a66905688790ec7bbbde04046259af83f57"
+  integrity sha1-kX4KZpBWiHkOx7u94EBGJZr4P1c=
+
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.12.tgz?cache=0&sync_timestamp=1603793743551&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftimers-browserify%2Fdownload%2Ftimers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha1-RKRcEfv0B/NPl7zNFXfGUjYbAO4=
+  dependencies:
+    setimmediate "^1.0.4"
+
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
+
+tinycolor2@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
+  integrity sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM=
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/toidentifier/download/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM=
+
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.npm.taobao.org/toposort/download/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
+
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz?cache=0&sync_timestamp=1584645751908&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha1-zZ+yoKodWhK0c72fuW+j3P9lreI=
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+"true-case-path@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=
+  dependencies:
+    glob "^7.1.2"
+
+tryer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
+  integrity sha1-8shUBoALmw90yfdGW4HqrSQSUvg=
+
+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.npm.taobao.org/tsconfig-paths/download/tsconfig-paths-3.9.0.tgz?cache=0&sync_timestamp=1606090519879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftsconfig-paths%2Fdownload%2Ftsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha1-CYVHpsREiAfo/Ljq4IEGTumjyQs=
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
+tslib@^1.10.0:
+  version "1.14.1"
+  resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=
+
+tslib@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/tslib/download/tslib-2.0.3.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
+  integrity sha1-jgdBrEX8DCJuWKF7/D5kubxsphw=
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.npm.taobao.org/type-is/download/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/type/download/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha1-hI3XaY2vo+VKbEeedZxLw/GIR6A=
+
+type@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/type/download/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+  integrity sha1-m9wixkjPjPht0j0yM2pBz7ZHXj8=
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+uglify-es@^3.3.4:
+  version "3.3.9"
+  resolved "https://registry.npm.taobao.org/uglify-es/download/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha1-DBxPBwC+2NvBJM2zBNJZLKID5nc=
+  dependencies:
+    commander "~2.13.0"
+    source-map "~0.6.1"
+
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz?cache=0&sync_timestamp=1606761536840&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha1-mtlWPY6zrN+404WX0q8dgV9qdV8=
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
+
+uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-2.8.29.tgz?cache=0&sync_timestamp=1606761536840&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+
+uglifyjs-webpack-plugin@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  integrity sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
+uglifyjs-webpack-plugin@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  integrity sha1-dfVIFghYFjoIZD4IbV/v4YpdZ94=
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.5"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/union-value/download/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha1-C2/nuDWuzaYcbqTU8CwUIh4QmEc=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/uniqs/download/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
+
+unique-filename@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha1-uqvOkQg/xk6UWw861hPiZPfNTmw=
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unquote@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npm.taobao.org/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/unset-value/download/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz?cache=0&sync_timestamp=1604768535464&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupath%2Fdownload%2Fupath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=
+
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/upper-case/download/upper-case-1.1.3.tgz?cache=0&sync_timestamp=1606859943902&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupper-case%2Fdownload%2Fupper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+
+uri-js@^4.2.2:
+  version "4.4.0"
+  resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha1-qnFCYd55PoqCNHp7zJznTobyhgI=
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-loader@^0.5.8:
+  version "0.5.9"
+  resolved "https://registry.npm.taobao.org/url-loader/download/url-loader-0.5.9.tgz?cache=0&sync_timestamp=1602252665628&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furl-loader%2Fdownload%2Furl-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
+  integrity sha1-zI/qgse5Bud3cBklCGnlaemVwpU=
+  dependencies:
+    loader-utils "^1.0.2"
+    mime "1.3.x"
+
+url-parse@^1.1.8, url-parse@^1.4.3:
+  version "1.4.7"
+  resolved "https://registry.npm.taobao.org/url-parse/download/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha1-qKg1NejACjFuQDpdtKwbm4U64ng=
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha1-a693dLgO6w91INi4HQeYKlmruu4=
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.npm.taobao.org/util/download/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.npm.taobao.org/util/download/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha1-MjZzNyDsZLsn9uJvQhqqLhtYjWE=
+  dependencies:
+    inherits "2.0.3"
+
+utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.0.1, uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz?cache=0&sync_timestamp=1607460209394&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=
+
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v-click-outside-x@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.npm.taobao.org/v-click-outside-x/download/v-click-outside-x-3.7.1.tgz#aa03eaa0e41e44cb5207dcf86c2d9f0dd64084c1"
+  integrity sha1-qgPqoOQeRMtSB9z4bC2fDdZAhME=
+
+v-distpicker@^1.0.17:
+  version "1.2.9"
+  resolved "https://registry.npm.taobao.org/v-distpicker/download/v-distpicker-1.2.9.tgz#68d35a291573b4f4d7a3750c757fc1ed4e97c80c"
+  integrity sha1-aNNaKRVztPTXo3UMdX/B7U6XyAw=
+  dependencies:
+    vue "^2.6.10"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha1-/JH2uce6FchX9MssXe/uw51PQQo=
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+vendors@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+  integrity sha1-4rgApT56Kbk1BsPPQRANFsTErY4=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+view-design@^4.3.2:
+  version "4.4.0"
+  resolved "https://registry.npm.taobao.org/view-design/download/view-design-4.4.0.tgz?cache=0&sync_timestamp=1602808555034&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fview-design%2Fdownload%2Fview-design-4.4.0.tgz#c3eef5abdacd70601ed5efc9028b006657e66a8d"
+  integrity sha1-w+71q9rNcGAe1e/JAosAZlfmao0=
+  dependencies:
+    async-validator "^3.3.0"
+    deepmerge "^2.2.1"
+    element-resize-detector "^1.2.0"
+    js-calendar "^1.2.3"
+    lodash.throttle "^4.1.1"
+    popper.js "^1.14.6"
+    tinycolor2 "^1.4.1"
+    v-click-outside-x "^3.7.1"
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA=
+
+vue-awesome-swiper@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-4.1.1.tgz#8f7ab221ad003021d756b86aa618f429924900fe"
+  integrity sha1-j3qyIa0AMCHXVrhqphj0KZJJAP4=
+
+vue-awesome@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/vue-awesome/download/vue-awesome-4.1.0.tgz#1caf50eb1ed0193f3c5ba19cbde9bea356cbc78c"
+  integrity sha1-HK9Q6x7QGT88W6Gcvem+o1bLx4w=
+  dependencies:
+    core-js "^3.4.4"
+
+vue-eslint-parser@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz?cache=0&sync_timestamp=1608030990315&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
+  integrity sha1-wmjJbG2Uz+PZOKX3WTlZsMozYNE=
+  dependencies:
+    debug "^3.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.2"
+    esquery "^1.0.0"
+    lodash "^4.17.4"
+
+vue-hot-reload-api@^2.2.0:
+  version "2.3.4"
+  resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
+  integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=
+
+vue-loader@^13.3.0:
+  version "13.7.3"
+  resolved "https://registry.npm.taobao.org/vue-loader/download/vue-loader-13.7.3.tgz?cache=0&sync_timestamp=1607093652138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"
+  integrity sha1-4HRA94IwpjnQCtpNp7ltDp1iA38=
+  dependencies:
+    consolidate "^0.14.0"
+    hash-sum "^1.0.2"
+    loader-utils "^1.1.0"
+    lru-cache "^4.1.1"
+    postcss "^6.0.8"
+    postcss-load-config "^1.1.0"
+    postcss-selector-parser "^2.0.0"
+    prettier "^1.7.0"
+    resolve "^1.4.0"
+    source-map "^0.6.1"
+    vue-hot-reload-api "^2.2.0"
+    vue-style-loader "^3.0.0"
+    vue-template-es2015-compiler "^1.6.0"
+
+vue-piczoom@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npm.taobao.org/vue-piczoom/download/vue-piczoom-1.0.6.tgz#ed2126f4b58127424cd090bdc531a51014d14311"
+  integrity sha1-7SEm9LWBJ0JM0JC9xTGlEBTRQxE=
+  dependencies:
+    node-sass "^4.7.2"
+    sass-loader "^6.0.6"
+    vue "^2.5.2"
+
+vue-qr@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/vue-qr/-/vue-qr-2.3.0.tgz#d659ee9db2bc717a2b46bd0e7a5414e75a7a3bba"
+  integrity sha512-qcmMKNVz4dSZjXsUIQmK/QoODvOYg8+EyCaCynZfwcUJk4mjsevEv+z4uYoRz0Or1ET9UMwjV7/GQdHTSFCIIA==
+
+vue-router@^3.0.1:
+  version "3.4.9"
+  resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1607347231238&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
+  integrity sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY=
+
+vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
+  version "3.1.2"
+  resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
+  integrity sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=
+  dependencies:
+    hash-sum "^1.0.2"
+    loader-utils "^1.0.2"
+
+vue-template-compiler@^2.5.2:
+  version "2.6.12"
+  resolved "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.12.tgz?cache=0&sync_timestamp=1597927307972&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-template-compiler%2Fdownload%2Fvue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e"
+  integrity sha1-lH7XGWdEyKUoXr4SM/6WBDf8xX4=
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.1.0"
+
+vue-template-es2015-compiler@^1.6.0:
+  version "1.9.1"
+  resolved "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
+  integrity sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=
+
+vue@^2.5.2, vue@^2.6.10:
+  version "2.6.12"
+  resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1606946160685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
+  integrity sha1-9evU+mvShpQD4pqJau1JBEVskSM=
+
+vuex@^3.0.1:
+  version "3.6.0"
+  resolved "https://registry.npm.taobao.org/vuex/download/vuex-3.6.0.tgz?cache=0&sync_timestamp=1606318199388&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.6.0.tgz#95efa56a58f7607c135b053350833a09e01aa813"
+  integrity sha1-le+lalj3YHwTWwUzUIM6CeAaqBM=
+
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.1.tgz?cache=0&sync_timestamp=1604989128919&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack-chokidar2%2Fdownload%2Fwatchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha1-OFAAcu5uzmbzdpk2lQ6hdxvhyVc=
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.4.0:
+  version "1.7.5"
+  resolved "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1607687453840&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha1-EmfmxV4Lm1vkTCAjrtVDeiwmxFM=
+  dependencies:
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
+
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha1-wdjRSTFtPqhShIiVy2oL/oh7h98=
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+webpack-bundle-analyzer@^2.9.0:
+  version "2.13.1"
+  resolved "https://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-2.13.1.tgz?cache=0&sync_timestamp=1606743112136&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526"
+  integrity sha1-B9IXbG6Gw83OTCPlb64qe2tK1SY=
+  dependencies:
+    acorn "^5.3.0"
+    bfj-node4 "^5.2.0"
+    chalk "^2.3.0"
+    commander "^2.13.0"
+    ejs "^2.5.7"
+    express "^4.16.2"
+    filesize "^3.5.11"
+    gzip-size "^4.1.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    opener "^1.4.3"
+    ws "^4.0.0"
+
+webpack-dev-middleware@1.12.2:
+  version "1.12.2"
+  resolved "https://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-1.12.2.tgz?cache=0&sync_timestamp=1608052697434&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  integrity sha1-+PwRIM47T8VoDO7LQ9d3lmshEF4=
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
+webpack-dev-server@^2.9.1:
+  version "2.11.5"
+  resolved "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-2.11.5.tgz?cache=0&sync_timestamp=1606496486773&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-server%2Fdownload%2Fwebpack-dev-server-2.11.5.tgz#416fbdea0e04eebe44a626e791d5a2eb37fe8c48"
+  integrity sha1-QW+96g4E7r5EpibnkdWi6zf+jEg=
+  dependencies:
+    ansi-html "0.0.7"
+    array-includes "^3.0.3"
+    bonjour "^3.5.0"
+    chokidar "^2.1.2"
+    compression "^1.7.3"
+    connect-history-api-fallback "^1.3.0"
+    debug "^3.1.0"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
+    http-proxy-middleware "^0.19.1"
+    import-local "^1.0.0"
+    internal-ip "1.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    selfsigned "^1.9.1"
+    serve-index "^1.9.1"
+    sockjs "0.3.19"
+    sockjs-client "1.1.5"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    webpack-dev-middleware "1.12.2"
+    yargs "6.6.0"
+
+webpack-merge@^4.1.0:
+  version "4.2.2"
+  resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.2.2.tgz?cache=0&sync_timestamp=1607819743407&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  integrity sha1-onxS6ng9E5iv0gh/VH17nS9DY00=
+  dependencies:
+    lodash "^4.17.15"
+
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+  version "1.4.3"
+  resolved "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1603965301737&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM=
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^3.6.0:
+  version "3.12.0"
+  resolved "https://registry.npm.taobao.org/webpack/download/webpack-3.12.0.tgz?cache=0&sync_timestamp=1608060594442&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-3.12.0.tgz#3f9e34360370602fcf639e97939db486f4ec0d74"
+  integrity sha1-P540NgNwYC/PY56Xk520hvTsDXQ=
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.4.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^4.2.1"
+    tapable "^0.2.7"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
+    webpack-sources "^1.0.1"
+    yargs "^8.0.2"
+
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.4.tgz?cache=0&sync_timestamp=1591289007652&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebsocket-driver%2Fdownload%2Fwebsocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A=
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI=
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.npm.taobao.org/whet.extend/download/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@1, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.npm.taobao.org/window-size/download/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
+
+worker-farm@^1.5.2:
+  version "1.7.0"
+  resolved "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npm.taobao.org/write/download/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.npm.taobao.org/ws/download/ws-4.1.0.tgz?cache=0&sync_timestamp=1607113150914&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fws%2Fdownload%2Fws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
+  integrity sha1-qXm119TaaL9U7+BAiWfDJIaacok=
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=
+
+xxhashjs@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.npm.taobao.org/xxhashjs/download/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha1-imJRVnYhocRqWuIE2gJJx/jKqdg=
+  dependencies:
+    cuint "^0.2.2"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz?cache=0&sync_timestamp=1606777983708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
+y18n@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npm.taobao.org/y18n/download/y18n-4.0.1.tgz?cache=0&sync_timestamp=1606777983708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha1-jbK4PDHF11CZu4kLI/MJSJHiR9Q=
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1604886709178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha1-Ew8JcC667vJlDVTObj5XBvek+zg=
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-4.2.1.tgz?cache=0&sync_timestamp=1604886709178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  integrity sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-7.0.0.tgz?cache=0&sync_timestamp=1604886709178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@6.6.0:
+  version "6.6.0"
+  resolved "https://registry.npm.taobao.org/yargs/download/yargs-6.6.0.tgz?cache=0&sync_timestamp=1607208154489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  integrity sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.npm.taobao.org/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1607208154489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.npm.taobao.org/yargs/download/yargs-8.0.2.tgz?cache=0&sync_timestamp=1607208154489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz?cache=0&sync_timestamp=1607208154489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
diff --git a/docker-push.sh b/docker-push.sh
new file mode 100644
index 00000000..3cbe52b2
--- /dev/null
+++ b/docker-push.sh
@@ -0,0 +1,5 @@
+docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.1
+docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-1.0.1:0.0.1
+docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.1
+docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.1
+
diff --git a/docker.sh b/docker.sh
new file mode 100644
index 00000000..a5221e41
--- /dev/null
+++ b/docker.sh
@@ -0,0 +1,12 @@
+cd ./buyer
+yarn install&&yarn build
+sh docker.sh
+
+cd ../manager
+yarn install&&yarn build
+sh docker.sh
+
+cd ../seller
+yarn install&&yarn build
+sh docker.sh
+
diff --git a/manager/.browserslistrc b/manager/.browserslistrc
new file mode 100644
index 00000000..bd3ad98e
--- /dev/null
+++ b/manager/.browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
\ No newline at end of file
diff --git a/manager/.editorconfig b/manager/.editorconfig
new file mode 100644
index 00000000..3454886e
--- /dev/null
+++ b/manager/.editorconfig
@@ -0,0 +1,14 @@
+# https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/manager/.eslintignore b/manager/.eslintignore
new file mode 100644
index 00000000..e6529fc0
--- /dev/null
+++ b/manager/.eslintignore
@@ -0,0 +1,4 @@
+build/*.js
+src/assets
+public
+dist
diff --git a/manager/.eslintrc.js b/manager/.eslintrc.js
new file mode 100644
index 00000000..c9775054
--- /dev/null
+++ b/manager/.eslintrc.js
@@ -0,0 +1,198 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}
diff --git a/manager/.gitignore b/manager/.gitignore
new file mode 100644
index 00000000..6791d728
--- /dev/null
+++ b/manager/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/*
+dist/
+gifs/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+test/unit/coverage
+test/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea/*
+.vscode/*
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
+yarn.lock
+package-lock.json
+yarn.lock
diff --git a/manager/Dockerfile b/manager/Dockerfile
new file mode 100644
index 00000000..d7e43746
--- /dev/null
+++ b/manager/Dockerfile
@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+RUN mkdir -p /app/
+COPY ./dist /app/
+COPY ./nginx.conf /etc/nginx/nginx.conf
+
+
+EXPOSE 80
diff --git a/manager/README.md b/manager/README.md
new file mode 100644
index 00000000..b2b8dfc8
--- /dev/null
+++ b/manager/README.md
@@ -0,0 +1,37 @@
+# LILISHOP-UI
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Run your tests
+```
+npm run test
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+详情点击 [https://cli.vuejs.org/zn/config/](https://cli.vuejs.org/zn/config/).
+
+####  login.vue页面，测试时不走权限，直接return  318行
+####  Main.vue 页面，241行，修改，避免报错
+
+#### main-components  头部，左侧所有内容
+
+#### lili-floor-renovation  楼层装修模块
+     
diff --git a/manager/babel.config.js b/manager/babel.config.js
new file mode 100644
index 00000000..2ea5d05b
--- /dev/null
+++ b/manager/babel.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  presets: [
+    [
+      '@vue/app',
+      {
+        useBuiltIns: 'entry'
+      }
+    ]
+  ]
+}
diff --git a/manager/docker.sh b/manager/docker.sh
new file mode 100644
index 00000000..698e963b
--- /dev/null
+++ b/manager/docker.sh
@@ -0,0 +1 @@
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.1 .
diff --git a/manager/nginx.conf b/manager/nginx.conf
new file mode 100644
index 00000000..c1d6be04
--- /dev/null
+++ b/manager/nginx.conf
@@ -0,0 +1,51 @@
+#这个文件给docker用的
+#user  nobody;
+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;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    client_max_body_size 10m;
+    gzip on;
+    gzip_min_length  5k;
+    gzip_buffers     4 16k;
+    gzip_http_version 1.0;
+    gzip_comp_level 4;
+    gzip_types       text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    gzip_vary on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root /app;
+            try_files $uri $uri/ /index.html $uri/ =404;
+            index  index.html index.htm;
+        }
+    }
+}
diff --git a/manager/package.json b/manager/package.json
new file mode 100644
index 00000000..caf93e4e
--- /dev/null
+++ b/manager/package.json
@@ -0,0 +1,65 @@
+{
+  "name": "lilishop",
+  "version": "1.0.0",
+  "private": true,
+  "description": "lilishop-ui",
+  "author": "lili-platform",
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "0.0.7",
+    "@antv/g2": "^4.1.12",
+    "apexcharts": "^3.26.0",
+    "axios": "^0.21.1",
+    "core-js": "^3.6.5",
+    "countup.js": "^2.0.4",
+    "date-fns": "^1.30.1",
+    "dplayer": "^1.26.0",
+    "gitalk": "^1.6.2",
+    "html2canvas": "^1.0.0-rc.5",
+    "iview-area": "^1.6.0",
+    "js-cookie": "^2.2.1",
+    "node-sass": "^4.14.1",
+    "pinyin": "^2.9.0",
+    "print-js": "^1.0.63",
+    "qrcodejs2": "0.0.2",
+    "quill": "^1.3.7",
+    "sass-loader": "^8.0.2",
+    "sockjs-client": "^1.4.0",
+    "stompjs": "^2.3.3",
+    "swiper": "^6.3.5",
+    "view-design": "^4.2.0",
+    "vue": "^2.6.10",
+    "vue-apexcharts": "^1.5.1",
+    "vue-awesome": "^4.0.2",
+    "vue-awesome-swiper": "^4.1.1",
+    "vue-clipboard2": "^0.3.0",
+    "vue-cropper": "^0.4.9",
+    "vue-i18n": "^8.15.1",
+    "vue-json-pretty": "^1.4.1",
+    "vue-lazyload": "^1.3.3",
+    "vue-router": "^3.1.3",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "wangeditor": "^4.5.3",
+    "xlsx": "^0.16.2",
+    "xss": "^1.0.7"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.4.4",
+    "@vue/cli-plugin-router": "^4.4.4",
+    "@vue/cli-plugin-vuex": "^4.4.4",
+    "@vue/cli-service": "^4.4.4",
+    "compression-webpack-plugin": "^4.0.0",
+    "css-loader": "^5.0.1",
+    "less": "^3.12.2",
+    "less-loader": "^6.2.0",
+    "style-loader": "^2.0.0",
+    "style-resources-loader": "^1.3.2",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-template-compiler": "^2.6.10"
+  }
+}
diff --git a/manager/postcss.config.js b/manager/postcss.config.js
new file mode 100644
index 00000000..961986e2
--- /dev/null
+++ b/manager/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
diff --git a/manager/public/index.html b/manager/public/index.html
new file mode 100644
index 00000000..e6d9b0ea
--- /dev/null
+++ b/manager/public/index.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
+  <link rel="icon" href="./logo.ico" type="image/x-icon">
+  <title>lili admin</title>
+  <meta name="keywords"
+    content="keywords">
+  <meta name="description"
+    content="description">
+  <!-- 部署CDN优化 -->
+  <script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vuex@3.1.2/dist/vuex.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.15.1/dist/vue-i18n.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/styles/iview.css">
+  <script src="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/iview.min.js"></script>
+  <!-- <script src="https://cdn.jsdelivr.net/npm/iview-area@1.6.0/dist/iview-area.min.js"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/vue-lazyload@1.3.3/vue-lazyload.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-apexcharts@1.5.1/dist/vue-apexcharts.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/xlsx@0.15.3/dist/xlsx.full.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/dplayer@1.25.0/dist/DPlayer.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/print-js@1.0.63/dist/print.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-json-pretty@1.6.2/vue-json-pretty.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/gitalk@1.5.0/dist/gitalk.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/wangeditor@3.1.1/release/wangEditor.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.snow.css">
+  <script src="https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.8.4/Sortable.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vuedraggable@2.23.2/dist/vuedraggable.umd.min.js"></script>
+  <script src="https://v.vaptcha.com/v3.js"></script>
+  <style>
+    .page-loading-wrap {
+      padding: 120px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+    }
+
+    .half-circle-spinner,
+    .half-circle-spinner * {
+      box-sizing: border-box;
+    }
+
+    .half-circle-spinner {
+      width: 35px;
+      height: 35px;
+      border-radius: 100%;
+      position: relative;
+    }
+
+    .half-circle-spinner .circle {
+      content: "";
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 100%;
+      border: calc(35px / 10) solid transparent;
+    }
+
+    .half-circle-spinner .circle.circle-1 {
+      border-top-color: #5cadff;
+      animation: half-circle-spinner-animation 1s infinite;
+    }
+
+    .half-circle-spinner .circle.circle-2 {
+      border-bottom-color: #5cadff;
+      animation: half-circle-spinner-animation 1s infinite alternate;
+    }
+
+    @keyframes half-circle-spinner-animation {
+      0% {
+        transform: rotate(0deg);
+
+      }
+
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but lili-admin doesn't work properly without JavaScript enabled. Please enable it to
+      continue.</strong>
+  </noscript>
+  <div id="app">
+    <div class="page-loading-wrap">
+      <div class="half-circle-spinner">
+        <div class="circle circle-1"></div>
+        <div class="circle circle-2"></div>
+      </div>
+      <h4 style="margin-top:20px;">正在加载资源...</h4>
+    </div>
+  </div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
diff --git a/manager/public/logo.ico b/manager/public/logo.ico
new file mode 100644
index 00000000..136bd7e9
Binary files /dev/null and b/manager/public/logo.ico differ
diff --git a/manager/src/App.vue b/manager/src/App.vue
new file mode 100644
index 00000000..5e8a245d
--- /dev/null
+++ b/manager/src/App.vue
@@ -0,0 +1,53 @@
+<template>
+  <div id="main" class="app-main">
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+import {getCategoryTree} from '@/api/goods.js'
+export default {
+  updated() {
+    
+    if (!localStorage.getItem('category') && this.$route.path !== '/login') {
+      getCategoryTree(0).then(res => {
+        if (res.success) {
+          localStorage.setItem('category', JSON.stringify(res.result))
+        }
+      })
+    }
+  }
+};
+</script>
+
+<style>
+html,
+body {
+  width: 100%;
+  height: 100%;
+  background: #f0f0f0;
+  font-size: 12px;
+  /* overflow: hidden; */
+}
+
+.app-main {
+  width: 100%;
+  height: 100%;
+}
+
+.br button {
+  margin-right: 5px;
+}
+
+.operation button {
+  margin-right: 5px;
+}
+
+.ivu-btn-text:focus {
+  box-shadow: none !important;
+}
+
+.ivu-tag {
+  cursor: pointer;
+}
+</style>
diff --git a/manager/src/api/common.js b/manager/src/api/common.js
new file mode 100644
index 00000000..aea5012d
--- /dev/null
+++ b/manager/src/api/common.js
@@ -0,0 +1,11 @@
+import {commonUrl, getRequest} from '@/libs/axios';
+
+// 通过id获取子地区
+export const getChildRegion = (id) => {
+  return getRequest(`${commonUrl}/common/region/item/${id}`);
+};
+
+// 点地图获取地址信息
+export const getRegion = (parpams) => {
+  return getRequest(`${commonUrl}/common/region/region`, parpams);
+};
diff --git a/manager/src/api/distribution.js b/manager/src/api/distribution.js
new file mode 100644
index 00000000..0e8c66b7
--- /dev/null
+++ b/manager/src/api/distribution.js
@@ -0,0 +1,58 @@
+
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios';
+
+//查询分销商
+export const getDistributionListData = (params) => {
+    return getRequest('/distribution/getByPage', params)
+}
+//审核分销商
+export const auditDistribution = (id, params) => {
+    return putRequest(`/distribution/audit/${id}`, params)
+}
+// 清退分销商
+export const retreatDistribution = (id, params) => {
+    return putRequest(`/distribution/retreat/${id}`, params)
+}
+
+
+// 恢复分销商
+export const resumeDistribution = (id, params) => {
+    return putRequest(`/distribution/resume/${id}`, params)
+}
+
+//保存更新分销设置
+export const saveDistributionSetting = (params) => {
+    return postRequest('/distribution/setting/insertOrUpdate', params)
+}
+
+//获取分销设置
+export const getDistributionSetting = (id, params) => {
+    return getRequest(`/distribution/setting/get/${id}`, params)
+}
+
+
+//获取分销订单列表
+export const getDistributionOrder = (params) => {
+    return getRequest('/distribution/order/getByPage', params)
+}
+
+//获取分销商品列表
+export const getDistributionGoods = (params) => {
+    return getRequest('/distribution/goods/getByPage', params)
+}
+//删除分销商品
+export const delDistributionGoods = (ids) => {
+    return deleteRequest(`/distribution/goods/delByIds/${ids}`)
+}
+//获取分销佣金信息
+export const getDistributionCash = (params) => {
+    return getRequest('/distribution/cash/getByPage', params)
+}
+//审核分销佣金申请
+export const auditDistributionCash = (id,params) => {
+    return postRequest(`/distribution/cash/audit/${id}`, params)
+}
+
+
+
diff --git a/manager/src/api/goods.js b/manager/src/api/goods.js
new file mode 100644
index 00000000..a33eff91
--- /dev/null
+++ b/manager/src/api/goods.js
@@ -0,0 +1,226 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios';
+
+//  获取商品品牌分页列表
+export const getManagerBrandPage = (params) => {
+    return getRequest('/goods/brand/getByPage', params)
+}
+//  添加或修改品牌设置
+export const addBrand = (params) => {
+    return postRequest('/goods/brand', params)
+}
+// 禁用品牌
+export const disableBrand = (id, params) => {
+    return putRequest(`/goods/brand/disable/${id}`, params)
+}
+//根据分类id获取关联品牌
+export const getCategoryBrandListData = (category_id, params) => {
+    return getRequest(`/category/brand/${category_id}`, params)
+}
+//保存获取关联品牌
+export const saveCategoryBrand = (category_id, params) => {
+    return postRequest(`/category/brand/${category_id}`, params)
+}
+//保存获取关联规格
+export const saveCategorySpec = (category_id, params) => {
+    return postRequest(`/goods/category/spec/${category_id}`, params)
+}
+
+//获取所有可用品牌
+export const getBrandListData = (params) => {
+    return getRequest('/goods/brand/all', params)
+}
+// 获取所有可用规格
+export const getSpecificationList = (params) => {
+    return getRequest('/goods/spec/all', params)
+}
+
+//获取分类列表数据
+export const getAllCategoryList = (parent_id) => {
+  return getRequest(`/goods/category/${parent_id}/all-children`)
+}
+
+//获取分类列表数据
+export const getCategoryTree = () => {
+  return getRequest(`/goods/category/allChildren`)
+}
+
+//  添加商品分类
+export const insertCategory = (params) => {
+    return postRequest('/goods/category', params)
+}
+//  添加商品分类
+export const updateCategory = (params) => {
+    return putRequest('/goods/category', params)
+}
+//删除商品分类
+export const delCategory = (id) => {
+    return deleteRequest(`/goods/category/${id}`)
+}
+// 禁用分类
+export const disableCategory = (id, type) => {
+    return putRequest(`/goods/category/disable/${id}`, type)
+}
+
+
+//  获取商品规格分页列表
+export const getSpecListData = (params) => {
+    return getRequest('/goods/spec/page', params)
+}
+//  添加或修改规格设置
+export const insertSpec = (params) => {
+    return postRequest('/goods/spec', params)
+}
+//  添加或修改规格设置
+export const updateSpec = (params) => {
+    return putRequest('/goods/spec', params)
+}
+//根据分类id获取关联规格
+export const getCategorySpecListData = (category_id, params) => {
+    return getRequest(`/goods/category/spec/${category_id}`, params)
+}
+//删除gUI个
+export const delSpec = (id, params) => {
+    return deleteRequest(`/goods/spec/${id}`, params)
+}
+//  获取商品规格值列表
+export const getSpecValuesListData = (id, params) => {
+    return getRequest(`/goods/specValues/values/${id}`, params)
+}
+//  添加商品规格值
+export const saveSpecValues = (id, params) => {
+    return postRequest(`/goods/specValues/save/${id}`, params)
+}
+
+
+// 查询某分类下的全部子分类列表
+export const getGoodsCategory = (parent_id) => {
+    return getRequest(`/goods/category/${parent_id}/all-children`)
+}
+
+//  上架商品
+export const upGoods = (id, params) => {
+    return putRequest(`/goods/${id}/up`, params)
+  }
+  //  下架商品
+  export const lowGoods = (id, params) => {
+    return putRequest(`/goods/${id}/under`, params)
+  }
+
+//  获取商品sku分页列表
+export const getGoodsSkuData = (params) => {
+    return getRequest('/goods/sku/list', params)
+}
+
+
+//  获取商品分页列表
+export const getGoodsListData = (params) => {
+    return getRequest('/goods/list', params)
+}
+//  获取待审核商品分页列表
+export const getAuthGoodsListData = (params) => {
+    return getRequest('/goods/auth/list', params)
+}
+//  审核商品
+export const authGoods = (id, params) => {
+    return putRequest(`/goods/${id}/auth`, params)
+}
+
+//查询分类绑定参数信息
+export const getCategoryParamsListData = (id, params) => {
+    return getRequest(`/goods/category/parameters/${id}`, params)
+}
+
+//查询商品绑定参数信息
+export const getCategoryParamsByGoodsId = (goodsId, categoryId) => {
+    return getRequest(`/goods/parameters/${goodsId}/${categoryId}`)
+}
+//保存参数
+export const insertGoodsParams = (params) => {
+    return postRequest('/goods/parameters', params)
+}
+//更新参数
+export const updateGoodsParams = (params) => {
+    return putRequest('/goods/parameters', params)
+}
+//删除参数
+export const deleteParams = (id, params) => {
+    return deleteRequest(`/goods/parameters/${id}`, params)
+}
+//保存参数组
+export const insertParamsGroup = (params) => {
+    return postRequest('/goods/category/parameters', params)
+}
+//更新参数组
+export const updateParamsGroup = (params) => {
+    return putRequest('/goods/category/parameters', params)
+}
+//删除参数组
+export const deleteParamsGroup = (id, params) => {
+    return deleteRequest(`/goods/category/parameters/${id}`, params)
+}
+
+//保存获取关联规格
+export const getGoodsSpecInfo = (category_id, params) => {
+    return getRequest(`/goods/category/spec/goods/${category_id}`, params)
+}
+
+
+//获取sku列表
+export const getSkuPage = (params) => {
+  return getRequest(`/goodsSku/getByPage`, params)
+}
+
+
+//查看商品详情
+export const getGoodsDetail = (id) => {
+  return getRequest(`/goods/get/${id}`)
+}
+
+
+
+// 获取订单统计图表
+export const getOrderChart = (params) => {
+  return getRequest(`/statistics/order`, params)
+}
+
+
+// 订单统计概览
+export const getOrderOverView = (params) => {
+  return getRequest(`/statistics/order/overview`, params)
+}
+
+// 统计相关订单统计
+
+export const statisticsOrderList = (params) => {
+  return getRequest(`/statistics/order/order`, params)
+}
+
+// 统计相关退单统计
+
+export const statisticsOrderRefundList = (params) => {
+  return getRequest(`/statistics/order/refund`, params)
+}
+
+
+// 获取行业统计列表
+export const goodsCategoryStatistics = (params) => {
+    return getRequest(`/statistics/goods/getCategoryByPage`, params)
+}
+
+// 获取统计列表,排行前一百的数据
+export const goodsStatistics = (params) => {
+    return getRequest(`/statistics/goods`, params)
+}
+
+
+// 获取退款统计列表
+export const refundStatistics = (params) => {
+    return getRequest(`/statistics/refund/order/getByPage`, params)
+}
+
+// 获取退款统计金额
+export const refundPriceStatistics = (params) => {
+    return getRequest(`/statistics/refund/order/getPrice`, params)
+}
+
diff --git a/manager/src/api/index.js b/manager/src/api/index.js
new file mode 100644
index 00000000..658ad6cd
--- /dev/null
+++ b/manager/src/api/index.js
@@ -0,0 +1,413 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  importRequest,
+  getRequestWithNoToken,
+  putRequestWithNoForm,
+  postRequestWithNoForm,
+  commonUrl,
+  managerUrl
+} from "@/libs/axios";
+import config from "@/config";
+
+// 文件上传接口
+export const uploadFile = commonUrl + "/common/upload/file";
+// 验证码渲染图片接口
+export const drawCodeImage = commonUrl + "/common/captcha/draw/";
+// 获取菜单
+export const getMenuList = managerUrl + "/permission/getMenuList";
+// Websocket
+export const ws = managerUrl + "/ws";
+
+export const getMessageSendData = "";
+
+
+//获取所有city
+export const getAllCity = (params) => {
+  return getRequest(commonUrl + '/common/region/allCity', params)
+}
+
+
+// 获取首页查询数据
+export const homeStatistics = (params) => {
+  return getRequest("/statistics/index", params);
+};
+
+// 获取首页tpo10商品
+export const hotGoods = (params) => {
+  return getRequest("/statistics/index/goodsStatistics", params);
+};
+// 获取首页tpo10店铺
+export const hotShops = (params) => {
+  return getRequest("/statistics/index/storeStatistics", params);
+};
+
+
+// 通知提示信息
+export const getNoticePage = (params) => {
+  return getRequest("/statistics/index/notice", params);
+};
+
+// 登陆
+export const login = (params) => {
+  return getRequestWithNoToken("/user/login", params);
+};
+// 刷新token
+export const handleRefreshToken = (token) => {
+  return getRequestWithNoToken(`/user/refresh/${token}`);
+};
+// 获取用户登录信息
+export const userInfo = (params) => {
+  return getRequest("/user/info", params);
+};
+// 注册
+export const regist = (params) => {
+  return postRequest("/user/regist", params);
+};
+// 初始化验证码
+export const initCaptcha = (params) => {
+  return getRequestWithNoToken("/common/captcha/init", params);
+};
+// 发送登录短信验证码
+export const sendLoginSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendLoginSms/${mobile}`, params);
+};
+// 发送注册短信验证码
+export const sendRegistSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendRegistSms/${mobile}`, params);
+};
+// 发送重置密码短信验证码
+export const sendResetSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendResetSms/${mobile}`, params);
+};
+// 发送修改绑定手机短信验证码
+export const sendEditMobileSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendEditMobileSms/${mobile}`, params);
+};
+// 通过手机重置密码
+export const resetByMobile = (params) => {
+  return postRequest("/user/resetByMobile", params);
+};
+
+// IP天气信息
+export const ipInfo = (params) => {
+  return getRequest("/common/ip/info", params);
+};
+// 个人中心编辑
+export const userInfoEdit = (params) => {
+  return putRequest("/user/edit", params);
+};
+// 个人中心修改密码
+export const changePass = (params) => {
+  return putRequest("/user/editPassword", params);
+};
+// 个人中心修改手机
+export const changeMobile = (params) => {
+  return postRequest("/user/changeMobile", params);
+};
+// 获取用户数据 多条件
+export const getUserListData = (params) => {
+  return getRequest("/user", params);
+};
+// 通过用户名搜索
+export const searchUserByName = (username, params) => {
+  return getRequest("/user/searchByName/" + username, params);
+};
+// 获取全部用户数据
+export const getAllUserData = (params) => {
+  return getRequest("/user/getAll", params);
+};
+
+// 添加用户
+export const addUser = (params) => {
+  return postRequest("/user", params);
+};
+// 编辑管理员自身
+export const editUser = (params) => {
+  return putRequest("/user/edit", params);
+};
+// 编辑用户
+export const editOtherUser = (params) => {
+  return putRequest("/user/admin/edit", params);
+};
+// 启用用户
+export const enableUser = (id, params) => {
+  return putRequest(`/user/enable/${id}`, params);
+};
+// 删除用户
+export const deleteUser = (ids, params) => {
+  return deleteRequest(`/user/${ids}`, params);
+};
+// 导入用户
+export const importUserData = (params) => {
+  return importRequest("/user/importData", params);
+};
+/****************************** 部门 */
+// 通过部门获取全部角色数据
+export const getUserByDepartmentId = (id, params) => {
+  return getRequest(`/departmentRole/${id}`, params);
+};
+
+// 通过部门修改绑定角色
+export const updateDepartmentRole = (id, params) => {
+  return putRequestWithNoForm(`/departmentRole/${id}`, params);
+};
+
+// 获取一级部门
+export const initDepartment = (params) => {
+  return getRequest("/department", params);
+};
+// 加载部门子级数据
+export const loadDepartment = (id) => {
+  return getRequest(`/department/${id}`);
+};
+// 添加部门
+export const addDepartment = (params) => {
+  return postRequest("/department", params);
+};
+// 编辑部门
+export const editDepartment = (ids, params) => {
+  return putRequest(`/department/${ids} `, params);
+};
+// 删除部门
+export const deleteDepartment = (ids, params) => {
+  return deleteRequest(`/department/${ids}`, params);
+};
+// 搜索部门
+export const searchDepartment = (params) => {
+  return getRequest("/department/search", params);
+};
+
+/****************************** 部门结束 */
+
+// 获取全部角色数据
+export const getAllRoleList = (params) => {
+  return getRequest("/role", params);
+};
+// 分页获取角色数据
+export const getRoleList = (params) => {
+  return getRequest("/role", params);
+};
+
+// 添加角色
+export const addRole = (params) => {
+  return postRequest("/role", params);
+};
+
+// 编辑角色
+export const editRole = (params) => {
+  return putRequest(`/role/${params.roleId}`, params);
+};
+
+// 查看某角色拥有的菜单
+export const selectRoleMenu = (params) => {
+  return getRequest(`/roleMenu/${params}`);
+};
+
+// 保存角色菜单
+export const saveRoleMenu = (id, params) => {
+  return postRequestWithNoForm(`/roleMenu/${id}`, params);
+};
+
+// 分配角色权限
+export const editRolePerm = (params) => {
+  return postRequest("/role/editRolePerm", params);
+};
+// 分配角色数据权限
+export const editRoleDep = (params) => {
+  return postRequest("/role/editRoleDep", params);
+};
+// 删除角色
+export const deleteRole = (ids, params) => {
+  return deleteRequest(`/role/${ids}`, params);
+};
+
+/****************************** 角色结束 */
+
+
+/****************************** 权限 */
+// 获取全部权限数据
+export const getAllPermissionList = (params) => {
+  return getRequest("/menu/tree", params);
+};
+
+// 获取全部权限数据
+export const getCurrentPermissionList = (params) => {
+  return getRequest("/menu/memberMenu", params);
+};
+
+// 添加权限
+export const addPermission = (params) => {
+  return postRequest("/menu", params);
+};
+
+// 编辑权限
+export const editPermission = (params) => {
+  return putRequest(`/menu/${params.id}`, params);
+};
+// 删除权限
+export const deletePermission = (ids, params) => {
+  return deleteRequest(`/menu/${ids}`, params);
+};
+// 搜索权限
+export const searchPermission = (params) => {
+  return getRequest("/menu", params);
+};
+
+/****************************** 权限结束 */
+
+
+// 分页获取日志数据
+export const getLogListData = (params) => {
+  return getRequest("/log/getAllByPage", params);
+};
+// 删除日志
+export const deleteLog = (ids, params) => {
+  return deleteRequest(`/log/${ids}`, params);
+};
+// 清空日志
+export const deleteAllLog = (params) => {
+  return deleteRequest("/log", params);
+};
+
+
+// 分页获取消息数据
+export const getMessageData = (params) => {
+  return getRequest("/message/getByCondition", params);
+};
+// 获取单个消息详情
+export const getMessageDataById = (id, params) => {
+  return getRequest(`/message/get/${id}`, params);
+};
+// 发送消息
+export const addMessage = (params) => {
+  return postRequest("/messageSend/send", params);
+};
+// 编辑消息
+export const editMessage = (params) => {
+  return postRequest("/message/edit", params);
+};
+// 删除消息
+export const deleteMessage = (ids, params) => {
+  return deleteRequest(`/message/delByIds/${ids}`, params);
+};
+// 编辑发送消息
+export const editMessageSend = (params) => {
+  return putRequest("/messageSend/update", params);
+};
+// 删除发送消息
+export const deleteMessageSend = (ids, params) => {
+  return deleteRequest(`/manager/messageSend/delByIds/${ids}`, params);
+};
+
+// 通过id获取子地区
+export const getRegion = (id) => {
+  return getRequest(`/region/item/${id}`);
+};
+
+// 分页获取文件数据
+export const getFileListData = (params) => {
+  return getRequest("/file", params);
+};
+
+// 重命名文件
+export const renameFile = (params) => {
+  return postRequest("/file/rename", params);
+};
+// 删除文件
+export const deleteFile = (ids, params) => {
+  return deleteRequest(`/file/delete/${ids}`, params);
+};
+// 下载文件
+export const aliDownloadFile = (fKey, params) => {
+  return getRequest(`/file/ali/download/${fKey}`, params);
+};
+
+// base64上传
+export const base64Upload = (params) => {
+  return postRequest("/upload/file", params);
+};
+
+// 系统设置
+export const getSetting = (key) => {
+  return getRequest(`/system/setting/get/${key}`);
+};
+// 更新系统配置
+export const setSetting = (key, params) => {
+  return putRequestWithNoForm(`/system/setting/put/${key}`, params);
+};
+
+// 分页查询敏感词
+
+export const getSensitiveWordsPage = (params) => {
+  return getRequest(`/sensitiveWords`, params);
+};
+
+// 分页查询敏感词
+export const insertSensitiveWords = (params) => {
+  return postRequest(`/sensitiveWords`, params);
+};
+
+// 修改
+export const updateSensitiveWords = (id, params) => {
+  return putRequest(`/sensitiveWords/${id}`, params);
+};
+
+// 删除敏感词
+export const delSensitive = (ids) => {
+  return deleteRequest(`/sensitiveWords/delByIds/${ids}`);
+};
+
+// 添加商品计量单位
+export const addGoodsUnit = (params) => {
+  return postRequest(`/goods/goodsUnit`, params);
+};
+// 分页获取商品计量单位
+export const getGoodsUnitPage = (params) => {
+  return getRequest(`/goods/goodsUnit`, params);
+};
+// 编辑商品计量单位
+export const updateGoodsUnit = (id, params) => {
+  return putRequest(`/goods/goodsUnit/${id}`, params);
+};
+// 删除商品计量单位
+export const delGoodsUnit = (ids) => {
+  return deleteRequest(`/goods/goodsUnit/delete/${ids}`);
+};
+
+// 同步高德行政地区数据
+export const asyncRegion = () => {
+  return postRequest(`/region/sync`);
+};
+
+// 批量id删除
+export const delRegion = (ids) => {
+  return deleteRequest(`/region/${ids}`);
+};
+
+// 通过id获取地区详情
+export const getRegionDetail = (id) => {
+  return getRequest(`/region/${id}`);
+};
+
+// 更新地区
+export const updateRegion = (id, params) => {
+  return putRequest(`/region/${id}`, params);
+};
+// 添加地区
+export const addRegion = (params) => {
+  return postRequest(`/region`, params);
+};
+
+// 通过id获取子地区
+export const getChildRegion = (id) => {
+  return getRequest(`/region/item/${id}`);
+};
+
+// 重置用户密码
+export const resetPassword = (params) => {
+  return postRequest(`/user/resetPassword/${params}"`);
+};
diff --git a/manager/src/api/logistics.js b/manager/src/api/logistics.js
new file mode 100644
index 00000000..da8561d8
--- /dev/null
+++ b/manager/src/api/logistics.js
@@ -0,0 +1,32 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+} from "@/libs/axios";
+
+
+
+// 分页获取物流公司
+export const getLogisticsPage = params => {
+  return getRequest(`/logistics/getByPage`, params);
+};
+// 删除
+export const delLogistics = id => {
+  return deleteRequest(`/logistics/delete/${id}`);
+};
+// 添加
+export const addLogistics = params => {
+  return postRequest(`/logistics/save`,params);
+};
+// 通过id查询详情
+export const getLogisticsDetail = id => {
+  return getRequest(`/logistics/get/${id}`);
+};
+// 编辑
+export const updateLogistics = (id,params) => {
+  return putRequest(`/logistics/${id}`,params);
+};
+
+
diff --git a/manager/src/api/member.js b/manager/src/api/member.js
new file mode 100644
index 00000000..8f07de09
--- /dev/null
+++ b/manager/src/api/member.js
@@ -0,0 +1,138 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, putRequest, postRequest, deleteRequest} from "@/libs/axios";
+
+//   获取分页
+export const getMember = params => {
+  return getRequest("/member/getByPage", params);
+};
+
+
+// 分页获取会员评价
+export const getMemberReview = params => {
+  return getRequest("/memberEvaluation/getByPage", params);
+};
+
+// 获取id
+export const getMemberInfoReview = id => {
+  return getRequest(`/memberEvaluation/get/${id}`);
+};
+
+
+// 删除评论
+export const delMemberReview = id => {
+  return putRequest(`/memberEvaluation/delete/${id}`);
+};
+// 修改评价状态
+export const updateMemberReview = (id, params) => {
+  return getRequest(`/memberEvaluation/updateStatus/${id}`, params);
+};
+
+
+//  添加或修改
+export const insertOrUpdateSpec = params => {
+  return postRequest("/memberNoticeSenter/insertOrUpdate", params);
+};
+
+//  获取会员列表
+export const getMemberListData = params => {
+  return getRequest("/member", params);
+};
+
+//  获取会员详情
+export const getMemberInfoData = (id) => {
+  return getRequest(`/member/${id}`);
+};
+
+//  修改会员基本信息
+export const updateMember = (params) => {
+  return putRequest(`/member`, params);
+};
+
+//  添加会员基本信息
+export const addMember = params => {
+  return postRequest(`/member`, params);
+};
+
+//  获取会员列表
+export const getMemberAll = () => {
+  return getRequest("/member/getAll");
+};
+
+//  增加或修改会员列表
+export const operationMemberListData = params => {
+  return postRequest("/member/insertOrUpdate", params);
+};
+
+//  增加或修改会员列表
+export const deleteMemberListData = ids => {
+  return deleteRequest(`/member/delByIds/${ids}`);
+};
+// 获取充值记录列表数据
+export const getUserRecharge = params => {
+  return getRequest("/recharge", params);
+};
+
+// 获取预存款明细列表数据
+export const getUserWallet = params => {
+  return getRequest("/wallet/log", params);
+};
+
+// 获取提现申请列表数据
+export const getUserWithdrawApply = params => {
+  return getRequest("/members/withdraw-apply", params);
+};
+
+// 审核提现申请
+export const withdrawApply = params => {
+  return postRequest("/members/withdraw-apply", params);
+};
+
+//会员状态修改
+export const updateMemberStatus = params => {
+  return putRequest("/member/updateMemberStatus", params);
+};
+
+// 获取会员注册统计列表
+export const getMemberStatistics = params => {
+  return getRequest("/statistics/member", params);
+};
+
+
+
+// 获取会员注册统计列表
+export const getStatisticsList = params => {
+  return getRequest("/statistics/view/list", params);
+};
+//查询会员数量
+export const getMemberNum = params => {
+  return getRequest("/member/num", params);
+};
+//查询会员历史积分
+export const getHistoryPointData = (params) => {
+  return getRequest(`/member/memberPointsHistory/getByPage`, params)
+}
+//查询会员的收货地址
+export const getMemberAddressData = (id, params) => {
+  return getRequest(`/member/address/${id}`, params)
+}
+//删除会员地址
+export const removeMemberAddress = (id) => {
+  return deleteRequest(`/member/address/delById/${id}`)
+}
+//添加会员收货地址
+export const addMemberAddress = (params) => {
+  return postRequest(`/member/address`,params)
+}
+//修改会员收货地址
+export const editMemberAddress = (params) => {
+  return putRequest(`/member/address`,params)
+}
+//查询会员预存款
+export const getMemberWallet = (params) => {
+  return getRequest(`/members/wallet`,params)
+}
+
+
+
+
+
diff --git a/manager/src/api/order.js b/manager/src/api/order.js
new file mode 100644
index 00000000..da6f6ae7
--- /dev/null
+++ b/manager/src/api/order.js
@@ -0,0 +1,163 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest
+} from '@/libs/axios';
+
+
+//  交由商家申诉
+export const storeComplain = (params) => {
+  return putRequest(`/complain/status`, params)
+}
+
+
+//  获取售后原因分页列表
+export const getAfterSaleReasonPage = (params) => {
+  return getRequest('/afterSaleReason/getByPage', params)
+}
+
+//  删除售后原因
+export const delAfterSaleReason = (id) => {
+  return deleteRequest(`/afterSaleReason/delByIds/${id}`)
+}
+
+//  添加售后原因
+export const addAfterSaleReason = (params) => {
+  return postRequest(`/afterSaleReason`, params)
+}
+
+//  修改售后原因
+export const editAfterSaleReason = (id, params) => {
+  return putRequest(`/afterSaleReason/update/${id}`, params)
+}
+
+// 售后服务单详情
+export const afterSaleOrderDetail = (sn) => {
+  return getRequest(`/afterSale/${sn}`)
+}
+
+// 商家审核
+export const afterSaleSellerReview = (sn, params) => {
+  return putRequest(`/afterSale/review/${sn}`, params)
+}
+
+// 商家确认收货
+export const afterSaleSellerConfirm = (sn, params) => {
+  return putRequest(`/afterSale/confirm/${sn}`, params)
+}
+
+// 商家换货业务发货
+export const afterSaleSellerDelivery = (sn, params) => {
+  return putRequest(`/afterSale/${sn}/delivery`, params)
+}
+
+//  获取交易投诉信息
+export const getOrderComplain = (params) => {
+  return getRequest('/complain', params)
+}
+
+//  获取交易投诉详细信息
+export const getOrderComplainDetail = (id) => {
+  return getRequest(`/complain/${id}`)
+}
+
+//  交易投诉对话
+export const addOrderCommunication = (params) => {
+  return postRequest(`/complain/communication`, params)
+}
+
+//  平台仲裁
+export const orderComplete = (id, params) => {
+  return putRequest(`/complain/complete/${id}`, params)
+}
+
+//  查询订单列表
+export const getOrderList = (params) => {
+  return getRequest(`/orders`, params)
+}
+
+//  订单付款
+export const orderPay = (sn) => {
+  return postRequest(`/orders/${sn}/pay`)
+}
+
+//  订单付款
+export const orderDetail = (sn) => {
+  return getRequest(`/orders/${sn}`)
+}
+
+//  修改订单价格
+export const updateOrderPrice = (sn, params) => {
+  return putRequest(`/orders/update/${sn}/price`, params)
+}
+
+// 获取订单日志
+export const getOrderLog = (params) => {
+  return getRequest(`/orderLog/getByPage`, params)
+}
+
+// 订单取消
+export const orderCancel = (sn, params) => {
+  return postRequest(`/orders/${sn}/cancel`, params)
+}
+
+// 修改收货地址
+export const editOrderConsignee = (sn, params) => {
+  return postRequest(`/orders/update/${sn}/consignee`, params)
+}
+
+//  获取售后订单列表
+export const getAfterSaleOrderPage = (params) => {
+  return getRequest('/afterSale/page', params)
+}
+
+//  获取售后订单详情
+export const getAfterSaleOrderDetail = (sn) => {
+  return getRequest(`/afterSale/get/${sn}`)
+}
+
+//售后单查询物流
+export const getSellerDeliveryTraces = (sn, params) => {
+  return getRequest(`/afterSale/getSellerDeliveryTraces/${sn}`, params)
+}
+//售后单查询物流
+export const getAfterSaleTraces = (sn, params) => {
+  return getRequest(`/afterSale/getDeliveryTraces/${sn}`, params)
+}
+
+// 获取商家选中的物流公司
+export const getLogisticsChecked = () => {
+  return getRequest(`/logistics/getChecked`)
+}
+
+//查询物流
+export const getTraces = (sn, params) => {
+  return postRequest(`/orders/getTraces/${sn}`, params)
+}
+//获取发票列表
+export const getReceiptPage = (params) => {
+  return getRequest(`/receipt`, params)
+}
+//平台退款
+export const refundPrice = (afterSaleSn, params) => {
+  return putRequest(`/afterSale/refund/${afterSaleSn}`, params)
+}
+
+
+//平台收款记录
+export const paymentLog = (params) => {
+  return getRequest(`/paymentLog`, params)
+}
+
+
+//平台退款记录
+export const refundLog = (params) => {
+  return getRequest(`/refundLog`, params)
+}
+
+
+
+
+
diff --git a/manager/src/api/other.js b/manager/src/api/other.js
new file mode 100644
index 00000000..645b2faf
--- /dev/null
+++ b/manager/src/api/other.js
@@ -0,0 +1,89 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest
+} from "@/libs/axios";
+
+/**
+ * 楼层装修设置
+ *
+ */
+export const setHomeSetup = params => {
+
+  return postRequest("/pageData/add", params);
+};
+
+/**
+ * 获取页面信息
+ *
+ */
+export const getHomeData = params => {
+
+  return getRequest(`/pageData/${params}`);
+};
+
+
+/**
+ * 查询楼层装修列表
+ *
+ */
+export const getHomeList = params => {
+
+  return getRequest("/pageData/pageDataList", params);
+};
+
+
+/**
+ * 修改楼层装修
+ *
+ */
+export const updateHome = (id, params) => {
+
+  return putRequest(`/pageData/update/${id}`, params);
+};
+
+/**
+ * 删除楼层装修
+ *
+ */
+export const removePageHome = (id) => {
+
+  return deleteRequest(`/pageData/remove/${id}`);
+};
+
+
+/**
+ * 发布页面
+ *
+ */
+export const releasePageHome = (id) => {
+
+  return putRequest(`/pageData/release/${id}`);
+};
+
+//管理员获取发送列表
+export const getMessagePage = (params) => {
+  return getRequest(`/message`, params);
+};
+//管理员获取发送列表
+export const sendMessage = (params) => {
+  return postRequest(`/message`, params);
+};
+//管理员获取发送详情列表
+export const getShopMessage = (params) => {
+  return getRequest(`/message/store`, params);
+};
+
+//管理员获取会员意见反馈
+export const getMemberFeedback = (params) => {
+  return getRequest(`/feedback`, params);
+};
+
+//管理员获取会员意见反馈
+export const getMemberFeedbackDetail = (id) => {
+  return getRequest(`/feedback/${id}`);
+};
+
+
diff --git a/manager/src/api/pages.js b/manager/src/api/pages.js
new file mode 100644
index 00000000..d8775679
--- /dev/null
+++ b/manager/src/api/pages.js
@@ -0,0 +1,116 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios';
+
+//保存导航栏
+export const save = (params) => {
+    return postRequest('/siteNavigation/save', params)
+}
+//保存导航栏
+export const update = (params) => {
+    return postRequest('/siteNavigation/update', params)
+}
+//查询导航栏
+export const getNavigationData = (params) => {
+    return getRequest('/siteNavigation/getByPage', params)
+}
+//禁用导航栏
+export const disableNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/disable/${ids}`)
+}
+//启用导航栏
+export const enableNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/enable/${ids}`)
+}
+//删除导航栏
+export const delNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/remove/${ids}`)
+}
+
+//
+export const saveFocus = (params) => {
+    return deleteRequest('/siteNavigation/remove/${ids}', params)
+}
+
+//查询焦点图
+export const getFocusData = (params) => {
+    return getRequest('/focus/getByPage', params)
+}
+//查询焦点图
+export const saveFocusData = (params) => {
+    return postRequest('/focus/insertOrUpdate', params)
+}
+//禁用导航栏
+export const disableFocus = (ids) => {
+    return putRequest(`/focus/disable/${ids}`)
+}
+//启用导航栏
+export const enableFocus = (ids) => {
+    return putRequest(`/focus/enable/${ids}`)
+}
+//删除导航栏
+export const delFocus = (ids) => {
+    return deleteRequest(`/focus/delByIds/${ids}`)
+}
+
+//根据店铺编号查询页面数据（店铺编号为0则为平台）
+export const getPageData = (id) => {
+    return getRequest(`/page/get/${id}`)
+}
+
+//保存页面数据
+export const savePageData = (params) => {
+    return postRequest('/page/insertOrUpdate', params)
+}
+//获取分类列表数据
+export const getArticleCategory = () => {
+  return getRequest(`/article-category/all-children`)
+}
+//文章分类添加
+export const saveArticleCategory = (params) => {
+    return postRequest('/article-category', params)
+}
+
+//删除文章分类
+export const delArticleCategory = (id) => {
+    return deleteRequest(`/article-category/${id}`)
+}
+//修改文章分类
+export const updateArticleCategory = (params, id) => {
+    return putRequest(`/article-category/update/${id}`, params)
+}
+//文章添加
+export const saveArticle = (params) => {
+    return postRequest('/article', params)
+}
+//文章修改
+export const updateArticle = (params) => {
+    return putRequest(`/article/update/${params.id}`, params)
+}
+//文章是否展示修改
+export const updateArticleStatus = (id,params) => {
+  return putRequest(`/article/update/status/${id}`, params)
+}
+//查看文章
+export const seeArticle = (id) => {
+    return getRequest(`/article/${id}`)
+}
+//获取文章列表数据
+export const getArticle = (params) => {
+    return getRequest('/article/getByPage', params)
+}
+
+
+
+//删除文章数据
+export const delArticle = (ids) => {
+    return deleteRequest(`/article/delByIds/${ids}`)
+}
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/api/platform.js b/manager/src/api/platform.js
new file mode 100644
index 00000000..d2aee849
--- /dev/null
+++ b/manager/src/api/platform.js
@@ -0,0 +1,15 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest } from '@/libs/axios';
+
+// 验证码渲染图片接口
+export const drawCodeImage = "/lili/common/captcha/draw/"
+
+
+// 获取kuaidi配置
+export const getParams = (params) => {
+    return getRequest('/platformSetting/get/'+params)
+}
+// 编辑kuaidi配置
+export const editParams = (params,method) => {
+    return postRequest('/platformSetting/insertOrUpdate/'+method, params)
+}
diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js
new file mode 100644
index 00000000..4fd81dfd
--- /dev/null
+++ b/manager/src/api/promotion.js
@@ -0,0 +1,174 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest, putRequest, deleteRequest } from '@/libs/axios';
+
+
+
+// 获取限时抢购申请列表
+
+export const getPromotionSeckill = (params) => {
+
+  return getRequest(`/promotion/seckill/apply`, params)
+}
+
+// 获取当前进行中的促销活动商品
+
+export const getPromotionGoods = (promotionId,params) => {
+  return getRequest(`/promotion/${promotionId}/goods`, params)
+}
+
+// 获取当前进行中的促销活动
+export const getAllPromotion = (params) => {
+  return getRequest('/promotion/current', params)
+}
+
+// 获取拼团数据
+export const getPintuanList = (params) => {
+    return getRequest('/promotion/pintuan', params)
+}
+
+// 获取拼团详情
+export const getPintuanDetail = (id) => {
+    return getRequest(`/promotion/pintuan/${id}`)
+}
+
+// 获取拼团商品数据
+export const getPintuanGoodsList = (params) => {
+    return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`,params)
+}
+
+// 关闭拼团活动
+export const closePintuan = (pintuanId) => {
+    return putRequest(`/promotion/pintuan/close/${pintuanId}`)
+}
+
+// 保存平台优惠券
+export const savePlatformCoupon = (params) => {
+    return postRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+}
+// 修改平台优惠券
+export const editPlatformCoupon = (params) => {
+    return putRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+}
+
+// 获取平台优惠券
+export const getPlatformCouponList = (params) => {
+    return getRequest('/promotion/coupon', params)
+}
+//  作废优惠券
+export const deletePlatformCoupon = (ids) => {
+    return deleteRequest(`/promotion/coupon/${ids}`)
+}
+//  更新优惠券状态
+export const updatePlatformCouponStatus = ( params) => {
+    return putRequest(`/promotion/coupon/status`, params)
+}
+//  获取单个优惠券
+export const getPlatformCoupon = (id) => {
+    return getRequest(`/promotion/coupon/${id}`)
+}
+
+
+// 获取优惠券领取详情
+export const getMemberReceiveCouponList = (id) => {
+    return getRequest(`/promotion/coupon/member/${id}`)
+}
+//  作废会员优惠券
+export const deleteMemberReceiveCoupon = (id) => {
+    return putRequest(`/promotion/coupon/member/cancellation/${id}`)
+}
+
+// 获取限时抢购数据
+export const getSeckillList = (params) => {
+    return getRequest('/promotion/seckill', params)
+}
+
+// 获取限时抢购审核列表
+export const seckillGoodsList = (params) => {
+    return getRequest('/promotion/seckill/apply', params)
+}
+
+// 获取限时抢购详情数据
+export const seckillDetail = (id, params) => {
+    return getRequest(`/promotion/seckill/${id}`, params)
+}
+
+// 删除限时抢购
+export const delSeckill = (id) => {
+    return deleteRequest(`/promotion/seckill/${id}`)
+}
+
+// 保存限时抢购
+export const saveSeckill = (params) => {
+    return postRequest('/promotion/seckill', params)
+}
+
+// 修改限时抢购
+export const updateSeckill = (params) => {
+    return putRequest('/promotion/seckill', params)
+}
+
+// 关闭限时抢购
+export const closeSeckill = (id) => {
+    return putRequest(`/promotion/seckill/close/${id}`)
+}
+
+// 审核限时抢购
+export const auditApplySeckill = (params) => {
+    return putRequest(`/promotion/seckill/apply/audit/${params.ids}`, params)
+}
+
+// 满优惠列表
+export const getFullDiscountList = (params) => {
+    return getRequest(`/promotion/fullDiscount`,params)
+}
+// 满优惠列表
+export const getFullDiscountById = (id) => {
+    return getRequest(`/promotion/fullDiscount/${id}`)
+}
+
+// 积分商品列表
+export const getPointsGoodsList = (params) => {
+    return getRequest(`/promotion/pointsGoods`,params)
+}
+// 积分商品详情
+export const getPointsGoodsById = (id) => {
+    return getRequest(`/promotion/pointsGoods/${id}`)
+}
+// 添加积分商品
+export const addPointsGoods = (params) => {
+    return postRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'})
+}
+// 修改积分商品
+export const updatePointsGoods = (params) => {
+    return putRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'})
+}
+// 修改积分商品状态
+export const editPointsGoodsStatus = (id, params) => {
+    return putRequest(`/promotion/pointsGoods/${id}`,params)
+}
+// 删除积分商品
+export const deletePointsGoodsStatus = (id) => {
+    return deleteRequest(`/promotion/pointsGoods/${id}`)
+}
+
+
+// 积分商品分类列表
+export const getPointsGoodsCategoryList = (params) => {
+    return getRequest(`/promotion/pointsGoodsCategory`,params)
+}
+// 积分商品分类详情
+export const getPointsGoodsCategoryById = (id) => {
+    return getRequest(`/promotion/pointsGoodsCategory/${id}`)
+}
+// 添加积分商品分类
+export const addPointsGoodsCategory = (params) => {
+    return postRequest(`/promotion/pointsGoodsCategory`, params)
+}
+// 更新积分商品分类
+export const updatePointsGoodsCategory = (params) => {
+    return putRequest(`/promotion/pointsGoodsCategory`, params)
+}
+// 删除积分商品分类
+export const deletePointsGoodsCategoryById = (id) => {
+    return deleteRequest(`/promotion/pointsGoodsCategory/${id}`)
+}
diff --git a/manager/src/api/setting.js b/manager/src/api/setting.js
new file mode 100644
index 00000000..2388ce09
--- /dev/null
+++ b/manager/src/api/setting.js
@@ -0,0 +1,198 @@
+import {
+  getRequest,
+  putRequest,
+  deleteRequest,
+  postRequest
+} from '@/libs/axios';
+
+// 查询短信站内信信息
+export const getMessageData = params => {
+  return getRequest("/message", params);
+};
+//修改短信模板
+export const editSmsMessageTemplate = (id, params) => {
+  return putRequest(`/message/sms/${id}`, params)
+}
+//修改站内信模板
+export const editNoticeMessage = (id, params) => {
+  return putRequest(`/noticeMessage/${id}`, params)
+}
+
+//微信消息同步
+export const wechatMessageSync = (params) => {
+  return getRequest("/message/wechat/init", params)
+}
+//分页获取微信消息
+export const getWechatMessagePage = (params) => {
+  return getRequest("/message/wechat", params)
+}
+//编辑微信消息模版
+export const editWechatMessageTemplate = (id, params) => {
+  return putRequest(`/message/wechat/${id}`, params)
+}
+//删除微信消息模版
+export const delWechatMessageTemplate = (id, params) => {
+  return deleteRequest(`/message/wechat/${id}`, params)
+}
+
+
+//微信消息订阅同步
+export const wechatMPMessageSync = (params) => {
+  return getRequest("/message/wechatMPMessage/init", params)
+}
+//分页获取微信消息订阅
+export const getWechatMPMessagePage = (params) => {
+  return getRequest("/message/wechatMPMessage", params)
+}
+//编辑微信消息订阅模版
+export const editWechatMPMessageTemplate = (id, params) => {
+  return putRequest(`/message/wechatMPMessage/${id}`, params)
+}
+//删除微信消息订阅模版
+export const delWechatMPMessageTemplate = (id, params) => {
+  return deleteRequest(`/message/wechatMPMessage/${id}`, params)
+}
+
+
+
+// 查询站内信模板信息
+export const getNoticeMessageData = params => {
+  return getRequest("/noticeMessage", params);
+};
+//删除站内信
+export const deleteMessage = (id) => {
+  return deleteRequest(`message/${id}`);
+};
+// 开启站内信模板
+export const openNoticeMessage = (id) => {
+  return putRequest(`/noticeMessage/${id}/open`);
+};
+// 修改站内信状态
+export const updateMessageStatus = (id,status) => {
+  return putRequest(`/noticeMessage/${id}/${status}`);
+};
+//获取短信模板
+export const getSmsTemplatePage = (params) => {
+  return getRequest(`sms/template/querySmsTemplatePage`, params);
+};
+//添加短信模板
+export const addSmsTemplatePage = (params) => {
+  return postRequest(`sms/template`, params);
+};
+//删除短信模板
+export const deleteSmsTemplatePage = (params) => {
+  return deleteRequest(`sms/template`, params);
+};
+//删除短信模板
+export const editSmsTemplatePage = (params) => {
+  return putRequest(`sms/template/modifySmsTemplate`, params);
+};
+//分页查询短信签名
+export const getSmsSignPage = (params) => {
+  return getRequest(`sms/sign/querySmsSignPage`, params);
+};
+//更新短信模板
+export const syncTemplate = () => {
+  return putRequest(`sms/template/querySmsSign`);
+};
+//更新短信模板
+export const addSmsSign = (params) => {
+  return postRequest(`sms/sign`, params);
+};
+//同步短信签名
+export const syncSign = () => {
+  return putRequest(`sms/sign/querySmsSign`);
+};
+//删除短信签名
+export const deleteSign = (id) => {
+  return deleteRequest(`sms/sign/${id}`);
+};
+//更新短信签名
+export const editSmsSign = (params) => {
+  return putRequest(`sms/sign/modifySmsSign`, params);
+};
+//查询签名详情
+export const smsSignDetail = (id) => {
+  return getRequest(`sms/sign/${id}`);
+};
+
+//分页查询app版本信息
+export const appVersionPage = (params) => {
+  return getRequest(`systems/app/version`, params);
+};
+//添加app版本信息
+export const addVersion = (params) => {
+  return postRequest(`systems/app/version`, params);
+};
+//修改app版本信息
+export const editVersion = (params, id) => {
+  return putRequest(`systems/app/version/${id}`, params);
+};
+//删除app版本信息
+export const deleteVersion = (id) => {
+  return deleteRequest(`systems/app/version/${id}`);
+};
+//查询同城配送列表
+export const getInstantDelivery = (params) => {
+  return getRequest(`instant-delivery/getByPage`, params);
+};
+
+//添加同城配送信息
+export const editInstantDelivery = (bean, params, headers) => {
+  return putRequest(`instant-delivery/${bean}/config`, params, headers);
+};
+//启用配送方案
+export const openInstantDelivery = (bean) => {
+  return putRequest(`instant-delivery/${bean}/open`);
+};
+
+//修改封面图片
+export const editInstantDeliveryImage = (bean, params) => {
+  return putRequest(`instant-delivery/${bean}/image`, params);
+};
+
+//查询短信发送记录
+export const getSmsPage = (params) => {
+  return getRequest(`sms`, params);
+};
+
+//发送短信
+export const sendSms = (params) => {
+  return postRequest(`sms`, params);
+};
+/*
+ * 获取 支付支持设置开关
+ */
+export const getPaymentSupportForm = () => {
+  return getRequest(`system/settingx/paymentSupport`);
+}
+
+//  验证码源文件删除
+export const delVerification = (id) => {
+  return deleteRequest(`/verificationSource/${id}`)
+}
+
+//  添加验证码源文件
+export const addVerification = (params) => {
+  return postRequest(`/verificationSource`, params)
+}
+
+//  修改验证码源文件
+export const editVerification = (id, params) => {
+  return putRequest(`/verificationSource/${id}`, params)
+}
+
+// 验证码源文件详情
+export const verificationDetail = (id) => {
+  return getRequest(`/verificationSource/${id}`)
+}
+
+// 验证码源文件列表
+export const verificationPage = (params) => {
+  return getRequest(`/verificationSource`, params)
+}
+
+//获取通知类站内信
+export const getNoticeMessageDetail = (id, params) => {
+  return getRequest(`/noticeMessage/${id}`, params)
+}
diff --git a/manager/src/api/shops.js b/manager/src/api/shops.js
new file mode 100644
index 00000000..93704f98
--- /dev/null
+++ b/manager/src/api/shops.js
@@ -0,0 +1,83 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest} from '@/libs/axios';
+
+//查询店铺列表
+export const getBillPage = (params) => {
+  return getRequest('/', params)
+}
+//查询店铺列表
+export const getShopListData = (params) => {
+    return getRequest('/store', params)
+}
+//禁用店铺
+export const disableShop = (id) => {
+    return putRequest(`/store/disable/${id}`)
+}
+//开启店铺
+export const enableBrand = (id) => {
+    return putRequest(`/store/enable/${id}`)
+}
+
+//查询店铺详细
+export const getShopDetailData = (id, params) => {
+    return getRequest(`/store/get/detail/${id}`, params)
+}
+
+//增加店铺列表
+export const shopAdd = (params) => {
+    return postRequest(`/store/add`, params)
+}
+
+//修改店铺列表
+export const shopEdit = (id,params) => {
+    return putRequest(`/store/edit/${id}`, params)
+}
+
+//审核店铺
+export const shopAudit = (id, passed) => {
+    return putRequest(`/store/audit/${id}/${passed}`)
+}
+
+//查询店铺详情
+export const shopDetail = (id) => {
+    return getRequest(`/store/get/detail/${id}`)
+}
+
+
+
+// 获取结算单分页
+export const getBuyBillPage = (params) => {
+  return getRequest(`/store/bill/getByPage`,params)
+}
+
+// 获取结算单详情
+export const getBuyBillDetail = (id) => {
+  return getRequest(`/store/bill/get/${id}`)
+}
+
+
+// 获取商家结算单流水分页
+export const getStoreFlow = (id,params) => {
+  return getRequest(`/store/bill/${id}/getStoreFlow`,params)
+}
+
+// 审核结算单
+
+export const examine = (id) => {
+  return putRequest(`/store/bill/examine/${id}`)
+}
+// 审核结算单
+
+export const pay = (id) => {
+  return putRequest(`/store/bill/pay/${id}`)
+}
+
+//获取所有商家
+export const getShopList = () => {
+  return getRequest(`/store/all`)
+}
+
+//根据id获取店铺信息
+export const getShopByMemberId = (id) => {
+  return getRequest(`/store/${id}/member`)
+}
diff --git a/manager/src/assets/aliyun.png b/manager/src/assets/aliyun.png
new file mode 100644
index 00000000..fed475ce
Binary files /dev/null and b/manager/src/assets/aliyun.png differ
diff --git a/manager/src/assets/background.png b/manager/src/assets/background.png
new file mode 100644
index 00000000..b828f919
Binary files /dev/null and b/manager/src/assets/background.png differ
diff --git a/manager/src/assets/background.svg b/manager/src/assets/background.svg
new file mode 100644
index 00000000..89c25976
--- /dev/null
+++ b/manager/src/assets/background.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="1361px" height="609px" viewBox="0 0 1361 609" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Group 21</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Ant-Design-Pro-3.0" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="账户密码登录-校验" transform="translate(-79.000000, -82.000000)">
+            <g id="Group-21" transform="translate(77.000000, 73.000000)">
+                <g id="Group-18" opacity="0.8" transform="translate(74.901416, 569.699158) rotate(-7.000000) translate(-74.901416, -569.699158) translate(4.901416, 525.199158)">
+                    <ellipse id="Oval-11" fill="#CFDAE6" opacity="0.25" cx="63.5748792" cy="32.468367" rx="21.7830479" ry="21.766008"></ellipse>
+                    <ellipse id="Oval-3" fill="#CFDAE6" opacity="0.599999964" cx="5.98746479" cy="13.8668601" rx="5.2173913" ry="5.21330997"></ellipse>
+                    <path d="M38.1354514,88.3520215 C43.8984227,88.3520215 48.570234,83.6838647 48.570234,77.9254015 C48.570234,72.1669383 43.8984227,67.4987816 38.1354514,67.4987816 C32.3724801,67.4987816 27.7006688,72.1669383 27.7006688,77.9254015 C27.7006688,83.6838647 32.3724801,88.3520215 38.1354514,88.3520215 Z" id="Oval-3-Copy" fill="#CFDAE6" opacity="0.45"></path>
+                    <path d="M64.2775582,33.1704963 L119.185836,16.5654915" id="Path-12" stroke="#CFDAE6" stroke-width="1.73913043" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <path d="M42.1431708,26.5002681 L7.71190162,14.5640702" id="Path-16" stroke="#E0B4B7" stroke-width="0.702678964" opacity="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1.405357899873153,2.108036953469981"></path>
+                    <path d="M63.9262187,33.521561 L43.6721326,69.3250951" id="Path-15" stroke="#BACAD9" stroke-width="0.702678964" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1.405357899873153,2.108036953469981"></path>
+                    <g id="Group-17" transform="translate(126.850922, 13.543654) rotate(30.000000) translate(-126.850922, -13.543654) translate(117.285705, 4.381889)" fill="#CFDAE6">
+                        <ellipse id="Oval-4" opacity="0.45" cx="9.13482653" cy="9.12768076" rx="9.13482653" ry="9.12768076"></ellipse>
+                        <path d="M18.2696531,18.2553615 C18.2696531,13.2142826 14.1798519,9.12768076 9.13482653,9.12768076 C4.08980114,9.12768076 0,13.2142826 0,18.2553615 L18.2696531,18.2553615 Z" id="Oval-4" transform="translate(9.134827, 13.691521) scale(-1, -1) translate(-9.134827, -13.691521) "></path>
+                    </g>
+                </g>
+                <g id="Group-14" transform="translate(216.294700, 123.725600) rotate(-5.000000) translate(-216.294700, -123.725600) translate(106.294700, 35.225600)">
+                    <ellipse id="Oval-2" fill="#CFDAE6" opacity="0.25" cx="29.1176471" cy="29.1402439" rx="29.1176471" ry="29.1402439"></ellipse>
+                    <ellipse id="Oval-2" fill="#CFDAE6" opacity="0.3" cx="29.1176471" cy="29.1402439" rx="21.5686275" ry="21.5853659"></ellipse>
+                    <ellipse id="Oval-2-Copy" stroke="#CFDAE6" opacity="0.4" cx="179.019608" cy="138.146341" rx="23.7254902" ry="23.7439024"></ellipse>
+                    <ellipse id="Oval-2" fill="#BACAD9" opacity="0.5" cx="29.1176471" cy="29.1402439" rx="10.7843137" ry="10.7926829"></ellipse>
+                    <path d="M29.1176471,39.9329268 L29.1176471,18.347561 C23.1616351,18.347561 18.3333333,23.1796097 18.3333333,29.1402439 C18.3333333,35.1008781 23.1616351,39.9329268 29.1176471,39.9329268 Z" id="Oval-2" fill="#BACAD9"></path>
+                    <g id="Group-9" opacity="0.45" transform="translate(172.000000, 131.000000)" fill="#E6A1A6">
+                        <ellipse id="Oval-2-Copy-2" cx="7.01960784" cy="7.14634146" rx="6.47058824" ry="6.47560976"></ellipse>
+                        <path d="M0.549019608,13.6219512 C4.12262681,13.6219512 7.01960784,10.722722 7.01960784,7.14634146 C7.01960784,3.56996095 4.12262681,0.670731707 0.549019608,0.670731707 L0.549019608,13.6219512 Z" id="Oval-2-Copy-2" transform="translate(3.784314, 7.146341) scale(-1, 1) translate(-3.784314, -7.146341) "></path>
+                    </g>
+                    <ellipse id="Oval-10" fill="#CFDAE6" cx="218.382353" cy="138.685976" rx="1.61764706" ry="1.61890244"></ellipse>
+                    <ellipse id="Oval-10-Copy-2" fill="#E0B4B7" opacity="0.35" cx="179.558824" cy="175.381098" rx="1.61764706" ry="1.61890244"></ellipse>
+                    <ellipse id="Oval-10-Copy" fill="#E0B4B7" opacity="0.35" cx="180.098039" cy="102.530488" rx="2.15686275" ry="2.15853659"></ellipse>
+                    <path d="M28.9985381,29.9671598 L171.151018,132.876024" id="Path-11" stroke="#CFDAE6" opacity="0.8"></path>
+                </g>
+                <g id="Group-10" opacity="0.799999952" transform="translate(1054.100635, 36.659317) rotate(-11.000000) translate(-1054.100635, -36.659317) translate(1026.600635, 4.659317)">
+                    <ellipse id="Oval-7" stroke="#CFDAE6" stroke-width="0.941176471" cx="43.8135593" cy="32" rx="11.1864407" ry="11.2941176"></ellipse>
+                    <g id="Group-12" transform="translate(34.596774, 23.111111)" fill="#BACAD9">
+                        <ellipse id="Oval-7" opacity="0.45" cx="9.18534718" cy="8.88888889" rx="8.47457627" ry="8.55614973"></ellipse>
+                        <path d="M9.18534718,17.4450386 C13.8657264,17.4450386 17.6599235,13.6143199 17.6599235,8.88888889 C17.6599235,4.16345787 13.8657264,0.332739156 9.18534718,0.332739156 L9.18534718,17.4450386 Z" id="Oval-7"></path>
+                    </g>
+                    <path d="M34.6597385,24.809694 L5.71666084,4.76878945" id="Path-2" stroke="#CFDAE6" stroke-width="0.941176471"></path>
+                    <ellipse id="Oval" stroke="#CFDAE6" stroke-width="0.941176471" cx="3.26271186" cy="3.29411765" rx="3.26271186" ry="3.29411765"></ellipse>
+                    <ellipse id="Oval-Copy" fill="#F7E1AD" cx="2.79661017" cy="61.1764706" rx="2.79661017" ry="2.82352941"></ellipse>
+                    <path d="M34.6312443,39.2922712 L5.06366663,59.785082" id="Path-10" stroke="#CFDAE6" stroke-width="0.941176471"></path>
+                </g>
+                <g id="Group-19" opacity="0.33" transform="translate(1282.537219, 446.502867) rotate(-10.000000) translate(-1282.537219, -446.502867) translate(1142.537219, 327.502867)">
+                    <g id="Group-17" transform="translate(141.333539, 104.502742) rotate(275.000000) translate(-141.333539, -104.502742) translate(129.333539, 92.502742)" fill="#BACAD9">
+                        <circle id="Oval-4" opacity="0.45" cx="11.6666667" cy="11.6666667" r="11.6666667"></circle>
+                        <path d="M23.3333333,23.3333333 C23.3333333,16.8900113 18.1099887,11.6666667 11.6666667,11.6666667 C5.22334459,11.6666667 0,16.8900113 0,23.3333333 L23.3333333,23.3333333 Z" id="Oval-4" transform="translate(11.666667, 17.500000) scale(-1, -1) translate(-11.666667, -17.500000) "></path>
+                    </g>
+                    <circle id="Oval-5-Copy-6" fill="#CFDAE6" cx="201.833333" cy="87.5" r="5.83333333"></circle>
+                    <path d="M143.5,88.8126685 L155.070501,17.6038544" id="Path-17" stroke="#BACAD9" stroke-width="1.16666667"></path>
+                    <path d="M17.5,37.3333333 L127.466252,97.6449735" id="Path-18" stroke="#BACAD9" stroke-width="1.16666667"></path>
+                    <polyline id="Path-19" stroke="#CFDAE6" stroke-width="1.16666667" points="143.902597 120.302281 174.935455 231.571342 38.5 147.510847 126.366941 110.833333"></polyline>
+                    <path d="M159.833333,99.7453842 L195.416667,89.25" id="Path-20" stroke="#E0B4B7" stroke-width="1.16666667" opacity="0.6"></path>
+                    <path d="M205.333333,82.1372105 L238.719406,36.1666667" id="Path-24" stroke="#BACAD9" stroke-width="1.16666667"></path>
+                    <path d="M266.723424,132.231988 L207.083333,90.4166667" id="Path-25" stroke="#CFDAE6" stroke-width="1.16666667"></path>
+                    <circle id="Oval-5" fill="#C1D1E0" cx="156.916667" cy="8.75" r="8.75"></circle>
+                    <circle id="Oval-5-Copy-3" fill="#C1D1E0" cx="39.0833333" cy="148.75" r="5.25"></circle>
+                    <circle id="Oval-5-Copy-2" fill-opacity="0.6" fill="#D1DEED" cx="8.75" cy="33.25" r="8.75"></circle>
+                    <circle id="Oval-5-Copy-4" fill-opacity="0.6" fill="#D1DEED" cx="243.833333" cy="30.3333333" r="5.83333333"></circle>
+                    <circle id="Oval-5-Copy-5" fill="#E0B4B7" cx="175.583333" cy="232.75" r="5.25"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/manager/src/assets/dada.png b/manager/src/assets/dada.png
new file mode 100644
index 00000000..0a2ae027
Binary files /dev/null and b/manager/src/assets/dada.png differ
diff --git a/manager/src/assets/dashboard/console.png b/manager/src/assets/dashboard/console.png
new file mode 100644
index 00000000..4eec7618
Binary files /dev/null and b/manager/src/assets/dashboard/console.png differ
diff --git a/manager/src/assets/dashboard/department.png b/manager/src/assets/dashboard/department.png
new file mode 100644
index 00000000..52d61492
Binary files /dev/null and b/manager/src/assets/dashboard/department.png differ
diff --git a/manager/src/assets/dashboard/fee.png b/manager/src/assets/dashboard/fee.png
new file mode 100644
index 00000000..37be6b08
Binary files /dev/null and b/manager/src/assets/dashboard/fee.png differ
diff --git a/manager/src/assets/dashboard/user.png b/manager/src/assets/dashboard/user.png
new file mode 100644
index 00000000..36e977bc
Binary files /dev/null and b/manager/src/assets/dashboard/user.png differ
diff --git a/manager/src/assets/decorate/delete.png b/manager/src/assets/decorate/delete.png
new file mode 100644
index 00000000..eff5bc3f
Binary files /dev/null and b/manager/src/assets/decorate/delete.png differ
diff --git a/manager/src/assets/decorate/edit.png b/manager/src/assets/decorate/edit.png
new file mode 100644
index 00000000..9d639a9f
Binary files /dev/null and b/manager/src/assets/decorate/edit.png differ
diff --git a/manager/src/assets/decorate/phone.png b/manager/src/assets/decorate/phone.png
new file mode 100644
index 00000000..9bab6a44
Binary files /dev/null and b/manager/src/assets/decorate/phone.png differ
diff --git a/manager/src/assets/decorate/poplarGoods.png b/manager/src/assets/decorate/poplarGoods.png
new file mode 100644
index 00000000..b3b2a7ab
Binary files /dev/null and b/manager/src/assets/decorate/poplarGoods.png differ
diff --git a/manager/src/assets/empty.png b/manager/src/assets/empty.png
new file mode 100644
index 00000000..0dcc8194
Binary files /dev/null and b/manager/src/assets/empty.png differ
diff --git a/manager/src/assets/emptyImg.png b/manager/src/assets/emptyImg.png
new file mode 100644
index 00000000..a98baa98
Binary files /dev/null and b/manager/src/assets/emptyImg.png differ
diff --git a/manager/src/assets/festival_icon.png b/manager/src/assets/festival_icon.png
new file mode 100644
index 00000000..eec2f202
Binary files /dev/null and b/manager/src/assets/festival_icon.png differ
diff --git a/manager/src/assets/iPhoneX_model.png b/manager/src/assets/iPhoneX_model.png
new file mode 100644
index 00000000..bca24f1e
Binary files /dev/null and b/manager/src/assets/iPhoneX_model.png differ
diff --git a/manager/src/assets/img-error.png b/manager/src/assets/img-error.png
new file mode 100644
index 00000000..dada769a
Binary files /dev/null and b/manager/src/assets/img-error.png differ
diff --git a/manager/src/assets/loading.gif b/manager/src/assets/loading.gif
new file mode 100644
index 00000000..cc66fd30
Binary files /dev/null and b/manager/src/assets/loading.gif differ
diff --git a/manager/src/assets/loading2.gif b/manager/src/assets/loading2.gif
new file mode 100644
index 00000000..2a07a208
Binary files /dev/null and b/manager/src/assets/loading2.gif differ
diff --git a/manager/src/assets/loading3.gif b/manager/src/assets/loading3.gif
new file mode 100644
index 00000000..f1d2d763
Binary files /dev/null and b/manager/src/assets/loading3.gif differ
diff --git a/manager/src/assets/logo.png b/manager/src/assets/logo.png
new file mode 100644
index 00000000..4ee26429
Binary files /dev/null and b/manager/src/assets/logo.png differ
diff --git a/manager/src/assets/logo1.png b/manager/src/assets/logo1.png
new file mode 100644
index 00000000..6fba9abe
Binary files /dev/null and b/manager/src/assets/logo1.png differ
diff --git a/manager/src/assets/nav/1.jpg b/manager/src/assets/nav/1.jpg
new file mode 100644
index 00000000..de03b9f6
Binary files /dev/null and b/manager/src/assets/nav/1.jpg differ
diff --git a/manager/src/assets/nav/2.jpg b/manager/src/assets/nav/2.jpg
new file mode 100644
index 00000000..29bce4bb
Binary files /dev/null and b/manager/src/assets/nav/2.jpg differ
diff --git a/manager/src/assets/nav/3.jpg b/manager/src/assets/nav/3.jpg
new file mode 100644
index 00000000..433e4f4a
Binary files /dev/null and b/manager/src/assets/nav/3.jpg differ
diff --git a/manager/src/assets/nav/4.jpg b/manager/src/assets/nav/4.jpg
new file mode 100644
index 00000000..64083220
Binary files /dev/null and b/manager/src/assets/nav/4.jpg differ
diff --git a/manager/src/assets/nav/5.jpg b/manager/src/assets/nav/5.jpg
new file mode 100644
index 00000000..4265656d
Binary files /dev/null and b/manager/src/assets/nav/5.jpg differ
diff --git a/manager/src/assets/nav/nav_showimg1.jpg b/manager/src/assets/nav/nav_showimg1.jpg
new file mode 100644
index 00000000..f13f536e
Binary files /dev/null and b/manager/src/assets/nav/nav_showimg1.jpg differ
diff --git a/manager/src/assets/nav/nav_showimg2.jpg b/manager/src/assets/nav/nav_showimg2.jpg
new file mode 100644
index 00000000..9def75e0
Binary files /dev/null and b/manager/src/assets/nav/nav_showimg2.jpg differ
diff --git a/manager/src/assets/play.png b/manager/src/assets/play.png
new file mode 100644
index 00000000..49fad9f5
Binary files /dev/null and b/manager/src/assets/play.png differ
diff --git a/manager/src/assets/seckillBg.png b/manager/src/assets/seckillBg.png
new file mode 100644
index 00000000..16415eaf
Binary files /dev/null and b/manager/src/assets/seckillBg.png differ
diff --git a/manager/src/assets/selected.png b/manager/src/assets/selected.png
new file mode 100644
index 00000000..0c751f7f
Binary files /dev/null and b/manager/src/assets/selected.png differ
diff --git a/manager/src/assets/setting/app.svg b/manager/src/assets/setting/app.svg
new file mode 100644
index 00000000..e66307cd
--- /dev/null
+++ b/manager/src/assets/setting/app.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 1024 1024" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m0 512a512 512 0 1 0 1024 0 512 512 0 1 0 -1024 0z" fill="#cce0f5"/><path d="m306.122105 573.44h-115.334737l-29.103157 96.471579h-42.037895l107.789473-315.823158h42.037895l107.789474 315.823158h-40.96zm-9.701052-31.797895-15.090527-48.505263c-11.856842-35.570526-21.557895-70.063158-31.797894-107.789474-10.24 37.187368-20.48 71.141053-31.797895 107.789474l-15.629474 48.505263zm126.652631-187.553684h90.004211c71.141053 0 118.568421 23.713684 118.568421 92.698947s-47.427368 97.549474-116.412632 97.549474h-53.894737v125.574737h-38.265263zm87.309474 157.911579c53.894737 0 81.92-19.941053 81.92-65.212632s-28.025263-60.362105-83.536842-60.362105h-45.271579v125.574737zm185.397895-157.911579h90.00421c71.141053 0 118.568421 23.713684 118.568421 92.698947s-47.427368 97.549474-116.412631 97.549474h-53.894737v125.574737h-39.882105zm86.770526 157.911579c53.894737 0 81.92-19.941053 81.92-65.212632s-28.025263-60.362105-83.536842-60.362105h-45.271579v125.574737z" fill="#06c"/></svg>
\ No newline at end of file
diff --git a/manager/src/assets/setting/h5.svg b/manager/src/assets/setting/h5.svg
new file mode 100644
index 00000000..8ccbba75
--- /dev/null
+++ b/manager/src/assets/setting/h5.svg
@@ -0,0 +1 @@
+<svg height="64" viewBox="0 0 1024 1024" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m128 128 70.4 748.8 313.6 83.2 313.6-83.2 70.4-748.8zm614.4 243.2h-364.8l6.4 96h352l-25.6 281.6-198.4 51.2-198.4-51.2-12.8-147.2h96l6.4 70.4 108.8 32 108.8-25.6 12.8-121.6h-339.2l-25.6-275.2h480zm0 0" fill="#f39d24"/></svg>
\ No newline at end of file
diff --git a/manager/src/assets/setting/pc.svg b/manager/src/assets/setting/pc.svg
new file mode 100644
index 00000000..b8cdfd3b
--- /dev/null
+++ b/manager/src/assets/setting/pc.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 1024 1024" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m0 512a512 512 0 1 0 1024 0 512 512 0 1 0 -1024 0z" fill="#4485ff"/><path d="m433.624615 529.683692v188.337231l-197.316923-27.214769v-161.122462zm0-214.96123v190.621538h-197.316923v-163.446154zm284.041847 214.96123v227.367385l-262.380308-36.155077v-191.172923h262.380308zm0-253.991384v229.691077h-262.380308v-193.536z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/manager/src/assets/setting/wechat_mp.svg b/manager/src/assets/setting/wechat_mp.svg
new file mode 100644
index 00000000..6acec1a5
--- /dev/null
+++ b/manager/src/assets/setting/wechat_mp.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 1024 1024" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m0 512a512 512 0 1 0 1024 0 512 512 0 1 0 -1024 0z" fill="#fff"/><path d="m512 39.385a472.615 472.615 0 1 0 472.615 472.615 472.615 472.615 0 0 0 -472.615-472.615zm157.538 507.273a39.385 39.385 0 0 1 -48.049-19.692c-8.664-18.904 0-32.295 17.33-43.323a120.517 120.517 0 0 1 20.48-11.028c31.507-18.117 57.501-41.747 41.747-78.769a71.68 71.68 0 0 0 -84.283-41.748 66.954 66.954 0 0 0 -65.378 68.53v196.135a157.538 157.538 0 0 1 -157.539 136.27 157.538 157.538 0 0 1 -145.723-166.202c0-45.686 42.535-78.77 98.462-107.126 23.63-7.09 47.261-7.09 59.864 16.541s-11.027 40.96-31.507 50.412c-41.748 18.117-62.228 47.262-42.536 89.797a73.255 73.255 0 0 0 98.462 34.659 69.317 69.317 0 0 0 46.474-74.83v-178.02a137.058 137.058 0 0 1 99.249-139.42 163.84 163.84 0 0 1 173.292 44.898 144.148 144.148 0 0 1 -78.77 222.916z" fill="#7789db"/></svg>
\ No newline at end of file
diff --git a/manager/src/assets/title.png b/manager/src/assets/title.png
new file mode 100644
index 00000000..1b01a9c7
Binary files /dev/null and b/manager/src/assets/title.png differ
diff --git a/manager/src/assets/vaptcha-loading.gif b/manager/src/assets/vaptcha-loading.gif
new file mode 100644
index 00000000..08010d23
Binary files /dev/null and b/manager/src/assets/vaptcha-loading.gif differ
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
new file mode 100644
index 00000000..99ab1e11
--- /dev/null
+++ b/manager/src/config/index.js
@@ -0,0 +1,50 @@
+export default {
+  /**
+   * @description 配置显示在浏览器标签的title
+   */
+  title: 'Lili电商',
+  /**
+   * @description token在Cookie中存储的天数，默认1天
+   */
+  cookieExpires: 1,
+  /**
+   * @description 是否使用国际化，默认为false
+   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
+   *              用来在菜单中显示文字
+   */
+  useI18n: true,
+  /**
+   * @description api请求基础路径
+   */
+  api_dev: {
+    // common: 'http://192.168.0.111:9000',
+    // buyer: 'http://buyer-api.pickmall.cn',
+    // seller: 'http://store-api.pickmall.cn',
+    // manager: 'http://192.168.0.111:8887'
+
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+  },
+  api_prod: {
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+  },
+  /**
+   *  @description api请求基础路径前缀
+   */
+  baseUrlPrefix: '/manager',
+  /**
+   * @description 需要加载的插件
+   */
+  plugin: {
+    'error-store': {
+      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
+      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
+    }
+  }
+}
+
diff --git a/manager/src/libs/RegExp.js b/manager/src/libs/RegExp.js
new file mode 100644
index 00000000..bb823209
--- /dev/null
+++ b/manager/src/libs/RegExp.js
@@ -0,0 +1,47 @@
+/**
+ * 各种正则表达式
+ * mobile   手机号
+ * email    电子邮箱
+ * password 密码【6-20位】
+ * integer  正整数【不包含0】
+ * money    金钱
+ * TINumber 纳税识别号
+ * IDCard   身份证
+ * userName 账户名称【汉字、字母、数字、“-”、“_”的组合】
+ * URL      URL
+ * TEL      固定电话
+ */
+
+// 手机号
+export const mobile = /^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/
+
+// 电子邮箱
+export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+// 密码【6-20位】
+export const password = /^[@A-Za-z0-9!#$%^&*.~,]{6,20}$/
+
+// 正整数【不包含0】
+export const integer = /^[1-9]\d*$/
+
+// 正整数【包含0】
+export const Integer = /^[0-9]\d*$/
+
+// 金钱
+export const money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+
+// 纳税识别号
+export const TINumber = /^((\d{6}[0-9A-Z]{9})|([0-9A-Za-z]{2}\d{6}[0-9A-Za-z]{10,12}))$/
+
+// 身份证
+export const IDCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+
+// 账户名称【汉字、字母、数字、“-”、“_”的组合】
+export const userName = /[A-Za-z0-9_\-\u4e00-\u9fa5]$/
+
+// URL
+export const URL =
+  /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+
+// 固话
+export const TEL = /0\d{2,3}-\d{7,8}/
diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js
new file mode 100644
index 00000000..efe6ff40
--- /dev/null
+++ b/manager/src/libs/axios.js
@@ -0,0 +1,340 @@
+import axios from "axios";
+import config from "@/config";
+import {getStore, setStore} from "./storage.js";
+import {router} from "../router/index";
+import {Message} from "view-design";
+import Cookies from "js-cookie";
+import {handleRefreshToken} from "../api/index"
+
+// 统一请求路径前缀
+export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common);
+export const managerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager) + config.baseUrlPrefix;
+
+const service = axios.create({
+  timeout: 8000,
+  baseURL: managerUrl
+})
+var isRefreshToken = 0;
+const refreshToken = getTokenDebounce()
+service.interceptors.request.use(
+  config => {
+    if (config.method == 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
+    return config;
+  },
+  err => {
+    Message.error("请求超时");
+    return Promise.reject(err);
+  }
+);
+
+// http response 拦截器
+service.interceptors.response.use(
+  (response) => {
+    const data = response.data;
+    // 根据返回的code值来做不同的处理(和后端约定)
+    if (!data.success && data.message) {
+      Message.error(data.message);
+    }
+    switch (data.code) {
+      case 400:
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("系统异常");
+        }
+        break;
+      case 401:
+        // 未登录 清除已登录状态
+        Cookies.set("userInfo", "");
+        setStore("accessToken", "");
+        if (router.history.current.name != "login") {
+          if (data.message !== null) {
+            Message.error(data.message);
+          } else {
+            Message.error("未知错误，请重新登录");
+          }
+          router.push("/login");
+        }
+        return data;
+        break;
+      case 403:
+        // 权限不足
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("权限不足");
+        }
+        break;
+      case 500:
+        // 系统异常
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("系统异常");
+        }
+        break;
+      default:
+        return data;
+    }
+  },
+  async (error) => {
+    // 返回状态码不为200时候的错误处理
+    if (error.response) {
+      if (error.response.status === 401) {
+        // 这种情况一般调到登录页
+      } else if (error.response.status === 403) {
+        isRefreshToken++;
+        if(isRefreshToken === 1) {
+          const getTokenRes = await refreshToken();
+          if (getTokenRes === 'success') { // 刷新token
+            if (isRefreshToken === 1) {
+              error.response.config.headers.accessToken = getStore('accessToken')
+              return service(error.response.config)
+            } else {
+              router.go(0)
+            }
+          } else {
+            Cookies.set("userInfo", "");
+            router.push('/login')
+          }
+          isRefreshToken = 0
+        }
+
+      } else {
+        // 其他错误处理
+        Message.error(error.response.data.message)
+      }
+    }
+    /* router.push("/login") */
+    return Promise.resolve(error);
+  }
+)
+
+
+// 防抖闭包来一波
+function getTokenDebounce() {
+  let lock = false
+  let success = false
+  return function () {
+    if (!lock) {
+      lock = true
+      let oldRefreshToken = getStore("refreshToken");
+      handleRefreshToken(oldRefreshToken).then(res => {
+        if (res.code === 200) {
+          let {
+            accessToken,
+            refreshToken
+          } = res.result;
+          setStore("accessToken", accessToken);
+          setStore("refreshToken", refreshToken);
+
+          success = true
+          lock = false
+        } else {
+          success = false
+          lock = false
+          router.push('/login')
+        }
+      }).catch((err) => {
+        success = false
+        lock = false
+      })
+    }
+    return new Promise(resolve => {
+      // 一直看lock,直到请求失败或者成功
+      const timer = setInterval(() => {
+        if (!lock) {
+          clearInterval(timer)
+          if (success) {
+            resolve('success')
+          } else {
+            resolve('fail')
+          }
+        }
+      }, 500) // 轮询时间间隔
+    })
+  }
+}
+
+
+export const getRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "get",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const postRequest = (url, params, headers) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+    transformRequest: headers
+      ? undefined
+      : [
+        function (data) {
+          let ret = "";
+          for (let it in data) {
+            ret +=
+              encodeURIComponent(it) +
+              "=" +
+              encodeURIComponent(data[it]) +
+              "&";
+          }
+          ret = ret.substring(0, ret.length - 1);
+          return ret;
+        }
+      ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    }
+  });
+};
+
+/** 不带form表单不带transformRequest */
+export const postRequestWithNoForm = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+// export const postRequestWithHeaders = (url, params) => {
+//   let accessToken = getStore("accessToken");
+//   return axios({
+//     method: "post",
+//     url: `${url}`,
+//     data: params,
+
+//     headers: {
+//       accessToken: accessToken,
+//       "Content-Type": "application/x-www-form-urlencoded"
+//     }
+//   });
+// };
+
+export const putRequest = (url, params, headers) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "put",
+    url: `${url}`,
+    data: params,
+    transformRequest: headers
+      ? undefined
+      : [
+        function (data) {
+          let ret = "";
+          for (let it in data) {
+            ret +=
+              encodeURIComponent(it) +
+              "=" +
+              encodeURIComponent(data[it]) +
+              "&";
+          }
+          ret = ret.substring(0, ret.length - 1);
+          return ret;
+        }
+      ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    }
+  });
+};
+
+export const putRequestWithNoForm = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "put",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const deleteRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "delete",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const importRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const uploadFileRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+/**
+ * 无需token验证的请求 避免旧token过期导致请求失败
+ * @param {*} url
+ * @param {*} params
+ */
+export const getRequestWithNoToken = (url, params) => {
+  return service({
+    method: "get",
+    url: `${url}`,
+    params: params
+  });
+};
+
+
+/**
+ * 无需token验证的请求 避免旧token过期导致请求失败
+ * @param {*} url
+ * @param {*} params
+ */
+export const postRequestWithNoToken = (url, params) => {
+  return service({
+    method: "post",
+    url: `${url}`,
+    params: params
+  });
+};
+
diff --git a/manager/src/libs/emoji.js b/manager/src/libs/emoji.js
new file mode 100644
index 00000000..8643b079
--- /dev/null
+++ b/manager/src/libs/emoji.js
@@ -0,0 +1,77 @@
+// 新浪表情包api https://api.weibo.com/2/emotions.json?source=1362404091
+export const sina = [
+    {
+        alt: "[坏笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/4d/2018new_huaixiao_org.png"
+    },
+    {
+        alt: "[笑cry]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/4a/2018new_xiaoku_org.png"
+    },
+    {
+        alt: "[拜拜]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/fd/2018new_baibai_org.png"
+    },
+    {
+        alt: "[微笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/e3/2018new_weixioa02_org.png"
+    },
+    {
+        alt: "[偷笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/71/2018new_touxiao_org.png"
+    },
+    {
+        alt: "[亲亲]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/2c/2018new_qinqin_org.png"
+    },
+    {
+        alt: "[太开心]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/1e/2018new_taikaixin_org.png"
+    },
+    {
+        alt: "[挤眼]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/43/2018new_jiyan_org.png"
+    },
+    {
+        alt: "[可怜]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/96/2018new_kelian_org.png"
+    },
+    {
+        alt: "[可爱]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/09/2018new_keai_org.png"
+    },
+    {
+        alt: "[doge]",
+        src: "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/a1/2018new_doge02_org.png"
+    },
+    {
+        alt: "[二哈]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/22/2018new_erha_org.png"
+    },
+    {
+        alt: "[喵喵]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/7b/2018new_miaomiao_org.png"
+    },
+    {
+        alt: "[摊手]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/62/2018new_tanshou_org.png"
+    },
+    {
+        alt: "[跪了]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/75/2018new_gui_org.png"
+    }
+]
\ No newline at end of file
diff --git a/manager/src/libs/excel.js b/manager/src/libs/excel.js
new file mode 100644
index 00000000..4acb2791
--- /dev/null
+++ b/manager/src/libs/excel.js
@@ -0,0 +1,102 @@
+import XLSX from 'xlsx';
+
+function auto_width(ws, data){
+    /*set worksheet max width per col*/
+    const colWidth = data.map(row => row.map(val => {
+        /*if null/undefined*/
+        if (val == null) {
+            return {'wch': 10};
+        }
+        /*if chinese*/
+        else if (val.toString().charCodeAt(0) > 255) {
+            return {'wch': val.toString().length * 2};
+        } else {
+            return {'wch': val.toString().length};
+        }
+    }))
+    /*start in the first row*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+        for (let j = 0; j < colWidth[i].length; j++) {
+            if (result[j]['wch'] < colWidth[i][j]['wch']) {
+                result[j]['wch'] = colWidth[i][j]['wch'];
+            }
+        }
+    }
+    ws['!cols'] = result;
+}
+
+function json_to_array(key, jsonData){
+    return jsonData.map(v => key.map(j => { return v[j] }));
+}
+
+// fix data,return string
+function fixdata(data) {
+    let o = ''
+    let l = 0
+    const w = 10240
+    for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+    o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+    return o
+}
+
+// get head from excel file,return array
+function get_header_row(sheet) {
+    const headers = []
+    const range = XLSX.utils.decode_range(sheet['!ref'])
+    let C
+    const R = range.s.r /* start in the first row */
+    for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+        var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+        var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
+    }
+    return headers
+}
+
+export const export_table_to_excel= (id, filename) => {
+    const table = document.getElementById(id);
+    const wb = XLSX.utils.table_to_book(table);
+    XLSX.writeFile(wb, filename);
+}
+
+export const export_json_to_excel = ({data, key, title, filename, autoWidth}) => {
+    const wb = XLSX.utils.book_new();
+    data.unshift(title);
+    const ws = XLSX.utils.json_to_sheet(data, {header: key, skipHeader: true});
+    if(autoWidth){
+        const arr = json_to_array(key, data);
+        auto_width(ws, arr);
+    }
+    XLSX.utils.book_append_sheet(wb, ws, filename);
+    XLSX.writeFile(wb, filename + '.xlsx');
+}
+
+export const export_array_to_excel = ({key, data, title, filename, autoWidth}) => {
+    const wb = XLSX.utils.book_new();
+    const arr = json_to_array(key, data);
+    arr.unshift(title);
+    const ws = XLSX.utils.aoa_to_sheet(arr);
+    if(autoWidth){
+        auto_width(ws, arr);
+    }
+    XLSX.utils.book_append_sheet(wb, ws, filename);
+    XLSX.writeFile(wb, filename + '.xlsx');
+}
+
+export const read = (data, type) => {
+    const workbook = XLSX.read(data, { type: type });
+    const firstSheetName = workbook.SheetNames[0];
+    const worksheet = workbook.Sheets[firstSheetName];
+    const header = get_header_row(worksheet);
+    const results = XLSX.utils.sheet_to_json(worksheet);
+    return {header, results};
+}
+
+export default {
+  export_table_to_excel,
+  export_array_to_excel,
+  export_json_to_excel,
+  read
+}
diff --git a/manager/src/libs/icon.js b/manager/src/libs/icon.js
new file mode 100644
index 00000000..b1fa5323
--- /dev/null
+++ b/manager/src/libs/icon.js
@@ -0,0 +1,3513 @@
+export const icons = [
+    {
+        "icons": [
+            "ios-add-circle-outline"
+        ],
+        "tags": [
+            "circle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-add-circle",
+            "md-add-circle"
+        ],
+        "tags": [
+            "add",
+            "circle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-add",
+            "md-add"
+        ],
+        "tags": [
+            "add",
+            "include",
+            "invite",
+            "plus"
+        ]
+    },
+    {
+        "icons": [
+            "ios-alarm",
+            "md-alarm"
+        ],
+        "tags": [
+            "alarm"
+        ]
+    },
+    {
+        "icons": [
+            "ios-albums",
+            "md-albums"
+        ],
+        "tags": [
+            "albums",
+            "boxes",
+            "slides",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-alert",
+            "md-alert"
+        ],
+        "tags": [
+            "!",
+            "alert",
+            "attention",
+            "exclamation",
+            "notice",
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-american-football",
+            "md-american-football"
+        ],
+        "tags": [
+            "american",
+            "football"
+        ]
+    },
+    {
+        "icons": [
+            "ios-analytics",
+            "md-analytics"
+        ],
+        "tags": [
+            "analytics",
+            "data",
+            "metrics",
+            "track"
+        ]
+    },
+    {
+        "icons": [
+            "ios-aperture",
+            "md-aperture"
+        ],
+        "tags": [
+            "aperture",
+            "dark",
+            "images",
+            "levels",
+            "light",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-apps",
+            "md-apps"
+        ],
+        "tags": [
+            "apps",
+            "applications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-appstore",
+            "md-appstore"
+        ],
+        "tags": [
+            "appstore",
+            "store"
+        ]
+    },
+    {
+        "icons": [
+            "ios-archive",
+            "md-archive"
+        ],
+        "tags": [
+            "archive",
+            "email"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-back",
+            "md-arrow-back"
+        ],
+        "tags": [
+            "arrow",
+            "back",
+            "chevron",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-down",
+            "md-arrow-down"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "down"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropdown-circle",
+            "md-arrow-dropdown-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropdown"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropdown",
+            "md-arrow-dropdown"
+        ],
+        "tags": [
+            "arrow",
+            "dropdown"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropleft-circle",
+            "md-arrow-dropleft-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropleft"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropleft",
+            "md-arrow-dropleft"
+        ],
+        "tags": [
+            "arrow",
+            "dropleft"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropright-circle",
+            "md-arrow-dropright-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropright"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropright",
+            "md-arrow-dropright"
+        ],
+        "tags": [
+            "arrow",
+            "dropright"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropup-circle",
+            "md-arrow-dropup-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropup"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropup",
+            "md-arrow-dropup"
+        ],
+        "tags": [
+            "arrow",
+            "dropup"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-forward",
+            "md-arrow-forward"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "forward",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-back",
+            "md-arrow-round-back"
+        ],
+        "tags": [
+            "arrow",
+            "back",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-down",
+            "md-arrow-round-down"
+        ],
+        "tags": [
+            "arrow",
+            "down",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-forward",
+            "md-arrow-round-forward"
+        ],
+        "tags": [
+            "arrow",
+            "forward",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-up",
+            "md-arrow-round-up"
+        ],
+        "tags": [
+            "arrow",
+            "round",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-up",
+            "md-arrow-up"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-at",
+            "md-at"
+        ],
+        "tags": [
+            "@",
+            "at"
+        ]
+    },
+    {
+        "icons": [
+            "ios-attach",
+            "md-attach"
+        ],
+        "tags": [
+            "attach"
+        ]
+    },
+    {
+        "icons": [
+            "ios-backspace",
+            "md-backspace"
+        ],
+        "tags": [
+            "backspace"
+        ]
+    },
+    {
+        "icons": [
+            "ios-barcode",
+            "md-barcode"
+        ],
+        "tags": [
+            "barcode",
+            "camera",
+            "reader"
+        ]
+    },
+    {
+        "icons": [
+            "ios-baseball",
+            "md-baseball"
+        ],
+        "tags": [
+            "baseball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-basket",
+            "md-basket"
+        ],
+        "tags": [
+            "basket"
+        ]
+    },
+    {
+        "icons": [
+            "ios-basketball",
+            "md-basketball"
+        ],
+        "tags": [
+            "basketball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-charging",
+            "md-battery-charging"
+        ],
+        "tags": [
+            "battery",
+            "charging"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-dead",
+            "md-battery-dead"
+        ],
+        "tags": [
+            "battery",
+            "dead"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-full",
+            "md-battery-full"
+        ],
+        "tags": [
+            "battery",
+            "full"
+        ]
+    },
+    {
+        "icons": [
+            "ios-beaker",
+            "md-beaker"
+        ],
+        "tags": [
+            "beaker",
+            "flask",
+            "mixture",
+            "potion"
+        ]
+    },
+    {
+        "icons": [
+            "ios-beer",
+            "md-beer"
+        ],
+        "tags": [
+            "beer",
+            "drink",
+            "eat",
+            "food"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bicycle",
+            "md-bicycle"
+        ],
+        "tags": [
+            "bicycle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bluetooth",
+            "md-bluetooth"
+        ],
+        "tags": [
+            "bluetooth",
+            "cloud",
+            "connection"
+        ]
+    },
+    {
+        "icons": [
+            "ios-boat",
+            "md-boat"
+        ],
+        "tags": [
+            "boat"
+        ]
+    },
+    {
+        "icons": [
+            "ios-body",
+            "md-body"
+        ],
+        "tags": [
+            "body"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bonfire",
+            "md-bonfire"
+        ],
+        "tags": [
+            "bonfire",
+            "heat",
+            "hot"
+        ]
+    },
+    {
+        "icons": [
+            "ios-book",
+            "md-book"
+        ],
+        "tags": [
+            "book",
+            "read"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bookmark",
+            "md-bookmark"
+        ],
+        "tags": [
+            "bookmark",
+            "favorite",
+            "save",
+            "tag"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bookmarks",
+            "md-bookmarks"
+        ],
+        "tags": [
+            "bookmarks",
+            "favorite"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bowtie",
+            "md-bowtie"
+        ],
+        "tags": [
+            "bowtie"
+        ]
+    },
+    {
+        "icons": [
+            "ios-briefcase",
+            "md-briefcase"
+        ],
+        "tags": [
+            "briefcase",
+            "folder",
+            "organize"
+        ]
+    },
+    {
+        "icons": [
+            "ios-browsers",
+            "md-browsers"
+        ],
+        "tags": [
+            "browsers",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-brush",
+            "md-brush"
+        ],
+        "tags": [
+            "brush"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bug",
+            "md-bug"
+        ],
+        "tags": [
+            "bug",
+            "develop",
+            "error",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-build",
+            "md-build"
+        ],
+        "tags": [
+            "build"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bulb",
+            "md-bulb"
+        ],
+        "tags": [
+            "bulb"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bus",
+            "md-bus"
+        ],
+        "tags": [
+            "bus"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cafe",
+            "md-cafe"
+        ],
+        "tags": [
+            "cafe"
+        ]
+    },
+    {
+        "icons": [
+            "ios-calculator",
+            "md-calculator"
+        ],
+        "tags": [
+            "arithmatic",
+            "calculator",
+            "math"
+        ]
+    },
+    {
+        "icons": [
+            "ios-calendar",
+            "md-calendar"
+        ],
+        "tags": [
+            "calendar",
+            "date",
+            "month",
+            "week"
+        ]
+    },
+    {
+        "icons": [
+            "ios-call",
+            "md-call"
+        ],
+        "tags": [
+            "call",
+            "telephone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-camera",
+            "md-camera"
+        ],
+        "tags": [
+            "camera",
+            "image",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-car",
+            "md-car"
+        ],
+        "tags": [
+            "car"
+        ]
+    },
+    {
+        "icons": [
+            "ios-card",
+            "md-card"
+        ],
+        "tags": [
+            "$",
+            "card",
+            "cash",
+            "credit",
+            "debit",
+            "dollars",
+            "money",
+            "price",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cart",
+            "md-cart"
+        ],
+        "tags": [
+            "cart"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cash",
+            "md-cash"
+        ],
+        "tags": [
+            "$",
+            "cash",
+            "credit",
+            "debit",
+            "dollars",
+            "money",
+            "price",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-chatboxes",
+            "md-chatboxes"
+        ],
+        "tags": [
+            "chatboxes",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-chatbubbles",
+            "md-chatbubbles"
+        ],
+        "tags": [
+            "chatbubbles",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkbox-outline",
+            "md-checkbox-outline"
+        ],
+        "tags": [
+            "checkbox",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkbox",
+            "md-checkbox"
+        ],
+        "tags": [
+            "checkbox",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark-circle-outline",
+            "md-checkmark-circle-outline"
+        ],
+        "tags": [
+            "checkmark",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark-circle",
+            "md-checkmark-circle"
+        ],
+        "tags": [
+            "checkmark",
+            "circle",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark",
+            "md-checkmark"
+        ],
+        "tags": [
+            "checkmark",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-clipboard",
+            "md-clipboard"
+        ],
+        "tags": [
+            "clipboard",
+            "write"
+        ]
+    },
+    {
+        "icons": [
+            "ios-clock",
+            "md-clock"
+        ],
+        "tags": [
+            "clock",
+            "time"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close-circle-outline"
+        ],
+        "tags": [
+            "close",
+            "cicle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close-circle",
+            "md-close-circle"
+        ],
+        "tags": [
+            "circle",
+            "close"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close",
+            "md-close"
+        ],
+        "tags": [
+            "close",
+            "delete",
+            "remove"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-circle",
+            "md-cloud-circle"
+        ],
+        "tags": [
+            "circle",
+            "cloud"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-done",
+            "md-cloud-done"
+        ],
+        "tags": [
+            "cloud",
+            "done"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-download",
+            "md-cloud-download"
+        ],
+        "tags": [
+            "cloud",
+            "download",
+            "storage"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-outline",
+            "md-cloud-outline"
+        ],
+        "tags": [
+            "cloud"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-upload",
+            "md-cloud-upload"
+        ],
+        "tags": [
+            "cloud",
+            "storage",
+            "upload"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud",
+            "md-cloud"
+        ],
+        "tags": [
+            "cloud",
+            "storage",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloudy-night",
+            "md-cloudy-night"
+        ],
+        "tags": [
+            "cloudy",
+            "night",
+            "overcast",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloudy",
+            "md-cloudy"
+        ],
+        "tags": [
+            "cloudy",
+            "overcast",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code-download",
+            "md-code-download"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "download",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code-working",
+            "md-code-working"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "hacker",
+            "program",
+            "working"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code",
+            "md-code"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cog",
+            "md-cog"
+        ],
+        "tags": [
+            "cog",
+            "gear",
+            "options",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-fill",
+            "md-color-fill"
+        ],
+        "tags": [
+            "color",
+            "fill"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-filter",
+            "md-color-filter"
+        ],
+        "tags": [
+            "color",
+            "filter"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-palette",
+            "md-color-palette"
+        ],
+        "tags": [
+            "color",
+            "palette"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-wand",
+            "md-color-wand"
+        ],
+        "tags": [
+            "color",
+            "wand"
+        ]
+    },
+    {
+        "icons": [
+            "ios-compass",
+            "md-compass"
+        ],
+        "tags": [
+            "compass",
+            "directions",
+            "location",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-construct",
+            "md-construct"
+        ],
+        "tags": [
+            "construct"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contact",
+            "md-contact"
+        ],
+        "tags": [
+            "contact",
+            "people",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contacts",
+            "md-contacts"
+        ],
+        "tags": [
+            "contacts",
+            "people",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contract",
+            "md-contract"
+        ],
+        "tags": [
+            "contract"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contrast",
+            "md-contrast"
+        ],
+        "tags": [
+            "contrast",
+            "dark",
+            "images",
+            "levels",
+            "light",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-copy",
+            "md-copy"
+        ],
+        "tags": [
+            "copy",
+            "duplicate",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-create",
+            "md-create"
+        ],
+        "tags": [
+            "create"
+        ]
+    },
+    {
+        "icons": [
+            "ios-crop",
+            "md-crop"
+        ],
+        "tags": [
+            "crop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cube",
+            "md-cube"
+        ],
+        "tags": [
+            "box",
+            "container",
+            "cube",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cut",
+            "md-cut"
+        ],
+        "tags": [
+            "cut"
+        ]
+    },
+    {
+        "icons": [
+            "ios-desktop",
+            "md-desktop"
+        ],
+        "tags": [
+            "desktop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-disc",
+            "md-disc"
+        ],
+        "tags": [
+            "cd",
+            "disc",
+            "vinyl"
+        ]
+    },
+    {
+        "icons": [
+            "ios-document",
+            "md-document"
+        ],
+        "tags": [
+            "document",
+            "file",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-done-all",
+            "md-done-all"
+        ],
+        "tags": [
+            "all",
+            "done"
+        ]
+    },
+    {
+        "icons": [
+            "ios-download",
+            "md-download"
+        ],
+        "tags": [
+            "download",
+            "export"
+        ]
+    },
+    {
+        "icons": [
+            "ios-easel",
+            "md-easel"
+        ],
+        "tags": [
+            "easel"
+        ]
+    },
+    {
+        "icons": [
+            "ios-egg",
+            "md-egg"
+        ],
+        "tags": [
+            "baby",
+            "bird",
+            "birth",
+            "egg",
+            "twitter"
+        ]
+    },
+    {
+        "icons": [
+            "ios-exit",
+            "md-exit"
+        ],
+        "tags": [
+            "exit"
+        ]
+    },
+    {
+        "icons": [
+            "ios-expand",
+            "md-expand"
+        ],
+        "tags": [
+            "expand"
+        ]
+    },
+    {
+        "icons": [
+            "ios-eye-off",
+            "md-eye-off"
+        ],
+        "tags": [
+            "eye",
+            "off"
+        ]
+    },
+    {
+        "icons": [
+            "ios-eye",
+            "md-eye"
+        ],
+        "tags": [
+            "exposed",
+            "eye",
+            "look",
+            "see",
+            "view"
+        ]
+    },
+    {
+        "icons": [
+            "ios-fastforward",
+            "md-fastforward"
+        ],
+        "tags": [
+            "fastforward",
+            "jump",
+            "next",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-female",
+            "md-female"
+        ],
+        "tags": [
+            "dudette",
+            "female",
+            "girl",
+            "lady"
+        ]
+    },
+    {
+        "icons": [
+            "ios-filing",
+            "md-filing"
+        ],
+        "tags": [
+            "archive",
+            "filing"
+        ]
+    },
+    {
+        "icons": [
+            "ios-film",
+            "md-film"
+        ],
+        "tags": [
+            "film"
+        ]
+    },
+    {
+        "icons": [
+            "ios-finger-print",
+            "md-finger-print"
+        ],
+        "tags": [
+            "finger",
+            "print"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flag",
+            "md-flag"
+        ],
+        "tags": [
+            "favorite",
+            "flag",
+            "marker"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flame",
+            "md-flame"
+        ],
+        "tags": [
+            "fire",
+            "flame",
+            "heat",
+            "hot"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flash",
+            "md-flash"
+        ],
+        "tags": [
+            "flash",
+            "lightning",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flask",
+            "md-flask"
+        ],
+        "tags": [
+            "bubbles",
+            "flask",
+            "mixture",
+            "potion"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flower",
+            "md-flower"
+        ],
+        "tags": [
+            "flower"
+        ]
+    },
+    {
+        "icons": [
+            "ios-folder-open",
+            "md-folder-open"
+        ],
+        "tags": [
+            "folder",
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-folder",
+            "md-folder"
+        ],
+        "tags": [
+            "file",
+            "folder"
+        ]
+    },
+    {
+        "icons": [
+            "ios-football",
+            "md-football"
+        ],
+        "tags": [
+            "football",
+            "soccer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-funnel",
+            "md-funnel"
+        ],
+        "tags": [
+            "funnel",
+            "sort"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-branch",
+            "md-git-branch"
+        ],
+        "tags": [
+            "branch",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-commit",
+            "md-git-commit"
+        ],
+        "tags": [
+            "commit",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-compare",
+            "md-git-compare"
+        ],
+        "tags": [
+            "compare",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-merge",
+            "md-git-merge"
+        ],
+        "tags": [
+            "git",
+            "merge"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-network",
+            "md-git-network"
+        ],
+        "tags": [
+            "git",
+            "network"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-pull-request",
+            "md-git-pull-request"
+        ],
+        "tags": [
+            "git",
+            "pull",
+            "request"
+        ]
+    },
+    {
+        "icons": [
+            "ios-glasses",
+            "md-glasses"
+        ],
+        "tags": [
+            "glasses",
+            "look",
+            "reading",
+            "see",
+            "steve"
+        ]
+    },
+    {
+        "icons": [
+            "ios-globe",
+            "md-globe"
+        ],
+        "tags": [
+            "globe"
+        ]
+    },
+    {
+        "icons": [
+            "ios-grid",
+            "md-grid"
+        ],
+        "tags": [
+            "grid",
+            "menu"
+        ]
+    },
+    {
+        "icons": [
+            "ios-hammer",
+            "md-hammer"
+        ],
+        "tags": [
+            "hammer",
+            "options",
+            "settings",
+            "tools"
+        ]
+    },
+    {
+        "icons": [
+            "ios-hand",
+            "md-hand"
+        ],
+        "tags": [
+            "hand",
+            "stop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-happy",
+            "md-happy"
+        ],
+        "tags": [
+            "fun",
+            "good",
+            "happy",
+            "like",
+            "yes"
+        ]
+    },
+    {
+        "icons": [
+            "ios-headset",
+            "md-headset"
+        ],
+        "tags": [
+            "headset"
+        ]
+    },
+    {
+        "icons": [
+            "ios-heart",
+            "md-heart"
+        ],
+        "tags": [
+            "heart",
+            "love"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help-buoy",
+            "md-help-buoy"
+        ],
+        "tags": [
+            "?",
+            "buoy",
+            "help",
+            "question"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help-circle",
+            "md-help-circle"
+        ],
+        "tags": [
+            "circle",
+            "help"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help",
+            "md-help"
+        ],
+        "tags": [
+            "?",
+            "help",
+            "information",
+            "question"
+        ]
+    },
+    {
+        "icons": [
+            "ios-home",
+            "md-home"
+        ],
+        "tags": [
+            "home",
+            "house"
+        ]
+    },
+    {
+        "icons": [
+            "ios-ice-cream",
+            "md-ice-cream"
+        ],
+        "tags": [
+            "cream",
+            "ice"
+        ]
+    },
+    {
+        "icons": [
+            "ios-image",
+            "md-image"
+        ],
+        "tags": [
+            "camera",
+            "image",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-images",
+            "md-images"
+        ],
+        "tags": [
+            "images",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-infinite",
+            "md-infinite"
+        ],
+        "tags": [
+            "forever",
+            "infinite",
+            "loop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-information-circle",
+            "md-information-circle"
+        ],
+        "tags": [
+            "circle",
+            "information"
+        ]
+    },
+    {
+        "icons": [
+            "ios-information",
+            "md-information"
+        ],
+        "tags": [
+            "help",
+            "information",
+            "knowledge"
+        ]
+    },
+    {
+        "icons": [
+            "ios-jet",
+            "md-jet"
+        ],
+        "tags": [
+            "fly",
+            "jet",
+            "plane"
+        ]
+    },
+    {
+        "icons": [
+            "ios-key",
+            "md-key"
+        ],
+        "tags": [
+            "access",
+            "key"
+        ]
+    },
+    {
+        "icons": [
+            "ios-keypad",
+            "md-keypad"
+        ],
+        "tags": [
+            "keypad",
+            "type"
+        ]
+    },
+    {
+        "icons": [
+            "ios-laptop",
+            "md-laptop"
+        ],
+        "tags": [
+            "apple",
+            "laptop",
+            "macbook",
+            "osx"
+        ]
+    },
+    {
+        "icons": [
+            "ios-leaf",
+            "md-leaf"
+        ],
+        "tags": [
+            "green",
+            "leaf",
+            "nature",
+            "plant",
+            "recycle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-link",
+            "md-link"
+        ],
+        "tags": [
+            "anchor",
+            "attach",
+            "chain",
+            "href",
+            "link"
+        ]
+    },
+    {
+        "icons": [
+            "ios-list-box",
+            "md-list-box"
+        ],
+        "tags": [
+            "box",
+            "list"
+        ]
+    },
+    {
+        "icons": [
+            "ios-list",
+            "md-list"
+        ],
+        "tags": [
+            "list"
+        ]
+    },
+    {
+        "icons": [
+            "ios-locate",
+            "md-locate"
+        ],
+        "tags": [
+            "gps",
+            "locate",
+            "maps",
+            "navigate"
+        ]
+    },
+    {
+        "icons": [
+            "ios-lock",
+            "md-lock"
+        ],
+        "tags": [
+            "lock"
+        ]
+    },
+    {
+        "icons": [
+            "ios-log-in",
+            "md-log-in"
+        ],
+        "tags": [
+            "in",
+            "log",
+            "signin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-log-out",
+            "md-log-out"
+        ],
+        "tags": [
+            "log",
+            "out",
+            "signout"
+        ]
+    },
+    {
+        "icons": [
+            "ios-magnet",
+            "md-magnet"
+        ],
+        "tags": [
+            "attraction",
+            "magnet",
+            "sticky"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mail-open",
+            "md-mail-open"
+        ],
+        "tags": [
+            "mail",
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mail",
+            "md-mail"
+        ],
+        "tags": [
+            "email",
+            "mail"
+        ]
+    },
+    {
+        "icons": [
+            "ios-male",
+            "md-male"
+        ],
+        "tags": [
+            "boy",
+            "dude",
+            "guy",
+            "male",
+            "male"
+        ]
+    },
+    {
+        "icons": [
+            "ios-man",
+            "md-man"
+        ],
+        "tags": [
+            "boy",
+            "dude",
+            "guy",
+            "male",
+            "man"
+        ]
+    },
+    {
+        "icons": [
+            "ios-map",
+            "md-map"
+        ],
+        "tags": [
+            "gps",
+            "map",
+            "navigation",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medal",
+            "md-medal"
+        ],
+        "tags": [
+            "medal"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medical",
+            "md-medical"
+        ],
+        "tags": [
+            "medical"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medkit",
+            "md-medkit"
+        ],
+        "tags": [
+            "case",
+            "disease",
+            "firstaid",
+            "health",
+            "medkit",
+            "sick"
+        ]
+    },
+    {
+        "icons": [
+            "ios-megaphone",
+            "md-megaphone"
+        ],
+        "tags": [
+            "megaphone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-menu",
+            "md-menu"
+        ],
+        "tags": [
+            "menu"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mic-off",
+            "md-mic-off"
+        ],
+        "tags": [
+            "mic",
+            "noise",
+            "off",
+            "sound",
+            "speaker",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mic",
+            "md-mic"
+        ],
+        "tags": [
+            "mic",
+            "noise",
+            "sound",
+            "speaker",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-microphone",
+            "md-microphone"
+        ],
+        "tags": [
+            "microphone",
+            "music",
+            "noise",
+            "recorde",
+            "sound",
+            "speak"
+        ]
+    },
+    {
+        "icons": [
+            "ios-moon",
+            "md-moon"
+        ],
+        "tags": [
+            "dark",
+            "moon",
+            "night",
+            "sky"
+        ]
+    },
+    {
+        "icons": [
+            "ios-more",
+            "md-more"
+        ],
+        "tags": [
+            "more",
+            "options"
+        ]
+    },
+    {
+        "icons": [
+            "ios-move",
+            "md-move"
+        ],
+        "tags": [
+            "move"
+        ]
+    },
+    {
+        "icons": [
+            "ios-musical-note",
+            "md-musical-note"
+        ],
+        "tags": [
+            "listening",
+            "musical",
+            "noise",
+            "note",
+            "play",
+            "sound"
+        ]
+    },
+    {
+        "icons": [
+            "ios-musical-notes",
+            "md-musical-notes"
+        ],
+        "tags": [
+            "listening",
+            "musical",
+            "noise",
+            "notes",
+            "play",
+            "sound"
+        ]
+    },
+    {
+        "icons": [
+            "ios-navigate",
+            "md-navigate"
+        ],
+        "tags": [
+            "gps",
+            "location",
+            "map",
+            "navigate",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications-off",
+            "md-notifications-off"
+        ],
+        "tags": [
+            "notifications",
+            "off"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications-outline",
+            "md-notifications-outline"
+        ],
+        "tags": [
+            "notifications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications",
+            "md-notifications"
+        ],
+        "tags": [
+            "notifications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-nuclear",
+            "md-nuclear"
+        ],
+        "tags": [
+            "danger",
+            "hazard",
+            "nuclear",
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-nutrition",
+            "md-nutrition"
+        ],
+        "tags": [
+            "nutrition"
+        ]
+    },
+    {
+        "icons": [
+            "ios-open",
+            "md-open"
+        ],
+        "tags": [
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-options",
+            "md-options"
+        ],
+        "tags": [
+            "options"
+        ]
+    },
+    {
+        "icons": [
+            "ios-outlet",
+            "md-outlet"
+        ],
+        "tags": [
+            "computer",
+            "digital",
+            "electricity",
+            "outlet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paper-plane",
+            "md-paper-plane"
+        ],
+        "tags": [
+            "paper",
+            "plane"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paper",
+            "md-paper"
+        ],
+        "tags": [
+            "feed",
+            "paper",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-partly-sunny",
+            "md-partly-sunny"
+        ],
+        "tags": [
+            "partly",
+            "sunny"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pause",
+            "md-pause"
+        ],
+        "tags": [
+            "break",
+            "freeze",
+            "hold",
+            "music",
+            "pause"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paw",
+            "md-paw"
+        ],
+        "tags": [
+            "paw"
+        ]
+    },
+    {
+        "icons": [
+            "ios-people",
+            "md-people"
+        ],
+        "tags": [
+            "head",
+            "human",
+            "people",
+            "person",
+            "stalker",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-person-add",
+            "md-person-add"
+        ],
+        "tags": [
+            "add",
+            "head",
+            "human",
+            "member",
+            "new",
+            "person",
+            "staff",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-person",
+            "md-person"
+        ],
+        "tags": [
+            "head",
+            "human",
+            "person",
+            "staff",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-phone-landscape",
+            "md-phone-landscape"
+        ],
+        "tags": [
+            "landscape",
+            "phone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-phone-portrait",
+            "md-phone-portrait"
+        ],
+        "tags": [
+            "phone",
+            "portrait"
+        ]
+    },
+    {
+        "icons": [
+            "ios-photos",
+            "md-photos"
+        ],
+        "tags": [
+            "images",
+            "photos",
+            "square",
+            "stills"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pie",
+            "md-pie"
+        ],
+        "tags": [
+            "cog",
+            "options",
+            "pie",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pin",
+            "md-pin"
+        ],
+        "tags": [
+            "gps",
+            "navigation",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pint",
+            "md-pint"
+        ],
+        "tags": [
+            "pint"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pizza",
+            "md-pizza"
+        ],
+        "tags": [
+            "drink",
+            "eat",
+            "food",
+            "pizza"
+        ]
+    },
+    {
+        "icons": [
+            "ios-planet",
+            "md-planet"
+        ],
+        "tags": [
+            "globe",
+            "home",
+            "nature",
+            "planet",
+            "planet",
+            "space"
+        ]
+    },
+    {
+        "icons": [
+            "ios-play",
+            "md-play"
+        ],
+        "tags": [
+            "arrow",
+            "music",
+            "play",
+            "right",
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-podium",
+            "md-podium"
+        ],
+        "tags": [
+            "award",
+            "compete",
+            "competition",
+            "lose",
+            "podium",
+            "win"
+        ]
+    },
+    {
+        "icons": [
+            "ios-power",
+            "md-power"
+        ],
+        "tags": [
+            "off",
+            "on",
+            "power"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pricetag",
+            "md-pricetag"
+        ],
+        "tags": [
+            "$",
+            "commerce",
+            "items",
+            "money",
+            "pricetag",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pricetags",
+            "md-pricetags"
+        ],
+        "tags": [
+            "$",
+            "commerce",
+            "items",
+            "money",
+            "pricetags",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-print",
+            "md-print"
+        ],
+        "tags": [
+            "print"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pulse",
+            "md-pulse"
+        ],
+        "tags": [
+            "hot",
+            "live",
+            "pulse",
+            "rate"
+        ]
+    },
+    {
+        "icons": [
+            "ios-qr-scanner",
+            "md-qr-scanner"
+        ],
+        "tags": [
+            "qr",
+            "reader",
+            "scanner"
+        ]
+    },
+    {
+        "icons": [
+            "ios-quote",
+            "md-quote"
+        ],
+        "tags": [
+            "chat",
+            "quotation",
+            "quote"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio-button-off",
+            "md-radio-button-off"
+        ],
+        "tags": [
+            "button",
+            "off",
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio-button-on",
+            "md-radio-button-on"
+        ],
+        "tags": [
+            "button",
+            "on",
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio",
+            "md-radio"
+        ],
+        "tags": [
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rainy",
+            "md-rainy"
+        ],
+        "tags": [
+            "cloud",
+            "rainy",
+            "water",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-recording",
+            "md-recording"
+        ],
+        "tags": [
+            "film",
+            "recording",
+            "tape",
+            "voicemail"
+        ]
+    },
+    {
+        "icons": [
+            "ios-redo",
+            "md-redo"
+        ],
+        "tags": [
+            "forward",
+            "redo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-refresh-circle",
+            "md-refresh-circle"
+        ],
+        "tags": [
+            "circle",
+            "refresh"
+        ]
+    },
+    {
+        "icons": [
+            "ios-refresh",
+            "md-refresh"
+        ],
+        "tags": [
+            "refresh",
+            "reload",
+            "renew",
+            "reset"
+        ]
+    },
+    {
+        "icons": [
+            "ios-remove-circle",
+            "md-remove-circle"
+        ],
+        "tags": [
+            "circle",
+            "remove"
+        ]
+    },
+    {
+        "icons": [
+            "ios-remove",
+            "md-remove"
+        ],
+        "tags": [
+            "minus",
+            "remove",
+            "subtract"
+        ]
+    },
+    {
+        "icons": [
+            "ios-reorder",
+            "md-reorder"
+        ],
+        "tags": [
+            "reorder"
+        ]
+    },
+    {
+        "icons": [
+            "ios-repeat",
+            "md-repeat"
+        ],
+        "tags": [
+            "repeat"
+        ]
+    },
+    {
+        "icons": [
+            "ios-resize",
+            "md-resize"
+        ],
+        "tags": [
+            "resize"
+        ]
+    },
+    {
+        "icons": [
+            "ios-restaurant",
+            "md-restaurant"
+        ],
+        "tags": [
+            "restaurant"
+        ]
+    },
+    {
+        "icons": [
+            "ios-return-left",
+            "md-return-left"
+        ],
+        "tags": [
+            "left",
+            "return"
+        ]
+    },
+    {
+        "icons": [
+            "ios-return-right",
+            "md-return-right"
+        ],
+        "tags": [
+            "return",
+            "right"
+        ]
+    },
+    {
+        "icons": [
+            "ios-reverse-camera",
+            "md-reverse-camera"
+        ],
+        "tags": [
+            "camera",
+            "picture",
+            "reverse"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rewind",
+            "md-rewind"
+        ],
+        "tags": [
+            "back",
+            "music",
+            "previous",
+            "rewind"
+        ]
+    },
+    {
+        "icons": [
+            "ios-ribbon",
+            "md-ribbon"
+        ],
+        "tags": [
+            "ribbon"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rose",
+            "md-rose"
+        ],
+        "tags": [
+            "rose"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sad",
+            "md-sad"
+        ],
+        "tags": [
+            "bad",
+            "cry",
+            "no",
+            "sad"
+        ]
+    },
+    {
+        "icons": [
+            "ios-school",
+            "md-school"
+        ],
+        "tags": [
+            "school"
+        ]
+    },
+    {
+        "icons": [
+            "ios-search",
+            "md-search"
+        ],
+        "tags": [
+            "magnifyingglass",
+            "search"
+        ]
+    },
+    {
+        "icons": [
+            "ios-send",
+            "md-send"
+        ],
+        "tags": [
+            "email",
+            "paper",
+            "send"
+        ]
+    },
+    {
+        "icons": [
+            "ios-settings",
+            "md-settings"
+        ],
+        "tags": [
+            "options",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-share-alt",
+            "md-share-alt"
+        ],
+        "tags": [
+            "alt",
+            "share"
+        ]
+    },
+    {
+        "icons": [
+            "ios-share",
+            "md-share"
+        ],
+        "tags": [
+            "share"
+        ]
+    },
+    {
+        "icons": [
+            "ios-shirt",
+            "md-shirt"
+        ],
+        "tags": [
+            "shirt"
+        ]
+    },
+    {
+        "icons": [
+            "ios-shuffle",
+            "md-shuffle"
+        ],
+        "tags": [
+            "random",
+            "shuffle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-skip-backward",
+            "md-skip-backward"
+        ],
+        "tags": [
+            "backward",
+            "music",
+            "previous",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-skip-forward",
+            "md-skip-forward"
+        ],
+        "tags": [
+            "forward",
+            "music",
+            "next",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-snow",
+            "md-snow"
+        ],
+        "tags": [
+            "snow"
+        ]
+    },
+    {
+        "icons": [
+            "ios-speedometer",
+            "md-speedometer"
+        ],
+        "tags": [
+            "drive",
+            "level",
+            "speed",
+            "speedometer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-square-outline",
+            "md-square-outline"
+        ],
+        "tags": [
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-square",
+            "md-square"
+        ],
+        "tags": [
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star-half",
+            "md-star-half"
+        ],
+        "tags": [
+            "favorite",
+            "half",
+            "rate",
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star-outline",
+            "md-star-outline"
+        ],
+        "tags": [
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star",
+            "md-star"
+        ],
+        "tags": [
+            "favorite",
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-stats",
+            "md-stats"
+        ],
+        "tags": [
+            "stats"
+        ]
+    },
+    {
+        "icons": [
+            "ios-stopwatch",
+            "md-stopwatch"
+        ],
+        "tags": [
+            "stopwatch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-subway",
+            "md-subway"
+        ],
+        "tags": [
+            "subway"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sunny",
+            "md-sunny"
+        ],
+        "tags": [
+            "light",
+            "sky",
+            "sunny",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-swap",
+            "md-swap"
+        ],
+        "tags": [
+            "swap"
+        ]
+    },
+    {
+        "icons": [
+            "ios-switch",
+            "md-switch"
+        ],
+        "tags": [
+            "switch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sync",
+            "md-sync"
+        ],
+        "tags": [
+            "sync"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tablet-landscape",
+            "md-tablet-landscape"
+        ],
+        "tags": [
+            "landscape",
+            "tablet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tablet-portrait",
+            "md-tablet-portrait"
+        ],
+        "tags": [
+            "portrait",
+            "tablet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tennisball",
+            "md-tennisball"
+        ],
+        "tags": [
+            "tennisball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-text",
+            "md-text"
+        ],
+        "tags": [
+            "text"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thermometer",
+            "md-thermometer"
+        ],
+        "tags": [
+            "cold",
+            "heat",
+            "hot",
+            "mercury",
+            "temperature",
+            "thermometer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thumbs-down",
+            "md-thumbs-down"
+        ],
+        "tags": [
+            "down",
+            "thumbs"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thumbs-up",
+            "md-thumbs-up"
+        ],
+        "tags": [
+            "thumbs",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thunderstorm",
+            "md-thunderstorm"
+        ],
+        "tags": [
+            "cloudy",
+            "lightning",
+            "overcast",
+            "rain",
+            "sky",
+            "storm",
+            "thunderstorm",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-time",
+            "md-time"
+        ],
+        "tags": [
+            "clock",
+            "hour",
+            "minute",
+            "second",
+            "time",
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-timer",
+            "md-timer"
+        ],
+        "tags": [
+            "clock",
+            "timer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-train",
+            "md-train"
+        ],
+        "tags": [
+            "train"
+        ]
+    },
+    {
+        "icons": [
+            "ios-transgender",
+            "md-transgender"
+        ],
+        "tags": [
+            "transgender"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trash",
+            "md-trash"
+        ],
+        "tags": [
+            "close",
+            "delete",
+            "remove",
+            "trash"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trending-down",
+            "md-trending-down"
+        ],
+        "tags": [
+            "down",
+            "trending"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trending-up",
+            "md-trending-up"
+        ],
+        "tags": [
+            "trending",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trophy",
+            "md-trophy"
+        ],
+        "tags": [
+            "award",
+            "compete",
+            "competition",
+            "lose",
+            "trophy",
+            "win"
+        ]
+    },
+    {
+        "icons": [
+            "ios-umbrella",
+            "md-umbrella"
+        ],
+        "tags": [
+            "dry",
+            "rain",
+            "shelter",
+            "umbrella",
+            "wet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-undo",
+            "md-undo"
+        ],
+        "tags": [
+            "reply",
+            "undo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-unlock",
+            "md-unlock"
+        ],
+        "tags": [
+            "unlock"
+        ]
+    },
+    {
+        "icons": [
+            "ios-videocam",
+            "md-videocam"
+        ],
+        "tags": [
+            "camera",
+            "film",
+            "movie",
+            "videocam"
+        ]
+    },
+    {
+        "icons": [
+            "ios-volume-mute",
+            "md-volume-mute"
+        ],
+        "tags": [
+            "mute",
+            "sound",
+            "volume"
+        ]
+    },
+    {
+        "icons": [
+            "ios-volume-off",
+            "md-volume-off"
+        ],
+        "tags": [
+            "off",
+            "volume"
+        ]
+    },
+    {
+        "icons": [
+            "ios-walk",
+            "md-walk"
+        ],
+        "tags": [
+            "walk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-warning",
+            "md-warning"
+        ],
+        "tags": [
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-watch",
+            "md-watch"
+        ],
+        "tags": [
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-water",
+            "md-water"
+        ],
+        "tags": [
+            "water"
+        ]
+    },
+    {
+        "icons": [
+            "ios-wifi",
+            "md-wifi"
+        ],
+        "tags": [
+            "bars",
+            "connection",
+            "internet",
+            "wifi"
+        ]
+    },
+    {
+        "icons": [
+            "ios-wine",
+            "md-wine"
+        ],
+        "tags": [
+            "wine"
+        ]
+    },
+    {
+        "icons": [
+            "ios-woman",
+            "md-woman"
+        ],
+        "tags": [
+            "dudette",
+            "female",
+            "girl",
+            "lady",
+            "woman"
+        ]
+    },
+    {
+        "icons": [
+            "logo-android"
+        ],
+        "tags": [
+            "android"
+        ]
+    },
+    {
+        "icons": [
+            "logo-angular"
+        ],
+        "tags": [
+            "angular"
+        ]
+    },
+    {
+        "icons": [
+            "logo-apple"
+        ],
+        "tags": [
+            "apple"
+        ]
+    },
+    {
+        "icons": [
+            "logo-bitcoin"
+        ],
+        "tags": [
+            "bitcoin"
+        ]
+    },
+    {
+        "icons": [
+            "logo-buffer"
+        ],
+        "tags": [
+            "buffer"
+        ]
+    },
+    {
+        "icons": [
+            "logo-chrome"
+        ],
+        "tags": [
+            "chrome"
+        ]
+    },
+    {
+        "icons": [
+            "logo-codepen"
+        ],
+        "tags": [
+            "codepen"
+        ]
+    },
+    {
+        "icons": [
+            "logo-css3"
+        ],
+        "tags": [
+            "css3"
+        ]
+    },
+    {
+        "icons": [
+            "logo-designernews"
+        ],
+        "tags": [
+            "designernews"
+        ]
+    },
+    {
+        "icons": [
+            "logo-dribbble"
+        ],
+        "tags": [
+            "dribbble"
+        ]
+    },
+    {
+        "icons": [
+            "logo-dropbox"
+        ],
+        "tags": [
+            "dropbox"
+        ]
+    },
+    {
+        "icons": [
+            "logo-euro"
+        ],
+        "tags": [
+            "euro"
+        ]
+    },
+    {
+        "icons": [
+            "logo-facebook"
+        ],
+        "tags": [
+            "facebook"
+        ]
+    },
+    {
+        "icons": [
+            "logo-foursquare"
+        ],
+        "tags": [
+            "foursquare"
+        ]
+    },
+    {
+        "icons": [
+            "logo-freebsd-devil"
+        ],
+        "tags": [
+            "freebsd-devil"
+        ]
+    },
+    {
+        "icons": [
+            "logo-github"
+        ],
+        "tags": [
+            "github"
+        ]
+    },
+    {
+        "icons": [
+            "logo-google"
+        ],
+        "tags": [
+            "google"
+        ]
+    },
+    {
+        "icons": [
+            "logo-googleplus"
+        ],
+        "tags": [
+            "googleplus"
+        ]
+    },
+    {
+        "icons": [
+            "logo-hackernews"
+        ],
+        "tags": [
+            "hackernews"
+        ]
+    },
+    {
+        "icons": [
+            "logo-html5"
+        ],
+        "tags": [
+            "html5"
+        ]
+    },
+    {
+        "icons": [
+            "logo-instagram"
+        ],
+        "tags": [
+            "instagram"
+        ]
+    },
+    {
+        "icons": [
+            "logo-javascript"
+        ],
+        "tags": [
+            "javascript"
+        ]
+    },
+    {
+        "icons": [
+            "logo-linkedin"
+        ],
+        "tags": [
+            "linkedin"
+        ]
+    },
+    {
+        "icons": [
+            "logo-markdown"
+        ],
+        "tags": [
+            "markdown"
+        ]
+    },
+    {
+        "icons": [
+            "logo-nodejs"
+        ],
+        "tags": [
+            "nodejs"
+        ]
+    },
+    {
+        "icons": [
+            "logo-octocat"
+        ],
+        "tags": [
+            "octocat"
+        ]
+    },
+    {
+        "icons": [
+            "logo-pinterest"
+        ],
+        "tags": [
+            "pinterest"
+        ]
+    },
+    {
+        "icons": [
+            "logo-playstation"
+        ],
+        "tags": [
+            "playstation"
+        ]
+    },
+    {
+        "icons": [
+            "logo-python"
+        ],
+        "tags": [
+            "python"
+        ]
+    },
+    {
+        "icons": [
+            "logo-reddit"
+        ],
+        "tags": [
+            "reddit"
+        ]
+    },
+    {
+        "icons": [
+            "logo-rss"
+        ],
+        "tags": [
+            "rss"
+        ]
+    },
+    {
+        "icons": [
+            "logo-sass"
+        ],
+        "tags": [
+            "sass"
+        ]
+    },
+    {
+        "icons": [
+            "logo-skype"
+        ],
+        "tags": [
+            "skype"
+        ]
+    },
+    {
+        "icons": [
+            "logo-snapchat"
+        ],
+        "tags": [
+            "snapchat"
+        ]
+    },
+    {
+        "icons": [
+            "logo-steam"
+        ],
+        "tags": [
+            "steam"
+        ]
+    },
+    {
+        "icons": [
+            "logo-tumblr"
+        ],
+        "tags": [
+            "tumblr"
+        ]
+    },
+    {
+        "icons": [
+            "logo-tux"
+        ],
+        "tags": [
+            "tux"
+        ]
+    },
+    {
+        "icons": [
+            "logo-twitch"
+        ],
+        "tags": [
+            "twitch"
+        ]
+    },
+    {
+        "icons": [
+            "logo-twitter"
+        ],
+        "tags": [
+            "twitter"
+        ]
+    },
+    {
+        "icons": [
+            "logo-usd"
+        ],
+        "tags": [
+            "usd"
+        ]
+    },
+    {
+        "icons": [
+            "logo-vimeo"
+        ],
+        "tags": [
+            "vimeo"
+        ]
+    },
+    {
+        "icons": [
+            "logo-whatsapp"
+        ],
+        "tags": [
+            "whatsapp"
+        ]
+    },
+    {
+        "icons": [
+            "logo-windows"
+        ],
+        "tags": [
+            "windows"
+        ]
+    },
+    {
+        "icons": [
+            "logo-wordpress"
+        ],
+        "tags": [
+            "wordpress"
+        ]
+    },
+    {
+        "icons": [
+            "logo-xbox"
+        ],
+        "tags": [
+            "xbox"
+        ]
+    },
+    {
+        "icons": [
+            "logo-yahoo"
+        ],
+        "tags": [
+            "yahoo"
+        ]
+    },
+    {
+        "icons": [
+            "logo-yen"
+        ],
+        "tags": [
+            "yen"
+        ]
+    },
+    {
+        "icons": [
+            "logo-youtube"
+        ],
+        "tags": [
+            "youtube"
+        ]
+    }
+]
diff --git a/manager/src/libs/lazyLoading.js b/manager/src/libs/lazyLoading.js
new file mode 100644
index 00000000..2f9fd414
--- /dev/null
+++ b/manager/src/libs/lazyLoading.js
@@ -0,0 +1,2 @@
+export default (url) =>()=>import(`@/views/${url}.vue`)
+
diff --git a/manager/src/libs/storage.js b/manager/src/libs/storage.js
new file mode 100644
index 00000000..4602cab8
--- /dev/null
+++ b/manager/src/libs/storage.js
@@ -0,0 +1,30 @@
+/**
+ * 存储localStorage
+ */
+export const setStore = (name, content) => {
+    if (!name) return;
+    if (typeof content !== 'string') {
+        content = JSON.stringify(content);
+    }
+    window.localStorage.setItem(name, content);
+}
+
+/**
+ * 获取localStorage
+ */
+export const getStore = name => {
+    if (!name) return;
+    let v = window.localStorage.getItem(name);
+    if (v == null) {
+        return "";
+    }
+    return v;
+}
+
+/**
+ * 删除localStorage
+ */
+export const removeStore = name => {
+    if (!name) return;
+    window.localStorage.removeItem(name);
+}
diff --git a/manager/src/libs/table2excel.js b/manager/src/libs/table2excel.js
new file mode 100644
index 00000000..1569a9fd
--- /dev/null
+++ b/manager/src/libs/table2excel.js
@@ -0,0 +1,100 @@
+var idTmr;
+function getExplorer () {
+    var explorer = window.navigator.userAgent;
+    if (explorer.indexOf('MSIE') >= 0) {
+        // ie
+        return 'ie';
+    } else if (explorer.indexOf('Firefox') >= 0) {
+        // firefox
+        return 'Firefox';
+    } else if (explorer.indexOf('Chrome') >= 0) {
+        // Chrome
+        return 'Chrome';
+    } else if (explorer.indexOf('Opera') >= 0) {
+        // Opera
+        return 'Opera';
+    } else if (explorer.indexOf('Safari') >= 0) {
+        // Safari
+        return 'Safari';
+    };
+};
+function tranform (table, aId, name) {
+    let tableHead = table.$children[0].$el;
+    let tableBody = table.$children[1].$el;
+    let tableInnerHTML = '<thead><tr>';
+    if (table.$children.length !== 1) {
+        let len = tableBody.rows.length;
+        let i = -1;
+        while (i < len) {
+            if (i == -1) {
+                Array.from(tableHead.rows[0].children).forEach((td) => {
+                    tableInnerHTML = tableInnerHTML + '<th>' + td.children[0].children[0].innerHTML + '</th>';
+                });
+                tableInnerHTML += '</tr><thead><tbody>';
+            } else {
+                tableInnerHTML += '<tr>';
+                Array.from(tableBody.rows[i].children).forEach((td) => {
+                    tableInnerHTML = tableInnerHTML + '<td>' + td.children[0].children[0].innerHTML + '</td>';
+                });
+                tableInnerHTML += '</tr>';
+            }
+            i++;
+        }
+        tableInnerHTML += '</tbody>';
+    }
+
+    if (getExplorer() !== 'Safari' && name.substr(-1, 4) !== '.xls') {
+        name += '.xls';
+    }
+
+    if (getExplorer() == 'ie') {
+        var curTbl = table;
+        var oXL = new ActiveXObject('Excel.Application');
+        var oWB = oXL.Workbooks.Add();
+        var xlsheet = oWB.Worksheets(1);
+        var sel = document.body.createTextRange();
+        sel.moveToElementText(curTbl);
+        sel.select();
+        sel.execCommand('Copy');
+        xlsheet.Paste();
+        oXL.Visible = true;
+
+        try {
+            var fname = oXL.Application.GetSaveAsFilename('Excel.xls', 'Excel Spreadsheets (*.xls), *.xls');
+        } catch (e) {
+            print('Nested catch caught ' + e);
+        } finally {
+            oWB.SaveAs(fname);
+            // oWB.Close(savechanges = false);
+            oXL.Quit();
+            oXL = null;
+            idTmr = setInterval(Cleanup(), 1);
+        }
+    } else {
+        tableToExcel(tableInnerHTML, aId, name);
+    }
+}
+function Cleanup () {
+    window.clearInterval(idTmr);
+    // CollectGarbage();
+}
+let tableToExcel = (function () {
+    let uri = 'data:application/vnd.ms-excel;base64,';
+    let template = '<html><head><meta charset="UTF-8"></head><body><table>{table}</table></body></html>';
+    let base64 = function (s) { return window.btoa(unescape(encodeURIComponent(s))); };
+    let format = function (s, c) {
+        return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
+    };
+    return function (table, aId, name) {
+        let ctx = {worksheet: name || 'Worksheet', table: table};
+        document.getElementById(aId).href = uri + base64(format(template, ctx));
+        document.getElementById(aId).download = name;
+        document.getElementById(aId).click();
+    };
+})();
+
+const table2excel = {};
+
+table2excel.transform = tranform;
+
+export default table2excel;
diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
new file mode 100644
index 00000000..86ef7d61
--- /dev/null
+++ b/manager/src/libs/util.js
@@ -0,0 +1,469 @@
+import axios from 'axios';
+import { getCurrentPermissionList } from '@/api/index';
+import lazyLoading from './lazyLoading.js';
+import router from '@/router/index';
+import Cookies from "js-cookie";
+
+let util = {
+
+};
+
+util.title = function (title) {
+    title = title || 'lili ';
+    window.document.title = title;
+};
+
+util.millsToTime = function (mills) {
+    if (!mills) {
+        return "";
+    }
+    let s = mills / 1000;
+    if (s < 60) {
+        return s.toFixed(0) + " 秒"
+    }
+    let m = s / 60;
+    if (m < 60) {
+        return m.toFixed(0) + " 分钟"
+    }
+    let h = m / 60;
+    if (h < 24) {
+        return h.toFixed(0) + " 小时"
+    }
+    let d = h / 24;
+    if (d < 30) {
+        return d.toFixed(0) + " 天"
+    }
+    let month = d / 30
+    if (month < 12) {
+        return month.toFixed(0) + " 个月"
+    }
+    let year = month / 12
+    return year.toFixed(0) + " 年"
+
+};
+
+util.inOf = function (arr, targetArr) {
+    let res = true;
+    arr.forEach(item => {
+        if (targetArr.indexOf(item) < 0) {
+            res = false;
+        }
+    });
+    return res;
+};
+
+util.oneOf = function (ele, targetArr) {
+    if (targetArr.indexOf(ele) >= 0) {
+        return true;
+    } else {
+        return false;
+    }
+};
+
+util.getRouterObjByName = function (routers, name) {
+    if (!name || !routers || !routers.length) {
+        return null;
+    }
+    let routerObj = null;
+    for (let item of routers) {
+        if (item.name == name) {
+            return item;
+        }
+        routerObj = util.getRouterObjByName(item.children, name);
+        if (routerObj) {
+            return routerObj;
+        }
+    }
+    return null;
+};
+
+util.handleTitle = function (vm, item) {
+    if (typeof item.title == 'object') {
+        return vm.$t(item.title.i18n);
+    } else {
+        return item.title;
+    }
+};
+
+util.setCurrentPath = function (vm, name) {
+    let title = '';
+    let isOtherRouter = false;
+    vm.$store.state.app.routers.forEach(item => {
+        if (item.children.length == 1) {
+            if (item.children[0].name == name) {
+                title = util.handleTitle(vm, item);
+                if (item.name == 'otherRouter') {
+                    isOtherRouter = true;
+                }
+            }
+        } else {
+            item.children.forEach(child => {
+                if (child.name == name) {
+                    title = util.handleTitle(vm, child);
+                    if (item.name == 'otherRouter') {
+                        isOtherRouter = true;
+                    }
+                }
+            });
+        }
+    });
+    let currentPathArr = [];
+    if (name == 'home_index') {
+        currentPathArr = [
+            {
+                title: util.handleTitle(vm, util.getRouterObjByName(vm.$store.state.app.routers, 'home_index')),
+                path: '',
+                name: 'home_index'
+            }
+        ];
+    } else if ((name.indexOf('_index') >= 0 || isOtherRouter) && name !== 'home_index') {
+        currentPathArr = [
+            {
+                title: util.handleTitle(vm, util.getRouterObjByName(vm.$store.state.app.routers, 'home_index')),
+                path: '/home',
+                name: 'home_index'
+            },
+            {
+                title: title,
+                path: '',
+                name: name
+            }
+        ];
+    } else {
+        let currentPathObj = vm.$store.state.app.routers.filter(item => {
+            if (item.children.length <= 1) {
+                return item.children[0].name == name;
+            } else {
+                let i = 0;
+                let childArr = item.children;
+                let len = childArr.length;
+                while (i < len) {
+                    if (childArr[i].name == name) {
+                        return true;
+                    }
+                    i++;
+                }
+                return false;
+            }
+        })[0];
+        if (currentPathObj.children.length <= 1 && currentPathObj.name == 'home') {
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '',
+                    name: 'home_index'
+                }
+            ];
+        } else if (currentPathObj.children.length <= 1 && currentPathObj.name !== 'home') {
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '/home',
+                    name: 'home_index'
+                },
+                {
+                    title: currentPathObj.title,
+                    path: '',
+                    name: name
+                }
+            ];
+        } else {
+            let childObj = currentPathObj.children.filter((child) => {
+                return child.name == name;
+            })[0];
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '/home',
+                    name: 'home_index'
+                },
+                {
+                    title: currentPathObj.title,
+                    path: '',
+                    name: currentPathObj.name
+                },
+                {
+                    title: childObj.title,
+                    path: currentPathObj.path + '/' + childObj.path,
+                    name: name
+                }
+            ];
+        }
+    }
+    vm.$store.commit('setCurrentPath', currentPathArr);
+
+    return currentPathArr;
+};
+
+util.openNewPage = function (vm, name, argu, query) {
+  if (!vm.$store) {
+      return;
+  }
+  let pageOpenedList = vm.$store.state.app.pageOpenedList;
+  let openedPageLen = pageOpenedList.length;
+  let i = 0;
+  let tagHasOpened = false;
+  while (i < openedPageLen) {
+      if (name == pageOpenedList[i].name) { // 页面已经打开
+          vm.$store.commit('pageOpenedList', {
+              index: i,
+              argu: argu,
+              query: query
+          });
+          tagHasOpened = true;
+          break;
+      }
+      i++;
+  }
+  if (!tagHasOpened) {
+      let tag = vm.$store.state.app.tagsList.filter((item) => {
+          if (item.children) {
+              return name == item.children[0].name;
+          } else {
+              return name == item.name;
+          }
+      });
+      tag = tag[0];
+      if (tag) {
+          tag = tag.children ? tag.children[0] : tag;
+          if (argu) {
+              tag.argu = argu;
+          }
+          if (query) {
+              tag.query = query;
+          }
+          vm.$store.commit('increateTag', tag);
+      }
+  }
+  vm.$store.commit('setCurrentPageName', name);
+};
+
+util.toDefaultPage = function (routers, name, route, next) {
+    let len = routers.length;
+    let i = 0;
+    let notHandle = true;
+    while (i < len) {
+        if (routers[i].name == name && routers[i].children && routers[i].redirect == undefined) {
+            route.replace({
+                name: routers[i].children[0].name
+            });
+            notHandle = false;
+            next();
+            break;
+        }
+        i++;
+    }
+    if (notHandle) {
+        next();
+    }
+};
+
+// 将Csv文件解析为二维数组
+export const getArrayFromFile = (file) => {
+    let nameSplit = file.name.split('.')
+    let format = nameSplit[nameSplit.length - 1]
+    return new Promise((resolve, reject) => {
+        let reader = new FileReader()
+        reader.readAsText(file) // 以文本格式读取
+        let arr = []
+        reader.onload = function (evt) {
+            let data = evt.target.result // 读到的数据
+            let pasteData = data.trim()
+            arr = pasteData.split((/[\n\u0085\u2028\u2029]|\r\n?/g)).map(row => {
+                return row.split('\t')
+            }).map(item => {
+                return item[0].split(',')
+            })
+            if (format == 'csv') resolve(arr)
+            else reject(new Error('[Format Error]:不是Csv文件'))
+        }
+    })
+}
+
+// 将二维数组转为表格数据
+export const getTableDataFromArray = (array) => {
+    let columns = []
+    let tableData = []
+    if (array.length > 1) {
+        let titles = array.shift()
+        columns = titles.map(item => {
+            return {
+                title: item,
+                key: item
+            }
+        })
+        tableData = array.map(item => {
+            let res = {}
+            item.forEach((col, i) => {
+                res[titles[i]] = col
+            })
+            return res
+        })
+    }
+    return {
+        columns,
+        tableData
+    }
+}
+
+util.initRouter = function (vm) { // 初始化路由
+    const constRoutes = [];
+    const otherRoutes = [];
+
+    // 404路由需要和动态路由一起加载
+    const otherRouter = [{
+        path: '/*',
+        name: 'error-404',
+        meta: {
+            title: '404-页面不存在'
+        },
+        frontRoute: 'error-page/404'
+    }];
+    // 判断用户是否登录
+    let userInfo = Cookies.get('userInfo')
+    if (!userInfo) {
+        // 未登录
+        return;
+    }
+    if (!vm.$store.state.app.added) {
+        // 第一次加载 读取数据
+        // 加载菜单
+      getCurrentPermissionList().then(res => {
+            if (!res.success) return false;
+            let menuData = res.result;
+            // let menuData = result
+
+            // 格式化数据，设置 空children 为 null
+            for(let i =0;i<menuData.length;i++){
+                let t = menuData[i].children
+                for(let k = 0;k<t.length;k++){
+                    let tt = t[k].children;
+                    for(let z = 0;z<tt.length;z++){
+                        tt[z].children = null
+                    }
+                }
+            }
+
+            if (!menuData) {
+                return;
+            }
+            util.initAllMenuData(constRoutes, menuData);
+            util.initRouterNode(otherRoutes, otherRouter);
+            // 添加所有主界面路由
+            vm.$store.commit('updateAppRouter', constRoutes.filter(item => item.children.length > 0));
+            // 添加全局路由
+            vm.$store.commit('updateDefaultRouter', otherRoutes);
+            // 添加菜单路由
+            util.initMenuData(vm, menuData);
+            // 缓存数据 修改加载标识
+            window.localStorage.setItem('menuData', JSON.stringify(menuData));
+            vm.$store.commit('setAdded', true);
+        });
+    } else {
+        // 读取缓存数据
+        let data = window.localStorage.getItem('menuData');
+        if (!data) {
+            vm.$store.commit('setAdded', false);
+            return;
+        }
+        let menuData = JSON.parse(data);
+        // 添加菜单路由
+        util.initMenuData(vm, menuData);
+    }
+};
+
+// 添加所有顶部导航栏下的菜单路由
+util.initAllMenuData = function (constRoutes, data) {
+
+    let allMenuData = [];
+    data.forEach(e => {
+        if (e.level == 0) {
+            e.children.forEach(item => {
+                allMenuData.push(item);
+            })
+        }
+    })
+    util.initRouterNode(constRoutes, allMenuData);
+}
+
+// 生成菜单格式数据
+util.initMenuData = function (vm, data) {
+    const menuRoutes = [];
+    let menuData = data;
+    // 顶部菜单
+    let navList = [];
+    menuData.forEach(e => {
+        let nav = {
+            name: e.name,
+            title: e.title,
+            icon: e.icon
+        }
+        navList.push(nav);
+    })
+    if (navList.length < 1) {
+        return;
+    }
+    // 存入vuex
+    vm.$store.commit('setNavList', navList);
+    let currNav = window.localStorage.getItem('currNav')
+    if (currNav) {
+        // 读取缓存title
+        for (var item of navList) {
+            if (item.name == currNav) {
+                vm.$store.commit('setCurrNavTitle', item.title);
+                break;
+            }
+        }
+    } else {
+        // 默认第一个
+        currNav = navList[0].name;
+        vm.$store.commit('setCurrNavTitle', navList[0].title);
+    }
+    vm.$store.commit('setCurrNav', currNav);
+    for (let item of menuData) {
+        if (item.name == currNav) {
+            // 过滤
+            menuData = item.children;
+            break;
+        }
+    }
+    util.initRouterNode(menuRoutes, menuData);
+    // 刷新界面菜单
+    vm.$store.commit('updateMenulist', menuRoutes.filter(item => item.children.length > 0));
+
+    let tagsList = [];
+    vm.$store.state.app.routers.map((item) => {
+        if (item.children.length <= 1) {
+            tagsList.push(item.children[0]);
+        } else {
+            tagsList.push(...item.children);
+        }
+    });
+    vm.$store.commit('setTagsList', tagsList);
+};
+
+// 生成路由节点
+util.initRouterNode = function (routers, data) {  // data为所有子菜单数据
+
+    for (let item of data) {
+        let menu = Object.assign({}, item);
+
+        menu.component = lazyLoading(menu.frontRoute);
+
+        if (item.children && item.children.length > 0) {
+            menu.children = [];
+            util.initRouterNode(menu.children, item.children);
+        }
+
+        let meta = {};
+        // 给页面添加权限、标题、第三方网页链接
+        meta.permTypes = menu.permTypes ? menu.permTypes : null;
+        meta.title = menu.title ? menu.title + " - lilishop 运营后台" : null;
+        meta.url = menu.url ? menu.url : null;
+        menu.meta = meta;
+
+        routers.push(menu);
+    }
+};
+
+export default util;
diff --git a/manager/src/libs/validate.js b/manager/src/libs/validate.js
new file mode 100644
index 00000000..7b6000aa
--- /dev/null
+++ b/manager/src/libs/validate.js
@@ -0,0 +1,80 @@
+/**
+ * 密码格式验证
+ * @param rule 验证规则（不少于6位）
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validatePassword = (rule, value, callback) => {
+  if (value.length < 6) {
+    callback(new Error('密码长度不得小于6位'));
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 手机号码格式验证
+ * @param rule 验证规则
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validateMobile = (rule, value, callback) => {
+  var reg = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+  if (!reg.test(value)) {
+    callback(new Error('手机号格式错误'));
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 身份证号码格式验证
+ * @param rule 验证规则（是否满足18位）
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validateIDCard = (rule, value, callback) => {
+  const reg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+  if (!reg.test(value)) {
+    callback(new Error('身份证号码格式错误'));
+  } else {
+    callback();
+  }
+};
+
+
+// 验证是否整数
+export function isInteger(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('输入不可以为空'));
+    }
+    setTimeout(() => {
+        if (!Number(value)) {
+            callback(new Error('请输入正整数'));
+        } else {
+            const re = /^[0-9]*[1-9][0-9]*$/;
+            const rsCheck = re.test(value);
+            if (!rsCheck) {
+                callback(new Error('请输入正整数'));
+            } else {
+                callback();
+            }
+        }
+    }, 1000);
+}
+export function isMoney(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('输入不可以为空'));
+    }
+    let re =/(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/;
+    const rsCheck = re.test(value);
+    if (!rsCheck) {
+        callback(new Error('请输入正整数'));
+    } else {
+        callback();
+    }
+}
+
+export function validatetoFixedNew(str) {
+    return str ;
+}
diff --git a/manager/src/libs/zh.json b/manager/src/libs/zh.json
new file mode 100644
index 00000000..70dcf56b
--- /dev/null
+++ b/manager/src/libs/zh.json
@@ -0,0 +1,20 @@
+{
+    "name": "zh",
+    "options": {
+        "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+        "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+        "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+        "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+        "toolbar": {
+            "exportToSVG": "下载图表 SVG",
+            "exportToPNG": "下载图表 PNG",
+            "menu": "菜单",
+            "selection": "选择",
+            "selectionZoom": "区域缩放",
+            "zoomIn": "缩小",
+            "zoomOut": "放大",
+            "pan": "移动",
+            "reset": "重置缩放"
+        }
+    }
+  }
\ No newline at end of file
diff --git a/manager/src/locale/index.js b/manager/src/locale/index.js
new file mode 100644
index 00000000..ea3e99f0
--- /dev/null
+++ b/manager/src/locale/index.js
@@ -0,0 +1,28 @@
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
+import zhLocale from './lang/zh-CN';
+import enLocale from './lang/en-US';
+import zhCnLocale from 'view-design/src/locale/lang/zh-CN';
+import enUsLocale from 'view-design/src/locale/lang/en-US';
+
+Vue.use(VueI18n);
+
+// 根据浏览器信息自动设置语言
+const navLang = navigator.language;
+const localLang = (navLang == 'zh-CN' || navLang == 'en-US') ? navLang : false;
+const lang = window.localStorage.lang || localLang || 'zh-CN';
+
+Vue.config.lang = lang;
+
+// 多语言配置 vue-i18n 6.x+
+Vue.locale = () => { };
+const messages = {
+    'zh-CN': Object.assign(zhCnLocale, zhLocale),
+    'en-US': Object.assign(enUsLocale, enLocale)
+};
+const i18n = new VueI18n({
+    locale: lang,
+    messages
+});
+
+export default i18n;
diff --git a/manager/src/locale/lang/en-US.js b/manager/src/locale/lang/en-US.js
new file mode 100644
index 00000000..eaaff0a1
--- /dev/null
+++ b/manager/src/locale/lang/en-US.js
@@ -0,0 +1,24 @@
+export default {
+    lili: 'lili',
+    usernameLogin: 'UsernameLogin',
+    mobileLogin: 'MobileLogin',
+    autoLogin: 'Auto Login',
+    forgetPass: 'Forget Password',
+    otherLogin: 'Sign in with',
+    regist: 'Register',
+    login: 'Login',
+    logining: 'Logining...',
+    home: 'home',
+    switchLangTitle: 'Switch Lang',
+    international: 'Switch Lang',
+    userCenter: 'Account Center',
+    changePass: 'Account Pass',
+    logout: 'Logout',
+    tagOption: 'Label Options',
+    closeAll: 'Close All',
+    closeOthers: 'Close Others',
+    help: 'Help',
+    privacy: 'Privacy',
+    terms: 'Terms',
+    rights: 'All Rights Reserved'
+};
diff --git a/manager/src/locale/lang/zh-CN.js b/manager/src/locale/lang/zh-CN.js
new file mode 100644
index 00000000..968673b1
--- /dev/null
+++ b/manager/src/locale/lang/zh-CN.js
@@ -0,0 +1,24 @@
+export default {
+    lili: 'lili',
+    usernameLogin: '账户密码登录',
+    mobileLogin: '手机号登录',
+    autoLogin: '自动登录',
+    forgetPass: '忘记密码',
+    otherLogin: '其他方式登录',
+    regist: '注册账户',
+    login: '登录',
+    logining: '登录中...',
+    home: '首页',
+    switchLangTitle: '切换语言',
+    international: '多语言切换',
+    userCenter: '个人中心',
+    changePass: '修改密码',
+    logout: '退出登录',
+    tagOption: '标签选项',
+    closeAll: '关闭全部',
+    closeOthers: '关闭其他',
+    help: '帮助',
+    privacy: '隐私',
+    terms: '条款',
+    rights: '版权所有'
+};
diff --git a/manager/src/main.js b/manager/src/main.js
new file mode 100644
index 00000000..68b3c5c0
--- /dev/null
+++ b/manager/src/main.js
@@ -0,0 +1,76 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue'
+import ViewUI from 'view-design'
+// import 'view-design/dist/styles/iview.css'
+import './styles/theme.less';
+
+import "core-js/stable"
+import "regenerator-runtime/runtime"
+import App from './App'
+import { router } from './router/index'
+import store from './store'
+import i18n from '@/locale'
+
+import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios'
+import { setStore, getStore, removeStore } from '@/libs/storage'
+import util from '@/libs/util'
+import VueLazyload from 'vue-lazyload'
+
+import * as filters from '@/utils/filters' // global filter
+import liliDialog from '@/views/lili-dialog'
+import {md5} from '@/utils/md5.js';
+Vue.config.devtools = true;
+Vue.config.productionTip = false
+Vue.use(VueLazyload, {
+    error: require('./assets/img-error.png'),
+    loading: require('./assets/loading2.gif')
+})
+Vue.use(ViewUI, {
+    i18n: (key, value) => i18n.t(key, value)
+});
+
+Vue.component('liliDialog',liliDialog)
+
+
+
+// 挂载全局使用的方法
+Vue.prototype.getRequest = getRequest;
+Vue.prototype.postRequest = postRequest;
+Vue.prototype.putRequest = putRequest;
+Vue.prototype.deleteRequest = deleteRequest;
+Vue.prototype.importRequest = importRequest;
+Vue.prototype.uploadFileRequest = uploadFileRequest;
+Vue.prototype.setStore = setStore;
+Vue.prototype.getStore = getStore;
+Vue.prototype.removeStore = removeStore;
+Vue.prototype.md5 = md5;
+
+Array.prototype.remove = function(from, to) {
+    var rest = this.slice((to || from) + 1 || this.length);
+    this.length = from < 0 ? this.length + from : from;
+    return this.push.apply(this, rest);
+};
+
+Object.keys(filters).forEach(key => {
+    Vue.filter(key, filters[key])
+})
+/* eslint-disable no-new */
+new Vue({
+    el: '#app',
+    router,
+    store,
+    i18n,
+    render: h => h(App),
+    data: {
+        currentPageName: ''
+    },
+    mounted() {
+        // 初始化菜单
+        util.initRouter(this);
+        this.currentPageName = this.$route.name;
+        // 显示打开的页面的列表
+        this.$store.commit('setOpenedList');
+        this.$store.commit('initCachePage');
+    }
+})
diff --git a/manager/src/router/index.js b/manager/src/router/index.js
new file mode 100644
index 00000000..07268bff
--- /dev/null
+++ b/manager/src/router/index.js
@@ -0,0 +1,46 @@
+import Vue from 'vue';
+import ViewUI from 'view-design';
+import Util from '../libs/util';
+import VueRouter from 'vue-router';
+import Cookies from 'js-cookie';
+import {routers} from './router';
+
+Vue.use(VueRouter);
+
+// 路由配置
+const RouterConfig = {
+  mode: 'history',
+  routes: routers
+};
+
+export const router = new VueRouter(RouterConfig);
+
+router.beforeEach((to, from, next) => {
+  ViewUI.LoadingBar.start();
+  Util.title(to.meta.title);
+
+  next();
+
+  const name = to.name;
+
+  if (!Cookies.get('userInfo') && name !== 'login') {
+    // 判断是否已经登录且前往的页面不是登录页
+    next({
+      name: 'login'
+    });
+  } else if (Cookies.get('userInfo') && name === 'login') {
+    // 判断是否已经登录且前往的是登录页
+    Util.title();
+    next({
+      name: 'home_index'
+    });
+  } else {
+    Util.toDefaultPage([...routers], name, router, next);
+  }
+});
+
+router.afterEach((to) => {
+  Util.openNewPage(router.app, to.name, to.params, to.query);
+  ViewUI.LoadingBar.finish();
+  window.scrollTo(0, 0);
+});
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
new file mode 100644
index 00000000..cf4d9628
--- /dev/null
+++ b/manager/src/router/router.js
@@ -0,0 +1,337 @@
+import Main from "@/views/Main.vue";
+
+// 不作为Main组件的子页面展示的页面单独写，如下
+export const loginRouter = {
+  path: "/login",
+  name: "login",
+  meta: {
+    title: "登录 - lili "
+  },
+  component: () => import("@/views/login.vue")
+};
+
+// 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
+export const otherRouter = {
+  path: "/",
+  name: "otherRouter",
+  redirect: "/home",
+  component: Main,
+  children: [
+    {
+      path: "home",
+      title: { i18n: "home" },
+      name: "home_index",
+      component: () => import("@/views/home/home.vue")
+    },
+    {
+      path: "personal-center",
+      title: "个人中心",
+      name: "personal-center",
+      meta: { title: "个人中心" },
+      component: () => import("@/views/personal-center/personal-center.vue")
+    },
+    {
+      path: "change-password",
+      title: "修改密码",
+      name: "change_password",
+      component: () => import("@/views/change-password/change-password.vue")
+    },
+    {
+      path: "message",
+      title: "消息中心",
+      name: "message_index",
+      component: () => import("@/views/message/message.vue")
+    },
+    {
+      path: "category",
+      title: "类型列表",
+      name: "category",
+      component: () => import("@/views/goods/goods-manage/category.vue")
+    },
+    {
+      path: "message",
+      title: "消息中心",
+      name: "message_index",
+      component: () => import("@/views/message/message.vue")
+    },
+    {
+      path: "category",
+      title: "类型列表",
+      name: "category",
+      component: () => import("@/views/goods/goods-manage/category.vue")
+    },
+    {
+      path: "parameter",
+      title: "参数绑定",
+      name: "parameter",
+      component: () => import("@/views/goods/goods-manage/parameter.vue")
+    },
+    {
+      path: "shop",
+      title: "店铺列表",
+      name: "shop",
+      component: () => import("@/views/seller/shop/shopList.vue")
+    },
+    {
+      path: "shop-operation",
+      title: "店铺操作",
+      name: "shop-operation",
+      component: () => import("@/views/seller/shop/shopOperation.vue")
+    },
+    {
+      path: "shop-detail",
+      title: "店铺详细",
+      name: "shop-detail",
+      component: () => import("@/views/seller/shop/shopDetail.vue")
+    },
+    {
+      path: "add-edit-message",
+      title: "消息详情",
+      name: "add_edit_message",
+      component: () =>
+        import("@/views/member/message-manage/addOrEditMessage.vue")
+    },
+    {
+      path: "add_message",
+      title: "会员站内信",
+      name: "add_message",
+      component: () => import("@/views/member/notice/addMessage.vue")
+    },
+    {
+      path: "message-send-detail",
+      title: "消息发送详情",
+      name: "message_send_detail",
+      component: () =>
+        import("@/views/member/message-manage/messageSendDetail.vue")
+    },
+    {
+      path: "bill-detail",
+      title: "结算单详情",
+      name: "bill-detail",
+      component: () => import("@/views/seller/bill/bill-detail.vue")
+    },
+    {
+      path: "apply-goods",
+      title: "商品审核列表",
+      name: "apply-goods",
+      component: () => import("@/views/goods/goods-info/goodsApply.vue")
+    },
+    {
+      path: "manager-goods",
+      title: "管理端商品列表",
+      name: "manager-goods",
+      component: () => import("@/views/goods/goods-info/goods.vue")
+    },
+    {
+      path: "goods-brand",
+      title: "商品品牌",
+      name: "goods-brand",
+      component: () => import("@/views/goods/goods-manage/brand.vue")
+    },
+    {
+      path: "goods-category",
+      title: "商品分类",
+      name: "goods-category",
+      component: () => import("@/views/goods/goods-manage/category.vue")
+    },
+    {
+      path: "goods-parameter",
+      title: "商品参数",
+      name: "goods-parameter",
+      component: () => import("@/views/goods/goods-manage/parameter.vue")
+    },
+    {
+      path: "goods-spec",
+      title: "商品参数",
+      name: "goods-spec",
+      component: () => import("@/views/goods/goods-manage/spec.vue")
+    },
+    {
+      path: "order-complaint-detail",
+      title: "投诉详情",
+      name: "order-complaint-detail",
+      component: () =>
+        import("@/views/order/after-order/orderComplaintDetail.vue")
+    },
+    {
+      path: "order-list",
+      title: "订单列表",
+      name: "order-list",
+      component: () => import("@/views/order/order/orderList.vue")
+    },
+    {
+      path: "order-detail",
+      title: "订单详情",
+      name: "order-detail",
+      component: () => import("@/views/order/order/orderDetail.vue")
+    },
+    {
+      path: "after-order-detail",
+      title: "售后单详情",
+      name: "after-order-detail",
+      component: () =>
+        import("@/views/order/after-order/afterSaleOrderDetail.vue")
+    },
+    {
+      path: "shop-operation",
+      title: "店铺详情",
+      name: "shop-operation",
+      component: () => import("@/views/seller/shop/shopOperation.vue")
+    },
+    {
+      path: "member-detail",
+      title: "会员详情",
+      name: "member-detail",
+      component: () => import("@/views/member/list/memberDetail.vue")
+    },
+
+    {
+      path: "goods/goods-info/goodsDetail",
+      title: "商品详情",
+      name: "goods-detail",
+      component: () => import("@/views/goods/goods-info/goodsDetail.vue")
+    },
+    {
+      path: "promotion/manager-poonts-goods",
+      title: "积分商品",
+      name: "manager-points-goods",
+      component: () => import("@/views/promotion/pointsGoods/pointsGoods.vue")
+    },
+    {
+      path: "promotion/add-poonts-goods",
+      title: "添加积分商品",
+      name: "add-points-goods",
+      component: () =>
+        import("@/views/promotion/pointsGoods/addPointsGoods.vue")
+    },
+    {
+      path: "promotion/edit-poonts-goods",
+      title: "修改积分商品",
+      name: "edit-points-goods",
+      component: () =>
+        import("@/views/promotion/pointsGoods/editPointsGoods.vue")
+    },
+    {
+      path: "promotion/manager-poonts-goods-category",
+      title: "积分商品分类",
+      name: "manager-points-goods-category",
+      component: () =>
+        import("@/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue")
+    },
+    {
+      path: "promotion/manager-coupon",
+      title: "平台优惠券",
+      name: "manager-coupon",
+      component: () => import("@/views/promotion/coupon/coupon.vue")
+    },
+    {
+      path: "promotion/add-platform-coupon",
+      title: "添加平台优惠券",
+      name: "add-platform-coupon",
+      component: () => import("@/views/promotion/coupon/couponPublish.vue")
+    },
+    {
+      path: "promotion/edit-platform-coupon",
+      title: "编辑平台优惠券",
+      name: "edit-platform-coupon",
+      component: () => import("@/views/promotion/coupon/couponPublish.vue")
+    },
+    {
+      path: "promotion/member-receive-coupon",
+      title: "领取详情",
+      name: "member-receive-coupon",
+      component: () =>
+        import("@/views/promotion/coupon/memberReceiveCoupon.vue")
+    },
+    {
+      path: "promotion/platform-coupon-info",
+      title: "详情",
+      name: "platform-coupon-info",
+      component: () => import("@/views/promotion/coupon/couponInfo.vue")
+    },
+    {
+      path: "promotion/manager-pintuan",
+      title: "平台拼团",
+      name: "manager-pintuan",
+      component: () => import("@/views/promotion/pintuan/pintuan.vue")
+    },
+    {
+      path: "promotion/pintuan/pintuan-goods",
+      title: "拼团商品",
+      name: "pintuan-goods",
+      component: () => import("@/views/promotion/pintuan/pintuanGoods.vue")
+    },
+    {
+      path: "promotion/full-cut-detail",
+      title: "满减满折详情",
+      name: "full-cut-detail",
+      component: () => import("@/views/promotion/fullCut/fullCutDetail.vue")
+    },
+    {
+      path: "promotion/seckill/manager-seckill",
+      title: "限时抢购列表",
+      name: "manager-seckill",
+      component: () => import("@/views/promotion/seckill/seckill.vue")
+    },
+    {
+      path: "promotion/seckill/seckill-goods",
+      title: "限时抢购商品",
+      name: "seckill-goods",
+      component: () => import("@/views/promotion/seckill/seckillGoods.vue")
+    },
+    {
+      path: "promotion/seckill/manager-seckill-add",
+      title: "添加限时抢购",
+      name: "manager-seckill-add",
+      component: () => import("@/views/promotion/seckill/addSeckill.vue")
+    },
+    {
+      path: "/floorList/renovation",
+      title: "编辑模板",
+      name: "renovation",
+      component: () => import("@/views/lili-floor-renovation/renovation.vue")
+    },
+    {
+      path: "/floorList/main",
+      title: "编辑模板",
+      name: "main",
+      component: () => import("@/views/lili-floor-renovation/wap/main.vue")
+    },
+    {
+      path: "add-sms-sign",
+      title: "短信签名",
+      name: "add-sms-sign",
+      component: () => import("@/views/sys/message/smsSign.vue")
+    }
+  ]
+};
+
+export const page404 = {
+  path: "/*",
+  name: "error-404",
+  meta: {
+    title: "404-页面不存在"
+  },
+  component: () => import("@/views/error-page/404.vue")
+};
+
+export const page403 = {
+  path: "/403",
+  meta: {
+    title: "403-权限不足"
+  },
+  name: "error-403",
+  component: () => import("@/views/error-page/403.vue")
+};
+
+export const page500 = {
+  path: "/500",
+  meta: {
+    title: "500-服务端错误"
+  },
+  name: "error-500",
+  component: () => import("@/views/error-page/500.vue")
+};
+
+// 所有上面定义的路由都要写在下面的routers里
+export const routers = [loginRouter, otherRouter, page500, page403];
diff --git a/manager/src/store/index.js b/manager/src/store/index.js
new file mode 100644
index 00000000..57665ece
--- /dev/null
+++ b/manager/src/store/index.js
@@ -0,0 +1,27 @@
+import Vue from "vue";
+import Vuex from "vuex";
+
+import app from "./modules/app";
+import user from "./modules/user";
+import dict from "./modules/dict";
+
+Vue.use(Vuex);
+
+const store = new Vuex.Store({
+  state: {
+    // 状态
+
+    notices: "" //通知提示信息
+  },
+  mutations: {
+    // 改变方法
+  },
+  actions: {},
+  modules: {
+    app,
+    user,
+    dict
+  }
+});
+
+export default store;
diff --git a/manager/src/store/modules/app.js b/manager/src/store/modules/app.js
new file mode 100644
index 00000000..91636214
--- /dev/null
+++ b/manager/src/store/modules/app.js
@@ -0,0 +1,178 @@
+import { otherRouter } from '@/router/router';
+import { router } from '@/router/index';
+import Util from '@/libs/util';
+import Cookies from 'js-cookie';
+import Vue from 'vue';
+
+const app = {
+    state: {
+        styleStore:"", //移动端楼层装修中选择风格存储
+        loading: false, // 全局加载动画
+        added: false, // 加载路由标识
+        navList: [], // 顶部菜单
+        currNav: "", // 当前顶部菜单name
+        currNavTitle: "", // 当前顶部菜单标题
+        cachePage: [],
+        lang: '',
+        isFullScreen: false,
+        openedSubmenuArr: [], // 要展开的菜单数组
+        menuTheme: 'dark', // 主题
+        themeColor: '',
+        pageOpenedList: [{
+            title: '首页',
+            path: '',
+            name: 'home_index'
+        }],
+        currentPageName: '',
+        currentPath: [
+            {
+                title: '首页',
+                path: '',
+                name: 'home_index'
+            }
+        ],
+        // 面包屑数组 左侧菜单
+        menuList: [],
+        tagsList: [...otherRouter.children], //这块是面包屑的内容不能删除
+        routers: [
+            otherRouter
+        ],
+        messageCount: 0,
+        // 在这里定义你不想要缓存的页面的name属性值(参见路由配置router.js)
+        dontCache: ['test', 'test']
+    },
+    mutations: {
+        // 动态添加主界面路由，需要缓存
+        updateAppRouter(state, routes) {
+            state.routers.push(...routes);
+            router.addRoutes(routes);
+        },
+        // 动态添加全局路由404、500等页面，不需要缓存
+        updateDefaultRouter(state, routes) {
+            router.addRoutes(routes);
+        },
+        setLoading(state, v) {
+            state.loading = v;
+        },
+        setAdded(state, v) {
+            state.added = v;
+        },
+        setNavList(state, list) {
+            state.navList = list;
+        },
+        setCurrNav(state, v) {
+            state.currNav = v;
+        },
+        setCurrNavTitle(state, v) {
+            state.currNavTitle = v;
+        },
+        setTagsList(state, list) {
+
+            state.tagsList.push(...list);
+        },
+        updateMenulist(state, routes) {
+            state.menuList = routes;
+        },
+        addOpenSubmenu(state, name) {
+            let hasThisName = false;
+            let isEmpty = false;
+            if (name.length == 0) {
+                isEmpty = true;
+            }
+            if (state.openedSubmenuArr.indexOf(name) > -1) {
+                hasThisName = true;
+            }
+            if (!hasThisName && !isEmpty) {
+                state.openedSubmenuArr.push(name);
+            }
+        },
+        closePage(state, name) {
+            state.cachePage.forEach((item, index) => {
+                if (item == name) {
+                    state.cachePage.splice(index, 1);
+                }
+            });
+        },
+      initCachePage(state) {
+            if (localStorage.cachePage) {
+                state.cachePage = JSON.parse(localStorage.cachePage);
+            }
+        },
+        removeTag(state, name) {
+            state.pageOpenedList.map((item, index) => {
+                if (item.name == name) {
+                    state.pageOpenedList.splice(index, 1);
+                }
+            });
+        },
+        pageOpenedList(state, get) {
+            let openedPage = state.pageOpenedList[get.index];
+            if (get.argu) {
+                openedPage.argu = get.argu;
+            }
+            if (get.query) {
+                openedPage.query = get.query;
+            }
+            state.pageOpenedList.splice(get.index, 1, openedPage);
+            localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+        },
+        clearAllTags(state) {
+            state.pageOpenedList.splice(1);
+            state.cachePage.length = 0;
+            localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+        },
+        clearOtherTags(state, vm) {
+            let currentName = vm.$route.name;
+            let currentIndex = 0;
+            state.pageOpenedList.forEach((item, index) => {
+                if (item.name == currentName) {
+                    currentIndex = index;
+                }
+            });
+            if (currentIndex == 0) {
+                state.pageOpenedList.splice(1);
+            } else {
+                state.pageOpenedList.splice(currentIndex + 1);
+                state.pageOpenedList.splice(1, currentIndex - 1);
+            }
+            let newCachepage = state.cachePage.filter(item => {
+                return item == currentName;
+            });
+            state.cachePage = newCachepage;
+            localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+        },
+        setOpenedList(state) {
+            state.pageOpenedList = localStorage.pageOpenedList ? JSON.parse(localStorage.pageOpenedList) : [otherRouter.children[0]];
+        },
+        setCurrentPath(state, pathArr) {
+            state.currentPath = pathArr;
+        },
+        setCurrentPageName(state, name) {
+            state.currentPageName = name;
+        },
+        setAvatarPath(state, path) {
+            localStorage.avatorImgPath = path;
+        },
+        switchLang(state, lang) {
+            state.lang = lang;
+            localStorage.lang = lang;
+            Vue.config.lang = lang;
+        },
+        clearOpenedSubmenu(state) {
+            state.openedSubmenuArr.length = 0;
+        },
+        setMessageCount(state, count) {
+            state.messageCount = count;
+        },
+        increateTag(state, tagObj) {
+            if (!Util.oneOf(tagObj.name, state.dontCache)) {
+                state.cachePage.push(tagObj.name);
+                localStorage.cachePage = JSON.stringify(state.cachePage);
+            }
+            state.pageOpenedList.push(tagObj);
+            localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
+        }
+    }
+};
+
+export default app;
diff --git a/manager/src/store/modules/dict.js b/manager/src/store/modules/dict.js
new file mode 100644
index 00000000..13580af3
--- /dev/null
+++ b/manager/src/store/modules/dict.js
@@ -0,0 +1,26 @@
+const dict = {
+    state: {
+        // 经常需要读取的数据字典
+        sex: [],
+        messageType: [],
+        priority: [],
+        leaveType: []
+    },
+    mutations: {
+        // 设置值的改变方法
+        setSex(state, list) {
+            state.sex = list;
+        },
+        setMessageType(state, list) {
+            state.messageType = list;
+        },
+        setPriority(state, list) {
+            state.priority = list;
+        },
+        setLeaveType(state, list) {
+            state.leaveType = list;
+        },
+    }
+};
+
+export default dict;
diff --git a/manager/src/store/modules/user.js b/manager/src/store/modules/user.js
new file mode 100644
index 00000000..bd84c739
--- /dev/null
+++ b/manager/src/store/modules/user.js
@@ -0,0 +1,14 @@
+import Cookies from 'js-cookie';
+
+const user = {
+    state: {},
+    mutations: {
+        logout () {
+            Cookies.remove('userInfo');
+            // 清空打开的页面等数据
+            localStorage.clear();
+        }
+    }
+};
+
+export default user;
diff --git a/manager/src/styles/common.scss b/manager/src/styles/common.scss
new file mode 100644
index 00000000..29d84517
--- /dev/null
+++ b/manager/src/styles/common.scss
@@ -0,0 +1,197 @@
+$theme_color: #804ed1;
+
+
+//自动移滚动条样式
+::-webkit-scrollbar{
+  width: 1px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.3);
+}
+::-webkit-scrollbar-track{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.1);
+}
+
+
+.flex{
+  display: flex !important;
+
+}
+.flex_justify_content{
+  justify-content: center;
+}
+.flex_align_item{
+  align-items: center;
+}
+
+.global_text_left {
+  text-align: left;
+}
+.global_text_right {
+  text-align: right;
+}
+.global_float_left {
+  float: left;
+}
+.global_float_right {
+    float: right;
+}
+.clearfix::after{
+    content: '';
+    display: block;
+    clear: both;
+}
+.width_1200{width: 1200px;}
+.width_800{width: 800px;}
+.width_400{width: 400px;}
+.width_300{width: 300px;}
+.width_200{width: 200px;}
+.width_100{width: 100px;}
+
+.fz_12{font-size: 12px;}
+.fz_14{font-size: 14px;}
+.fz_16{font-size: 16px;}
+.fz_18{font-size: 18px;}
+.fw_bold{font-weight: bold;}
+
+.mb_20{margin-bottom: 20px;}
+.mt_20{margin-top: 20px;}
+.ml_20{margin-left: 20px;}
+.mr_20{margin-right: 20px;}
+
+.mb_10{margin-bottom: 10px;}
+.mt_10{margin-top: 10px;}
+.ml_10{margin-left: 10px;}
+.mr_10{margin-right: 10px;}
+
+.pb_20{padding-bottom: 20px;}
+.pt_20{padding-top: 20px;}
+.pl_20{padding-left: 20px;}
+.pr_20{padding-right: 20px;}
+
+.pb_10{padding-bottom: 10px;}
+.pt_10{padding-top: 10px;}
+.pl_10{padding-left: 10px;}
+.pr_10{padding-right: 10px;}
+
+ul,li{
+    list-style: none;
+}
+
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+
+/*
+ * @Author: LMR
+ * @Date: 2020-08-14 11:04:12
+ * @Last Modified by: LMR
+ * @Last Modified time: 2020-08-18 14:21:41
+ */
+
+// 主题颜色
+
+// 明亮主题颜色
+$primary_color: #2d8cf0;
+$primary_light_color: #0f1011;
+$primary_dark_color: #2b85e4;
+$success_color: #19be6b;
+$warning_color: #ff9900;
+$error_color: #ed3f14;
+$handle-btn-color: #438cde;
+
+$theme_color: #ed3f14;
+.theme_color{
+  color: #ed3f14 !important;
+}
+$border_color: #dddee1;
+$title_color: #8c8c8c;
+$light_title_color: #1c2438;
+$light_content_color: #495060;
+$light_sub_color: #80848f;
+$light_background_color: #f8f8f9;
+$light_white_background_color: #fff;
+// 暗黑主题颜色
+$dark_background_color: #141414;
+$dark_sub_background_color: #1d1d1d; //稍微浅一点的
+$dark_content_color: #d5d5d5;
+
+/***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
+
+// 背景颜色
+@mixin background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+// 辅助背景颜色
+@mixin sub_background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+
+@mixin white_background_color() {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $light_white_background_color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_white_background_color;
+  }
+}
+
+// 正文颜色
+@mixin content_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_content_color;
+  }
+}
+
+// 辅助颜色
+@mixin sub_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_sub_color;
+  }
+}
+
+// 标题颜色
+@mixin title_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_title_color;
+  }
+}
\ No newline at end of file
diff --git a/manager/src/styles/table-common.scss b/manager/src/styles/table-common.scss
new file mode 100644
index 00000000..19a17f47
--- /dev/null
+++ b/manager/src/styles/table-common.scss
@@ -0,0 +1,79 @@
+.search {
+    .operation {
+        margin-bottom: 2vh;
+    }
+
+    .select-count {
+        font-weight: 600;
+        color: #40a9ff;
+    }
+
+    .select-clear {
+        margin-left: 10px;
+    }
+
+    .page {
+        margin-top: 2vh;
+    }
+
+    .drop-down {
+        margin-left: 5px;
+    }
+}
+
+.tree-list {
+    position: relative;
+    min-height: 80px;
+}
+
+.drawer-footer {
+    z-index: 10;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    background: #fff;
+}
+
+.block-tool .ivu-tooltip,
+.block-tool .ivu-tooltip-rel {
+    display: block;
+}
+
+.block-pop .ivu-poptip,
+.block-pop .ivu-poptip-rel {
+    display: block;
+}
+
+.search-form {
+  width: 100% !important;
+  display: flex;
+  align-items: center;
+  background-color: #F0F0F0;
+  padding: 10px;
+  margin: 0;
+  flex-wrap: wrap;
+  .ivu-form-item{
+    margin:8px 10px !important;
+  }
+
+}
+.padding-row{
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.search-btn{
+  margin-left: 20px;
+}
+
+.div-zoom{
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  overflow: hidden;
+}
+
+
diff --git a/manager/src/styles/theme.less b/manager/src/styles/theme.less
new file mode 100644
index 00000000..3bd68682
--- /dev/null
+++ b/manager/src/styles/theme.less
@@ -0,0 +1,16 @@
+@import "~view-design/src/styles/index.less";
+// iview 自定义样式
+
+@primary-color: #ed3f14;
+
+@table-thead-bg: #f8f8f9;
+@table-td-stripe-bg: #f8f8f9;
+@table-td-hover-bg: #ededed;
+@table-td-highlight-bg: #ededed;
+@font-size-base: 12px;
+.ivu-drawer,
+.drawer,
+.ivu-drawer-wrap {
+  z-index: 2600 !important;
+}
+
diff --git a/manager/src/styles/tree-common.scss b/manager/src/styles/tree-common.scss
new file mode 100644
index 00000000..a8326c56
--- /dev/null
+++ b/manager/src/styles/tree-common.scss
@@ -0,0 +1,42 @@
+.search {
+    .operation {
+        margin-bottom: 2vh;
+    }
+
+    .select-title {
+        font-weight: 600;
+        color: #40a9ff;
+    }
+
+    .select-clear {
+        margin-left: 10px;
+    }
+}
+
+.tree-bar {
+    overflow: auto;
+    margin-top: 5px;
+    position: relative;
+    min-height: 80px;
+}
+
+.tree-bar::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+}
+
+.tree-bar::-webkit-scrollbar-thumb {
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 0 2px #d1d1d1;
+    background: #e4e4e4;
+}
+
+.block-tool .ivu-tooltip,
+.block-tool .ivu-tooltip-rel {
+    display: block;
+}
+
+.block-pop .ivu-poptip,
+.block-pop .ivu-poptip-rel {
+    display: block;
+}
diff --git a/manager/src/utils/filters.js b/manager/src/utils/filters.js
new file mode 100644
index 00000000..d581cc7d
--- /dev/null
+++ b/manager/src/utils/filters.js
@@ -0,0 +1,175 @@
+/**
+ * 金钱单位置换  2999 --> 2,999.00
+ * @param val
+ * @param unit
+ * @param location
+ * @returns {*}
+ */
+export function unitPrice(val, unit, location) {
+  let price = formatPrice(val)
+  if (location === 'before') {
+    return price.substr(0, price.length - 3)
+  }
+  if (location === 'after') {
+    return price.substr(-2)
+  }
+  return (unit || '') + price
+}
+
+
+
+/**
+ * 货币格式化
+ * @param price
+ * @returns {string}
+ */
+export function formatPrice(price) {
+  if (typeof price !== 'number') return price
+  return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+}
+
+/**
+ * 处理unix时间戳，转换为可阅读时间格式
+ * @param unix
+ * @param format
+ * @returns {*|string}
+ */
+export function unixToDate(unix, format) {
+  let _format = format || 'yyyy-MM-dd hh:mm:ss'
+  const d = new Date(unix * 1000)
+  const o = {
+    'M+': d.getMonth() + 1,
+    'd+': d.getDate(),
+    'h+': d.getHours(),
+    'm+': d.getMinutes(),
+    's+': d.getSeconds(),
+    'q+': Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
+  }
+  if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (const k in o) if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  return _format
+}
+//是否格式化
+export function unixWhether(status) {
+  switch (status) {
+      case 'YES':
+        return "是"
+      case 'NO':
+        return "否"
+  }
+}
+
+export function unixSellerBillStatus(status_code) {
+  switch (status_code) {
+    case 'OUT':
+      return '已出账'
+    case 'CHECK':
+      return '已对账'
+    case 'EXAMINE':
+      return '已审核'
+    case 'PAY':
+      return '已结算'
+    case 'COMPLETE':
+      return '已完成'
+  }
+}
+export function unixSwitchStatus(status_code) {
+  switch (status_code) {
+    case 'OPEN':
+      return '开启'
+    case 'CLOSE':
+      return '关闭'
+  }
+}
+
+/**
+ * 13888888888 -> 138****8888
+ * @param mobile
+ * @returns {*}
+ */
+export function secrecyMobile(mobile) {
+  mobile = String(mobile)
+  if (!/\d{11}/.test(mobile)) {
+    return mobile
+  }
+  return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+}
+
+
+export function formatDate(date, fmt) {
+  if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+  };
+  for (let k in o) {
+      if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + '';
+          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+      }
+  }
+  return fmt;
+};
+
+// 楼层装修，选择链接处理跳转方式
+export function formatLinkType (item) {
+  const types = ['goods', 'category', 'shops', 'marketing', 'pages', 'other'] // 所有跳转的分类 依次为 商品、分类、店铺、活动、页面、其他
+  let url = '';
+  switch (item.___type) {
+    case 'goods':
+      url =  `/goodsDetail?skuId=${item.id}&goodsId=${item.goodsId}`;
+      break;
+
+    case 'category':
+      url = `/goodsList?categoryId=${item.allId}`;
+      break;
+
+    case 'shops':
+      url = `/merchant?id=${item.id}`;
+      break;
+
+    case 'marketing': // 暂无数据，需要后续修改
+      url = `/seckill?id=${item.id}`;
+      break;
+
+    case 'pages': // 暂无数据，需要后续修改
+      url = `/article?id=${item.id}`;
+      break;
+
+    case 'other':
+      switch (item.title) {
+        case '首页':
+          url = '/';
+          break;
+        case '购物车':
+          url = '/cart';
+          break;
+        case '我的订单':
+          url = '/home/MyOrder';
+          break;
+        case '收藏商品':
+          url = '/home/Favorites';
+          break;
+        case '个人中心':
+          url = '/home';
+          break;
+        case '外部链接':
+          url = item.url;
+          break;
+        case '秒杀频道':
+          url = '/seckill';
+          break;
+        case '领券中心':
+          url = '/coupon';
+          break;
+      }
+      break;
+  }
+  return url;
+}
\ No newline at end of file
diff --git a/manager/src/utils/index.js b/manager/src/utils/index.js
new file mode 100644
index 00000000..6d4832f7
--- /dev/null
+++ b/manager/src/utils/index.js
@@ -0,0 +1,27 @@
+import * as regular from './regular'
+
+export {
+  regular
+}
+
+
+/**
+ * 数组对象深拷贝
+ * @param obj
+ * @returns {*}
+ */
+export default function cloneObj(obj) {
+  let str = null
+  let newobj = obj.constructor === Array ? [] : {}
+  if (typeof obj !== 'object') {
+    return
+  } else if (window && window.JSON) {
+    str = JSON.stringify(obj) // 系列化对象
+    newobj = JSON.parse(str) // 还原
+  } else {
+    for (var i in obj) {
+      newobj[i] = typeof obj[i] === 'object' ? cloneObj(obj[i]) : obj[i]
+    }
+  }
+  return newobj
+}
diff --git a/manager/src/utils/md5.js b/manager/src/utils/md5.js
new file mode 100644
index 00000000..e5741303
--- /dev/null
+++ b/manager/src/utils/md5.js
@@ -0,0 +1,223 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 1.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Code also contributed by Greg Holt
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y) {
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF)
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+  return (msw << 16) | (lsw & 0xFFFF)
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function rol(num, cnt) {
+  return (num << cnt) | (num >>> (32 - cnt))
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function cmn(q, a, b, x, s, t) {
+  return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)
+}
+
+function ff(a, b, c, d, x, s, t) {
+  return cmn((b & c) | ((~b) & d), a, b, x, s, t)
+}
+
+function gg(a, b, c, d, x, s, t) {
+  return cmn((b & d) | (c & (~d)), a, b, x, s, t)
+}
+
+function hh(a, b, c, d, x, s, t) {
+  return cmn(b ^ c ^ d, a, b, x, s, t)
+}
+
+function ii(a, b, c, d, x, s, t) {
+  return cmn(c ^ (b | (~d)), a, b, x, s, t)
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, producing an array
+ * of little-endian words.
+ */
+function coreMD5(x) {
+  var a = 1732584193
+  var b = -271733879
+  var c = -1732584194
+  var d = 271733878
+
+  for (var i = 0; i < x.length; i += 16) {
+    var olda = a
+    var oldb = b
+    var oldc = c
+    var oldd = d
+
+    a = ff(a, b, c, d, x[i + 0], 7, -680876936)
+    d = ff(d, a, b, c, x[i + 1], 12, -389564586)
+    c = ff(c, d, a, b, x[i + 2], 17, 606105819)
+    b = ff(b, c, d, a, x[i + 3], 22, -1044525330)
+    a = ff(a, b, c, d, x[i + 4], 7, -176418897)
+    d = ff(d, a, b, c, x[i + 5], 12, 1200080426)
+    c = ff(c, d, a, b, x[i + 6], 17, -1473231341)
+    b = ff(b, c, d, a, x[i + 7], 22, -45705983)
+    a = ff(a, b, c, d, x[i + 8], 7, 1770035416)
+    d = ff(d, a, b, c, x[i + 9], 12, -1958414417)
+    c = ff(c, d, a, b, x[i + 10], 17, -42063)
+    b = ff(b, c, d, a, x[i + 11], 22, -1990404162)
+    a = ff(a, b, c, d, x[i + 12], 7, 1804603682)
+    d = ff(d, a, b, c, x[i + 13], 12, -40341101)
+    c = ff(c, d, a, b, x[i + 14], 17, -1502002290)
+    b = ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+    a = gg(a, b, c, d, x[i + 1], 5, -165796510)
+    d = gg(d, a, b, c, x[i + 6], 9, -1069501632)
+    c = gg(c, d, a, b, x[i + 11], 14, 643717713)
+    b = gg(b, c, d, a, x[i + 0], 20, -373897302)
+    a = gg(a, b, c, d, x[i + 5], 5, -701558691)
+    d = gg(d, a, b, c, x[i + 10], 9, 38016083)
+    c = gg(c, d, a, b, x[i + 15], 14, -660478335)
+    b = gg(b, c, d, a, x[i + 4], 20, -405537848)
+    a = gg(a, b, c, d, x[i + 9], 5, 568446438)
+    d = gg(d, a, b, c, x[i + 14], 9, -1019803690)
+    c = gg(c, d, a, b, x[i + 3], 14, -187363961)
+    b = gg(b, c, d, a, x[i + 8], 20, 1163531501)
+    a = gg(a, b, c, d, x[i + 13], 5, -1444681467)
+    d = gg(d, a, b, c, x[i + 2], 9, -51403784)
+    c = gg(c, d, a, b, x[i + 7], 14, 1735328473)
+    b = gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+    a = hh(a, b, c, d, x[i + 5], 4, -378558)
+    d = hh(d, a, b, c, x[i + 8], 11, -2022574463)
+    c = hh(c, d, a, b, x[i + 11], 16, 1839030562)
+    b = hh(b, c, d, a, x[i + 14], 23, -35309556)
+    a = hh(a, b, c, d, x[i + 1], 4, -1530992060)
+    d = hh(d, a, b, c, x[i + 4], 11, 1272893353)
+    c = hh(c, d, a, b, x[i + 7], 16, -155497632)
+    b = hh(b, c, d, a, x[i + 10], 23, -1094730640)
+    a = hh(a, b, c, d, x[i + 13], 4, 681279174)
+    d = hh(d, a, b, c, x[i + 0], 11, -358537222)
+    c = hh(c, d, a, b, x[i + 3], 16, -722521979)
+    b = hh(b, c, d, a, x[i + 6], 23, 76029189)
+    a = hh(a, b, c, d, x[i + 9], 4, -640364487)
+    d = hh(d, a, b, c, x[i + 12], 11, -421815835)
+    c = hh(c, d, a, b, x[i + 15], 16, 530742520)
+    b = hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+    a = ii(a, b, c, d, x[i + 0], 6, -198630844)
+    d = ii(d, a, b, c, x[i + 7], 10, 1126891415)
+    c = ii(c, d, a, b, x[i + 14], 15, -1416354905)
+    b = ii(b, c, d, a, x[i + 5], 21, -57434055)
+    a = ii(a, b, c, d, x[i + 12], 6, 1700485571)
+    d = ii(d, a, b, c, x[i + 3], 10, -1894986606)
+    c = ii(c, d, a, b, x[i + 10], 15, -1051523)
+    b = ii(b, c, d, a, x[i + 1], 21, -2054922799)
+    a = ii(a, b, c, d, x[i + 8], 6, 1873313359)
+    d = ii(d, a, b, c, x[i + 15], 10, -30611744)
+    c = ii(c, d, a, b, x[i + 6], 15, -1560198380)
+    b = ii(b, c, d, a, x[i + 13], 21, 1309151649)
+    a = ii(a, b, c, d, x[i + 4], 6, -145523070)
+    d = ii(d, a, b, c, x[i + 11], 10, -1120210379)
+    c = ii(c, d, a, b, x[i + 2], 15, 718787259)
+    b = ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+    a = safe_add(a, olda)
+    b = safe_add(b, oldb)
+    c = safe_add(c, oldc)
+    d = safe_add(d, oldd)
+  }
+  return [a, b, c, d]
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray) {
+  var hex_tab = "0123456789abcdef"
+  var str = ""
+  for (var i = 0; i < binarray.length * 4; i++) {
+    str += hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xF) +
+      hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xF)
+  }
+  return str
+}
+
+/*
+ * Convert an array of little-endian words to a base64 encoded string.
+ */
+function binl2b64(binarray) {
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+  var str = ""
+  for (var i = 0; i < binarray.length * 32; i += 6) {
+    str += tab.charAt(((binarray[i >> 5] << (i % 32)) & 0x3F) |
+      ((binarray[i >> 5 + 1] >> (32 - i % 32)) & 0x3F))
+  }
+  return str
+}
+
+/*
+ * Convert an 8-bit character string to a sequence of 16-word blocks, stored
+ * as an array, and append appropriate padding for MD4/5 calculation.
+ * If any of the characters are >255, the high byte is silently ignored.
+ */
+function str2binl(str) {
+  var nblk = ((str.length + 8) >> 6) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 2] |= (str.charCodeAt(i) & 0xFF) << ((i % 4) * 8)
+  blks[i >> 2] |= 0x80 << ((i % 4) * 8)
+  blks[nblk * 16 - 2] = str.length * 8
+  return blks
+}
+
+/*
+ * Convert a wide-character string to a sequence of 16-word blocks, stored as
+ * an array, and append appropriate padding for MD4/5 calculation.
+ */
+function strw2binl(str) {
+  var nblk = ((str.length + 4) >> 5) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 1] |= str.charCodeAt(i) << ((i % 2) * 16)
+  blks[i >> 1] |= 0x80 << ((i % 2) * 16)
+  blks[nblk * 16 - 2] = str.length * 16
+  return blks
+}
+
+/*
+ * External interface
+ */
+function hexMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+function hexMD5w(str) {
+  return binl2hex(coreMD5(strw2binl(str)))
+}
+
+function b64MD5(str) {
+  return binl2b64(coreMD5(str2binl(str)))
+}
+
+function b64MD5w(str) {
+  return binl2b64(coreMD5(strw2binl(str)))
+}
+/* Backward compatibility */
+function calcMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+module.exports = {
+  md5: hexMD5
+}
diff --git a/manager/src/utils/regular.js b/manager/src/utils/regular.js
new file mode 100644
index 00000000..05e78f2c
--- /dev/null
+++ b/manager/src/utils/regular.js
@@ -0,0 +1,59 @@
+/**
+ * 各种正则表达式
+ *
+ * qq       qq号
+ * name     汉字
+ * mobile   手机号
+ * email    电子邮箱
+ * password 密码【6-20位】
+ * integer  正整数【不包含0】
+ * money    金钱
+ * IDCard   身份证
+ * userName 账户名称【汉字、字母、数字、“-”、“_”的组合】
+ * URL      URL
+ * TEL      固定电话
+ */
+
+
+//qq
+export const qq = /^[1-9][0-9]{4,14}$/
+//汉字
+export const name = /^[\u4e00-\u9fa5]{0,}$/
+
+// 手机号
+export const mobile = /^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/
+
+// 电子邮箱
+export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+// 密码【6-20位】
+export const password = /^[@A-Za-z0-9!#$%^&*.~,]{6,20}$/
+
+// 正整数【不包含0】
+export const integer = /^[1-9]\d*$/
+
+// 正整数【包含0】
+export const Integer = /^[0-9]\d*$/
+
+// 折扣
+export const discount = /^((0\.[1-9]{1})|(([1-9]{1})(\.\d{1})?))$/
+
+// 0-100正整数
+export const rate = /^([0-9]{1,2}|100)$/
+
+// 金钱
+export const money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+
+
+// 身份证
+export const IDCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+
+// 账户名称【汉字、字母、数字、“-”、“_”的组合】
+export const userName = /[A-Za-z0-9_\-\u4e00-\u9fa5]$/
+
+// URL
+export const URL =
+  /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+
+// 固话
+export const TEL = /0\d{2,3}-\d{7,8}/
diff --git a/manager/src/utils/validate.js b/manager/src/utils/validate.js
new file mode 100644
index 00000000..3fb13777
--- /dev/null
+++ b/manager/src/utils/validate.js
@@ -0,0 +1,21 @@
+import * as regExp from "./regular";
+
+//表单中必须输入汉字
+export function validateNeedName(rule, value, callback) {
+  const name = regExp.name;
+  if (name.test(value)) {
+    callback();
+  } else {
+    return callback(new Error("请输入汉字"));
+  }
+}
+
+//表单中输入手机号验证
+export function validateMobile(rule, value, callback) {
+  const mobile = regExp.mobile;
+  if (mobile.test(value)) {
+    callback();
+  } else {
+    return callback(new Error("手机号输入错误！"));
+  }
+}
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
new file mode 100644
index 00000000..177a8811
--- /dev/null
+++ b/manager/src/views/Main.vue
@@ -0,0 +1,217 @@
+<style lang="scss">
+@import "./main.scss";
+</style>
+
+<template>
+  <div class="main">
+    <!-- 左侧菜单 -->
+    <div class="sidebar-menu-con menu-bar">
+      <div class="logo-con">
+        <img src="../assets/logo.png" key="max-logo" />
+      </div>
+      <shrinkable-menu></shrinkable-menu>
+    </div>
+    <!-- 顶部标题栏主体 -->
+    <div class="main-header-con" style="padding-left:240px">
+      <div class="main-header">
+        <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
+          <!-- 通知消息 -->
+          <message-tip v-if="tipsMessage" :res="tipsMessage"></message-tip>
+          <!-- 用户头像 -->
+          <div class="user-dropdown-menu-con">
+
+            <Row type="flex" justify="end" align="middle" class="user-dropdown-innercon">
+              <Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
+                <div class="dropList">
+                  <span class="main-user-name">{{ userInfo.nickName }}</span>
+                  <Icon type="md-arrow-dropdown" />
+                  <Avatar :src="avatarPath" style="background: #fff;margin-left: 10px;"></Avatar>
+                </div>
+                <DropdownMenu slot="list">
+                  <DropdownItem name="personalCenter">{{ $t('userCenter') }}</DropdownItem>
+                  <DropdownItem name="changePass">{{ $t('changePass') }}</DropdownItem>
+                  <DropdownItem name="loginOut" divided>{{ $t('logout') }}</DropdownItem>
+                </DropdownMenu>
+              </Dropdown>
+            </Row>
+          </div>
+        </div>
+      </div>
+      <!-- 已打开的页面标签 -->
+      <div class="tags-con">
+        <tags-page-opened :pageTagsList="pageTagsList"></tags-page-opened>
+      </div>
+    </div>
+    <div class="single-page-con">
+      <div class="single-page">
+        <!-- <keep-alive :include="cachePage"> -->
+        <router-view></router-view>
+        <!-- </keep-alive> -->
+      </div>
+    </div>
+    <!-- 全局加载动画 -->
+    <circleLoading class="loading-position" v-show="loading" />
+  </div>
+</template>
+
+<script>
+import shrinkableMenu from "./main-components/shrinkable-menu/shrinkable-menu.vue";
+import tagsPageOpened from "./main-components/tags-page-opened.vue";
+import breadcrumbNav from "./main-components/breadcrumb-nav.vue";
+import fullScreen from "./main-components/fullscreen.vue";
+import messageTip from "./main-components/message-tip.vue";
+import circleLoading from "@/views/my-components/lili/circle-loading.vue";
+import Cookies from "js-cookie";
+import util from "@/libs/util.js";
+import { getNoticePage } from "@/api/index";
+
+var client;
+export default {
+  components: {
+    shrinkableMenu,
+    tagsPageOpened,
+    breadcrumbNav,
+    fullScreen,
+    messageTip,
+    circleLoading,
+  },
+  data() {
+    return {
+      sliceNum: 5,
+      userInfo: "",
+      userId: "",
+      openedSubmenuArr: this.$store.state.app.openedSubmenuArr,
+      firstThreeNav: [],
+      lastNav: [],
+      navType: 1,
+      tipsMessage: "",
+    };
+  },
+  computed: {
+    loading() {
+      return this.$store.state.app.loading;
+    },
+    pageTagsList() {
+      return this.$store.state.app.pageOpenedList; // 打开的页面的页面对象
+    },
+    avatarPath() {
+      return localStorage.avatorImgPath;
+    },
+    cachePage() {
+      return this.$store.state.app.cachePage;
+    },
+    lang() {
+      return this.$store.state.app.lang;
+    },
+    mesCount() {
+      return 0;
+    },
+  },
+
+  methods: {
+    init() {
+      // 菜单初始化
+      let pathArr = util.setCurrentPath(this, this.$route.name);
+      if (pathArr.length >= 2) {
+        this.$store.commit("addOpenSubmenu", pathArr[1].name);
+      }
+      let userInfo = JSON.parse(Cookies.get("userInfo"));
+
+      this.userInfo = userInfo;
+      this.userId = userInfo.id;
+      this.checkTag(this.$route.name);
+      let currWidth = document.body.clientWidth;
+      if (currWidth <= 1200) {
+        this.sliceNum = 2;
+      }
+      // 读取未读消息数
+      getNoticePage({}).then((res) => {
+        if (res.success) {
+          this.tipsMessage = res.result;
+
+          this.$store.state.notices = res.result;
+        }
+      });
+    },
+    //用户头像下方抽屉点击
+    handleClickUserDropdown(name) {
+      //个人中心
+      if (name === "personalCenter") {
+        util.openNewPage(this, "personal-center");
+        this.$router.push({
+          name: "personal-center",
+        });
+      }
+      //修改密码
+      else if (name === "changePass") {
+        util.openNewPage(this, "change-password");
+        this.$router.push({
+          name: "change_password",
+        });
+      }
+      // 退出登录
+      else if (name === "loginOut") {
+        Cookies.set("accessToken", "");
+        this.$store.commit("logout", this);
+        this.$store.commit("clearOpenedSubmenu");
+        this.setStore("accessToken", "");
+        this.setStore("refreshToken", "");
+        this.$router.push({ path: "/login" });
+      }
+    },
+    //切换标签
+    checkTag(name) {
+      let openpageHasTag = this.pageTagsList.some((item) => {
+        if (item.name == name) {
+          return true;
+        }
+      });
+      if (!openpageHasTag) {
+        //  解决关闭当前标签后再点击回退按钮会退到当前页时没有标签的问题
+        util.openNewPage(
+          this,
+          name,
+          this.$route.params || {},
+          this.$route.query || {}
+        );
+      }
+    },
+    //宽度动态计算
+    resize() {
+      let currWidth = document.body.clientWidth;
+      let count = currWidth / 300;
+      if (count > 6) {
+        this.sliceNum = 6;
+      } else {
+        this.sliceNum = count;
+      }
+    },
+  },
+  watch: {
+    $route(to, from) {
+      this.$store.commit("setCurrentPageName", to.name);
+      let pathArr = util.setCurrentPath(this, to.name);
+      if (pathArr.length > 2) {
+        this.$store.commit("addOpenSubmenu", pathArr[1].name);
+      }
+      this.checkTag(to.name);
+      localStorage.currentPageName = to.name;
+    },
+    lang() {
+      util.setCurrentPath(this, this.$route.name); // 在切换语言时用于刷新面包屑
+    },
+  },
+  mounted() {
+    this.init();
+    let that = this;
+    this.resize();
+    window.addEventListener("resize", function () {
+      that.resize();
+    });
+  },
+  created() {
+    // 显示打开的页面的列表
+    this.$store.commit("setOpenedList");
+  },
+};
+</script>
diff --git a/manager/src/views/change-password/change-password.vue b/manager/src/views/change-password/change-password.vue
new file mode 100644
index 00000000..4af0116b
--- /dev/null
+++ b/manager/src/views/change-password/change-password.vue
@@ -0,0 +1,168 @@
+
+
+<template>
+  <div>
+    <Card class="change-pass">
+      <p slot="title">
+        <Icon type="key"></Icon>
+        修改密码
+      </p>
+      <div>
+        <Form ref="editPasswordForm" :model="editPasswordForm" :label-width="100" label-position="right" :rules="passwordValidate" style="width:450px">
+          <FormItem label="原密码" prop="oldPass">
+            <Input type="password" v-model="editPasswordForm.oldPassword" placeholder="请输入现在使用的密码"></Input>
+          </FormItem>
+          <FormItem label="新密码" prop="newPass">
+            <SetPassword  v-model="editPasswordForm.newPassword" @on-change="changeInputPass" />
+          </FormItem>
+          <FormItem label="确认新密码" prop="rePass">
+            <Input type="password" v-model="editPasswordForm.rePassword" placeholder="请再次输入新密码"></Input>
+          </FormItem>
+          <FormItem>
+            <Button type="primary" style="width: 100px;margin-right:5px" :loading="savePassLoading" @click="saveEditPass">保存
+            </Button>
+            <Button @click="cancelEditPass">取消</Button>
+          </FormItem>
+        </Form>
+      </div>
+    </Card>
+  </div>
+</template>
+
+<script>
+import SetPassword from "@/views/my-components/lili/set-password";
+import { changePass } from "@/api/index";
+
+export default {
+  name: "change-password",
+  components: {
+    SetPassword,
+  },
+  data() {
+    const valideRePassword = (rule, value, callback) => {
+      if (value !== this.editPasswordForm.newPassword) {
+        callback(new Error("两次输入密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      savePassLoading: false,
+      editPasswordForm: {
+        oldPassword: "",
+        newPassword: "",
+        rePassword: "",
+      },
+      strength: "",
+      passwordValidate: {
+        oldPassword: [
+          {
+            required: true,
+            message: "请输入原密码",
+            trigger: "blur",
+          },
+        ],
+        newPassword: [
+          {
+            required: true,
+            message: "请输入新密码",
+            trigger: "blur",
+          },
+          {
+            min: 6,
+            message: "请至少输入6个字符",
+            trigger: "blur",
+          },
+          {
+            max: 32,
+            message: "最多输入32个字符",
+            trigger: "blur",
+          },
+        ],
+        rePassword: [
+          {
+            required: true,
+            message: "请再次输入新密码",
+            trigger: "blur",
+          },
+          {
+            validator: valideRePassword,
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    changeInputPass(v, grade, strength) {
+      this.strength = strength;
+    },
+    saveEditPass() {
+      let params = {
+        password: this.md5(this.editPasswordForm.oldPassword),
+        newPassword: this.md5(this.editPasswordForm.newPassword),
+        passStrength: this.md5(this.strength),
+      };
+      this.$refs["editPasswordForm"].validate((valid) => {
+        if (valid) {
+          this.savePassLoading = true;
+          changePass(params).then((res) => {
+            this.savePassLoading = false;
+            if (res.success) {
+              this.$Modal.success({
+                title: "修改密码成功",
+                content: "修改密码成功，需重新登录",
+                onOk: () => {
+                  this.$store.commit("logout", this);
+                  this.$store.commit("clearOpenedSubmenu");
+                  this.$router.push({
+                    name: "login",
+                  });
+                },
+              });
+            }
+          });
+        }
+      });
+    },
+    cancelEditPass() {
+      this.$store.commit("removeTag", "change_password");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      let lastPageName = "";
+      let length = this.$store.state.app.pageOpenedList.length;
+      if (length > 1) {
+        lastPageName = this.$store.state.app.pageOpenedList[length - 1].name;
+      } else {
+        lastPageName = this.$store.state.app.pageOpenedList[0].name;
+      }
+      this.$router.push({
+        name: lastPageName,
+      });
+    },
+  },
+  mounted() {},
+};
+</script>
+<style lang="scss" scoped>
+.change-pass {
+  &-btn-box {
+    margin-bottom: 10px;
+
+    button {
+      padding-left: 0;
+
+      span {
+        color: #2d8cf0;
+        transition: all 0.2s;
+      }
+
+      span:hover {
+        color: #0c25f1;
+        transition: all 0.2s;
+      }
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/distribution/dataJson.js b/manager/src/views/distribution/dataJson.js
new file mode 100644
index 00000000..c63e1456
--- /dev/null
+++ b/manager/src/views/distribution/dataJson.js
@@ -0,0 +1,49 @@
+// 分销商状态列表
+export const distributionStatusList= [
+    {
+        value:'APPLY',
+        label:'申请中'
+    },
+    {
+        value:'RETREAT',
+        label:'已清退'
+    },
+    {
+        value:'REFUSE',
+        label:'审核拒绝'
+    },
+    {
+        value:'PASS',
+        label:'审核通过'
+    },
+]
+// 分销佣金状态列表
+export const cashStatusList = [
+    {
+        value:'APPLY',
+        label:'待处理'
+    },
+    {
+        value:'REFUSE',
+        label:'拒绝'
+    },
+    {
+        value:'PASS',
+        label:'通过'
+    }
+]
+// 分销订单状态列表
+export const orderStatusList = [
+    {
+        value:'WAIT_BILL',
+        label:'待结算'
+    },
+    {
+        value:'WAIT_CASH',
+        label:'待提现'
+    },
+    {
+        value:'COMPLETE_CASH',
+        label:'提现完成'
+    }
+]
\ No newline at end of file
diff --git a/manager/src/views/distribution/distribution.vue b/manager/src/views/distribution/distribution.vue
new file mode 100644
index 00000000..5dcfd56d
--- /dev/null
+++ b/manager/src/views/distribution/distribution.vue
@@ -0,0 +1,263 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row @keydown.enter.native="handleSearch">
+                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+                          <Form-item label="会员名称" prop="memberName">
+                            <Input
+                              type="text"
+                              v-model="searchForm.memberName"
+                              placeholder="请输入会员名称"
+                              clearable
+                              style="width: 200px"
+                            />
+                          </Form-item>
+                            <Form-item label="状态">
+                                <Select v-model="searchForm.distributionStatus" style="width:200px">
+                                    <Option v-for="item in distributionStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                                </Select>
+                            </Form-item>
+                          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+                        </Form>
+                    </Row>
+                    <Row class="padding-row">
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+
+    </div>
+</template>
+
+<script>
+    import {
+        getDistributionListData,
+        retreatDistribution,
+        resumeDistribution,
+        auditDistribution,
+    } from "@/api/distribution";
+    import  {distributionStatusList}  from './dataJson.js';
+    export default {
+        name: "distribution",
+        components: {
+        },
+        data() {
+            return {
+                distributionStatusList,
+                openSearch: true, // 显示搜索
+                loading: true, // 表单加载状态
+                searchForm: { // 搜索框初始化对象
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                },
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    {
+                        title: "会员名称",
+                        key: "memberName",
+                        minWidth: 120,
+                        tooltip: true
+                    },
+                    {
+                        title: "推广单数",
+                        key: "orderNum",
+                        minWidth: 120,
+                        width: 150,
+                    },
+                    {
+                        title: "分销金额",
+                        key: "rebateTotal",
+                        width: 150,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
+                        }
+                    },
+                    {
+                        title: "可用金额",
+                        key: "canRebate",
+                        width: 150,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
+                        }
+                    },
+                    {
+                        title: "冻结金额",
+                        key: "commissionFrozen",
+                        width: 150,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h('div', this.$options.filters.unitPrice(params.row.rebateTotal, '￥'))
+                        }
+                    },
+                    {
+                        title: "状态",
+                        key: "distributionStatus",
+                        width: 150,
+                        sortable: false,
+                        render: (h, params) => {
+                            if (params.row.distributionStatus == "PASS") {
+                                return h( "Badge", {props: { status: "success",text: "审核通过" } })
+                            } else if (params.row.distributionStatus == "APPLY") {
+                                return h( "Badge", {props: { status: "processing",text: "申请中" } })
+                            } else if (params.row.distributionStatus == "RETREAT") {
+                                return h( "Badge", {props: { status: "warning",text: "已清退" } })
+                            } else if (params.row.distributionStatus == "REFUSE") {
+                                return h( "Badge", {props: { status: "error",text: "审核拒绝" } })
+                            }
+                        }
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        fixed: "right",
+                        width: 140,
+                        render: (h, params) => {
+                            return h("div",{
+                                style:{
+                                    display:'flex',
+                                    justifyContent:'center'
+                                }
+                            },
+                            [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small"
+                                        },
+                                        style:{marginRight:'5px', display:params.row.distributionStatus!='RETREAT'?'block':'none'},
+                                        on: {
+                                            click: () => {
+                                                this.retreat(params.row);
+                                            }
+                                        }
+                                    },
+                                    "清退"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small"
+                                        },
+                                        style:{marginRight:'5px', display:params.row.distributionStatus=='RETREAT'?'block':'none'},
+                                        on: {
+                                            click: () => {
+                                                this.resume(params.row);
+                                            }
+                                        }
+                                    },
+                                    "恢复"
+                                )
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            see(v) {
+                this.$router.push({
+                    name: "distributionOrder",
+                    query: { id:v.memberId }
+                });
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+
+            clearSelectAll() { // 清空
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+
+            getDataList() {
+                this.loading = true;
+                this.searchForm.status = "PASS";
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getDistributionListData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+            },
+            // 清退分销商
+            retreat(v) {
+                this.$Modal.confirm({
+                    title: "提示",
+                    // 记得确认修改此处
+                    content: "您确认要清退 " + v.memberName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        retreatDistribution(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            // 恢复分销商
+            resume(v){
+                this.$Modal.confirm({
+                    title: '提示',
+                    // 记得确认修改此处
+                    content: "您确认要恢复 " + v.memberName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        resumeDistribution(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/distribution/distributionApply.vue b/manager/src/views/distribution/distributionApply.vue
new file mode 100644
index 00000000..1d6a7375
--- /dev/null
+++ b/manager/src/views/distribution/distributionApply.vue
@@ -0,0 +1,228 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row @keydown.enter.native="handleSearch">
+                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+                          <Form-item label="会员名称" prop="memberName">
+                            <Input
+                              type="text"
+                              v-model="searchForm.memberName"
+                              placeholder="请输入会员名称"
+                              clearable
+                              style="width: 200px"
+                            />
+                          </Form-item>
+                          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+                        </Form>
+                    </Row>
+                    <Row style="margin-top: 10px">
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
+                              size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+    </div>
+</template>
+
+<script>
+    import {
+        getDistributionListData,
+        auditDistribution
+    } from "@/api/distribution";
+
+    export default {
+        name: "distributionApply",
+        components: {},
+        data() {
+            return {
+                loading: true, // 表单加载状态
+                searchForm: { // 搜索框初始化对象
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                    startDate: "", // 起始时间
+                    endDate: "" // 终止时间
+                },
+                selectDate: null,
+                form: { // 添加或编辑表单对象初始化数据
+                    memberName: "",
+                },
+                // 表单验证规则
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    {
+                        title: "会员名称",
+                        key: "memberName",
+                        minWidth: 150,
+                        tooltip: true,
+                    },
+                  {
+                    title: "会员姓名",
+                    key: "name",
+                    minWidth: 120,
+                  },
+                    {
+                        title: "提交时间",
+                        key: "createTime",
+                        minWidth: 150,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        fixed: "right",
+                        width: 200,
+                        render: (h, params) => {
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small",
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.audit(params.row, "PASS");
+                                            }
+                                        }
+                                    },
+                                    "通过"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.audit(params.row, "REFUSE");
+                                            }
+                                        }
+                                    },
+                                    "拒绝"
+                                )
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.selectDate = null;
+                this.searchForm.startDate = "";
+                this.searchForm.endDate = "";
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            selectDateRange(v) {
+                if (v) {
+                    this.searchForm.startDate = v[0];
+                    this.searchForm.endDate = v[1];
+                }
+            },
+            getDataList() {
+                this.loading = true;
+                this.searchForm.distributionStatus = "APPLY";
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getDistributionListData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                // 以下为模拟数据
+                //this.data = [
+                //];
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            //审核
+            audit(v, status) {
+                let test = "拒绝"
+                if (status == "PASS") {
+                    test = "通过"
+                }
+                let params = {
+                    status : status
+                }
+                this.$Modal.confirm({
+                    title: "确认" + test,
+                    // 记得确认修改此处
+                    content: "您确认要" + test + " " + v.memberName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        auditDistribution(v.id, params).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue
new file mode 100644
index 00000000..d96d75a0
--- /dev/null
+++ b/manager/src/views/distribution/distributionCash.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch" >
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Input class="search-input" v-model="searchForm.memberName">
+                <span slot="prepend">会员名称</span>
+              </Input>
+              <Input class="search-input" v-model="searchForm.sn">
+                <span slot="prepend">编号</span>
+              </Input>
+              <Form-item label="状态" style="margin-left: -20px">
+                <Select v-model="searchForm.distributionCashStatus" style="width:150px;">
+                    <Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+                </Select>
+              </Form-item>
+              <Form-item style="margin-left:-35px;" class="br">
+                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+              </Form-item>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page padding-row">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >
+      <FormItem label="编号">
+          <Input disabled v-model="form.sn" clearable style="width:100%"/>
+        </FormItem>
+        <FormItem label="会员名称">
+          <Input disabled v-model="form.distributionName" clearable style="width:100%"/>
+        </FormItem>
+        <FormItem label="金额">
+          <Input disabled v-model="form.price" clearable style="width:100%"/>
+        </FormItem>
+        <FormItem label="是否通过" prop="result" v-if="handleStatus =='edit'">
+             <RadioGroup v-model="result">
+                 <Radio :key=0 :label=0>通过</Radio>
+                 <Radio :key=-1 :label=-1>拒绝</Radio>
+             </RadioGroup>
+        </FormItem>
+      </Form>
+      <div slot="footer" v-if="handleStatus == 'edit'">
+        <Button type="text" @click="modalVisible=false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+        getDistributionCash,
+        auditDistributionCash
+    } from "@/api/distribution";
+// import { parse } from 'date-fns';
+import {cashStatusList} from './dataJson'
+export default {
+  name: "distributionCash",
+  components: {
+  },
+  data() {
+    return {
+      cashStatusList, // 状态列表
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      result: -1,
+      searchForm: { // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      handleStatus:'edit',// 判断是编辑还是查看
+      form: { // 添加或编辑表单对象初始化数据
+        sn: "",
+        memberName: "",
+        price: "",
+      },
+      auditForm: {
+        result: -1
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "编号",
+          key: "sn",
+          minWidth: 200
+        },
+        {
+          title: "会员名称",
+          key: "distributionName",
+          minWidth: 120
+        },
+        {
+          title: "申请金额",
+          key: "price",
+          minWidth: 90,
+           render: (h, params) => {
+              if (params.row.price) {
+                  return h("div", this.$options.filters.unitPrice(params.row.price,'￥'));
+                }
+              }
+        },
+        {
+          title: "申请时间",
+          key: "createTime",
+          minWidth: 130
+        },
+        {
+          title: "处理时间",
+          key: "payTime",
+          minWidth: 130
+        },
+        {
+          title: "状态",
+          key: "distributionCashStatus",
+          minWidth: 100,
+          render: (h, params) => {
+              if (params.row.distributionCashStatus == 'APPLY') {
+                   return h("div", "待处理");
+              }
+              if (params.row.distributionCashStatus == 'PASS') {
+                   return h("div", "通过");
+              }
+              if (params.row.distributionCashStatus == 'REFUSE') {
+                   return h("div", "审核拒绝");
+              }
+            },
+         },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 130,
+          render: (h, params) => {
+            if(params.row.distributionCashStatus != 'APPLY'){
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "success",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px"
+                      },
+                      on: {
+                        click: () => {
+                          this.view(params.row);
+                        }
+                      }
+                    },
+                    "查看"
+                  ),
+
+                ]);
+            }else {
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "primary",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px"
+                      },
+                      on: {
+                        click: () => {
+                          this.edit(params.row);
+                        }
+                      }
+                    },
+                    "审核"
+                  ),
+
+                ]);
+            }
+          }
+        }
+      ],
+      data: [], // 表单数据
+      total: 0 // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getDistributionCash(this.searchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      let result = "拒绝"
+      if(this.result == 0){
+        result = "通过"
+      }
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.$Modal.confirm({
+            title: "确认审核",
+            content: "您确认要审核"+result+"么?",
+            loading: true,
+            onOk: () => {
+                this.auditForm.result = this.result;
+                auditDistributionCash(this.form.id,this.auditForm).then(res => {
+                    if (res.success) {
+                      this.$Modal.remove();
+                      this.$Message.success("审核成功");
+                      this.getDataList();
+                      this.modalVisible = false;
+                    }
+                });
+            }
+          })
+        }
+      });
+    },
+    edit(v) {
+      this.modalTitle = "审核";
+      this.handleStatus = 'edit';
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    view(v){
+      this.modalTitle = "查看";
+      this.handleStatus = 'view';
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue
new file mode 100644
index 00000000..98a8960c
--- /dev/null
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -0,0 +1,283 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  placeholder="请输入商品名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="operation" style="margin-top: 10px">
+            <Button @click="delAll">批量删除</Button>
+          </Row>
+          <Row>
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import {
+        getDistributionGoods,
+        delDistributionGoods
+    } from "@/api/distribution";
+import {getShopListData} from '@/api/shops'
+export default {
+  name: "distributionGoods",
+  components: {
+  },
+  data() {
+    return {
+      shopList:[], // 店铺列表
+      loading: true, // 表单加载状态
+      searchForm: { // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "商品图片",
+          key: "thumbnail",
+          width: 120,
+          align: "center",
+                    render: (h, params) => {
+                      return h("img", {
+                        attrs: {
+                          src: params.row.thumbnail,
+                          alt: "加载图片失败"
+                        },
+                        style: {
+                          cursor: "pointer",
+                          width: "80px",
+                          height: "60px",
+                          margin: "10px 0",
+                          "object-fit": "contain"
+                        }
+                      });
+                    }
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 200,
+          tooltip: true
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 100,
+          render: (h, params) => {
+            return h("div", this.$options.filters.unitPrice(params.row.price,'￥'));
+          }
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 80
+        },
+        {
+          title: "添加时间",
+          key: "createTime",
+          width: 170
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+            title: "佣金金额",
+            key: "commission",
+            minWidth: 120,
+            sortable: false,
+            render: (h, params) => {
+                return h("div", this.$options.filters.unitPrice(params.row.commission,'￥'));
+            }
+
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 150,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "下架"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [], // 表单数据
+      total: 0 // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+      // this.getShopList()
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.init();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getDistributionGoods(this.searchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delDistributionGoods(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        }
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = []
+          this.selectList.forEach(item => {
+              ids.push(item.id)
+          });
+          // 批量删除
+          delDistributionGoods(ids.toString()).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        }
+      });
+    },
+    getShopList(val){
+      const params = {
+        pageNumber:1,
+        pageSize:10,
+        storeName:''
+      }
+      if(val){
+        params.storeName = val;
+      }else {
+        params.storeName = ''
+      }
+
+      getShopListData(params).then(res => {
+        this.shopList = res.result.records
+      })
+    },
+    searchChange(val){
+      this.getShopList(val)
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
new file mode 100644
index 00000000..e5e0ce13
--- /dev/null
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -0,0 +1,245 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  placeholder="请输入订单编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="分销商" prop="distributionName">
+                <Input
+                  type="text"
+                  v-model="searchForm.distributionName"
+                  placeholder="请输入分销商名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="店铺名称">
+                <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable
+                        clearable style="width: 150px">
+                  <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="订单时间">
+                <DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间"
+                            style="width: 210px"></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+
+          <Row class="padding-row">
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
+                  size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+
+  </div>
+</template>
+
+<script>
+  import {
+    getDistributionOrder
+  } from "@/api/distribution";
+  import {orderStatusList} from './dataJson'
+  import {getShopListData} from '@/api/shops'
+
+  export default {
+    name: "distributionOrder",
+    components: {},
+    data() {
+      return {
+        timeRange: [],
+        orderStatusList,
+        shopList: [], // 店铺列表
+        distributionId: this.$route.query.id,
+        openSearch: true, // 显示搜索
+        openTip: true, // 显示提示
+        loading: true, // 表单加载状态
+        searchForm: { // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        columns: [
+          {
+            title: "订单编号",
+            key: "orderSn",
+            minWidth: 120,
+            tooltip: true
+          },
+
+          {
+            title: "实付金额",
+            key: "orderPrice",
+            width: 130,
+            sortable: false,
+            render: (h, params) => {
+              if(params.row.orderPrice == null){
+                return h("div", this.$options.filters.unitPrice(0, '￥'));
+              }else{
+                return h("div", this.$options.filters.unitPrice(params.row.orderPrice, '￥'));
+              }
+
+            }
+          },
+          {
+            title: "退款金额",
+            key: "returnMoney",
+            width: 130,
+            sortable: false,
+            render: (h, params) => {
+              if(params.row.orderPrice == null){
+                return h("div", this.$options.filters.unitPrice(0, '￥'));
+              }else{
+                return h("div", this.$options.filters.unitPrice(params.row.returnMoney, '￥'));
+              }
+            }
+          },
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "分销商",
+            key: "distributionName",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "店铺名称",
+            key: "storeName",
+            minWidth: 120,
+          },
+          {
+            title: "状态",
+            key: "distributionOrderStatus",
+            width: 100,
+            sortable: false,
+            render: (h, params) => {
+              if (params.row.distributionOrderStatus == 'COMPLETE_CASH') {
+                return h('div', '提现完成')
+              } else if (params.row.distributionOrderStatus == 'WAIT_BILL') {
+                return h('div', '待结算')
+              } else if (params.row.distributionOrderStatus == 'WAIT_CASH') {
+                return h('div', '待提现')
+              }
+            }
+          },
+
+          {
+            title: "佣金金额",
+            key: "rebateGrade",
+            width: 120,
+            sortable: false,
+            render: (h, params) => {
+              if(params.row.rebateGrade == null){
+                return h("div", this.$options.filters.unitPrice(0, '￥'));
+              }else{
+                return h("div", this.$options.filters.unitPrice(params.row.rebateGrade, '￥'));
+              }
+
+            }
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            width: 180,
+            sortable: false,
+          }
+        ],
+        data: [], // 表单数据
+        total: 0 // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+        this.getShopList()
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+
+      getDataList() {
+        this.searchForm.distributionId = this.distributionId;
+        this.loading = true;
+        if (this.timeRange && this.timeRange[0]) {
+          let startTime = this.timeRange[0]
+          let endTime = this.timeRange[1]
+          this.searchForm.startTime = this.$options.filters.unixToDate(startTime / 1000)
+          this.searchForm.endTime = this.$options.filters.unixToDate(endTime / 1000)
+        }
+        console.log(this.searchForm)
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getDistributionOrder(this.searchForm).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      getShopList(val) { // 获取店铺列表
+        const params = {
+          pageNumber: 1,
+          pageSize: 10,
+          storeName: ''
+        }
+        if (val) {
+          params.storeName = val;
+        } else {
+          params.storeName = ''
+        }
+
+        getShopListData(params).then(res => {
+          this.shopList = res.result.records
+        })
+      },
+      searchChange(val) { // 店铺搜索，键盘点击回调
+        this.getShopList(val)
+      }
+    },
+    mounted() {
+      this.init();
+    },
+    watch: {
+      $route(e) {
+        this.distributionId = e.query.id ? e.query.id : undefined;
+        this.getDataList();
+      }
+    }
+  };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+
diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue
new file mode 100644
index 00000000..42b8dca3
--- /dev/null
+++ b/manager/src/views/distribution/distributionSetting.vue
@@ -0,0 +1,77 @@
+<template>
+  <div style="background-color: #fff;">
+
+    <Form ref="form" :model="form" :label-width="120" :rules="formValidate" style="padding: 10px;">
+
+      <Divider orientation="left">分销设置</Divider>
+      <FormItem label="是否开启分销" prop="distribution">
+        <i-switch size="large" v-model="form.isOpen" :true-value="true" :false-value="false" @on-change="handleSubmit">
+          <span slot="open">开启</span>
+          <span slot="close">关闭</span>
+        </i-switch>
+      </FormItem>
+    </Form>
+  </div>
+</template>
+
+<script>
+
+  import {setSetting, getSetting} from "@/api/index";
+
+  export default {
+    name: "distributionSetting",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        selectDate: null,
+        form: { // 添加或编辑表单对象初始化数据
+          isOpen: ""
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        data: [], // 表单数据
+        total: 0 // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getSetting("DISTRIBUTION_SETTING").then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.form = res.result;
+          }
+        });
+        this.loading = false;
+      },
+      handleSubmit() {
+
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            setSetting("DISTRIBUTION_SETTING", this.form).then(res => {
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          }
+        })
+
+      }
+    },
+    mounted() {
+      this.init();
+    }
+  };
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/manager/src/views/error-page/403.vue b/manager/src/views/error-page/403.vue
new file mode 100644
index 00000000..044a03ab
--- /dev/null
+++ b/manager/src/views/error-page/403.vue
@@ -0,0 +1,128 @@
+
+<template>
+  <div class="error403">
+    <div class="error403-body-con">
+      <Card>
+        <div class="error403-body-con-title">4<span class="error403-0-span">
+            <Icon type="android-lock"></Icon>
+          </span><span class="error403-key-span">
+            <Icon size="220" type="ios-bolt"></Icon>
+          </span></div>
+        <p class="error403-body-con-message">You don't have permission</p>
+        <div class="error403-btn-con">
+          <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+          <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+        </div>
+      </Card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Error403",
+  methods: {
+    backPage() {
+      this.$router.go(-1);
+    },
+    goHome() {
+      this.$router.push({
+        name: "home_index",
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@keyframes error403animation {
+  0% {
+    transform: rotateZ(0deg);
+  }
+  40% {
+    transform: rotateZ(-20deg);
+  }
+  45% {
+    transform: rotateZ(-15deg);
+  }
+  50% {
+    transform: rotateZ(-20deg);
+  }
+  55% {
+    transform: rotateZ(-15deg);
+  }
+  60% {
+    transform: rotateZ(-20deg);
+  }
+  100% {
+    transform: rotateZ(0deg);
+  }
+}
+.error403 {
+  &-body-con {
+    width: 700px;
+    height: 500px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    &-title {
+      text-align: center;
+      font-size: 240px;
+      font-weight: 700;
+      color: #2d8cf0;
+      height: 260px;
+      line-height: 260px;
+      margin-top: 40px;
+      .error403-0-span {
+        display: inline-block;
+        position: relative;
+        width: 170px;
+        height: 170px;
+        border-radius: 50%;
+        border: 20px solid #ed3f14;
+        color: #ed3f14;
+        margin-right: 10px;
+        i {
+          display: inline-block;
+          font-size: 120px;
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+        }
+      }
+      .error403-key-span {
+        display: inline-block;
+        position: relative;
+        width: 100px;
+        height: 190px;
+        border-radius: 50%;
+        margin-right: 10px;
+        i {
+          display: inline-block;
+          font-size: 190px;
+          position: absolute;
+          left: 20px;
+          transform: translate(-50%, -60%);
+          transform-origin: center bottom;
+          animation: error403animation 2.8s ease 0s infinite;
+        }
+      }
+    }
+    &-message {
+      display: block;
+      text-align: center;
+      font-size: 30px;
+      font-weight: 500;
+      letter-spacing: 4px;
+      color: #dddde2;
+    }
+  }
+  &-btn-con {
+    text-align: center;
+    padding: 20px 0;
+    margin-bottom: 40px;
+  }
+}
+</style>
+
diff --git a/manager/src/views/error-page/404.vue b/manager/src/views/error-page/404.vue
new file mode 100644
index 00000000..eaa451ff
--- /dev/null
+++ b/manager/src/views/error-page/404.vue
@@ -0,0 +1,91 @@
+
+<template>
+    <div class="error404">
+        <div class="error404-body-con">
+            <Card>
+                <div class="error404-body-con-title">4<span><Icon type="ios-navigate-outline"></Icon></span>4</div>
+                <p class="error404-body-con-message">YOU&nbsp;&nbsp;LOOK&nbsp;&nbsp;LOST</p>
+                <div class="error404-btn-con">
+                    <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+                    <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+                </div>
+            </Card>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Error404',
+    methods: {
+        backPage () {
+            this.$router.go(-1);
+        },
+        goHome () {
+            this.$router.push({
+                name: 'home_index'
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+   @keyframes error404animation {
+    0% {
+        transform: rotateZ(0deg);
+    }
+    20% {
+        transform: rotateZ(-60deg);
+    }
+    40% {
+        transform: rotateZ(-10deg);
+    }
+    60% {
+        transform: rotateZ(50deg);
+    }
+    80% {
+        transform: rotateZ(-20deg);
+    }
+    100% {
+        transform: rotateZ(0deg);
+    }
+}
+.error404{
+    &-body-con{
+        width: 700px;
+        height: 500px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        &-title{
+            text-align: center;
+            font-size: 240px;
+            font-weight: 700;
+            color: #2d8cf0;
+            height: 260px;
+            line-height: 260px;
+            margin-top: 40px;
+            span{
+                display: inline-block;
+                color: #19be6b;
+                font-size: 230px;
+                animation: error404animation 3s ease 0s infinite alternate;
+            }
+        }
+        &-message{
+            display: block;
+            text-align: center;
+            font-size: 30px;
+            font-weight: 500;
+            letter-spacing: 12px;
+            color: #dddde2;
+        }
+    }
+    &-btn-con{
+        text-align: center;
+        padding: 20px 0;
+        margin-bottom: 40px;
+    }
+}
+</style>
diff --git a/manager/src/views/error-page/500.vue b/manager/src/views/error-page/500.vue
new file mode 100644
index 00000000..f947f0b5
--- /dev/null
+++ b/manager/src/views/error-page/500.vue
@@ -0,0 +1,107 @@
+
+
+<template>
+    <div class="error500">
+        <div class="error500-body-con">
+            <Card>
+                <div class="error500-body-con-title">
+                    5<span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span><span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span>
+                </div>
+                <p class="error500-body-con-message">Oops! the server is wrong</p>
+                <div class="error500-btn-con">
+                    <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+                    <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+                </div>
+            </Card>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Error500',
+    methods: {
+        backPage () {
+            this.$router.go(-1);
+        },
+        goHome () {
+            this.$router.push({
+                name: 'home_index'
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+   @keyframes error500animation {
+    0% {
+        transform: rotateZ(0deg);
+    }
+    20% {
+        transform: rotateZ(-10deg);
+    }
+    40% {
+        transform: rotateZ(5deg);
+    }
+    60% {
+        transform: rotateZ(-5deg);
+    }
+    80% {
+        transform: rotateZ(10deg);
+    }
+    100% {
+        transform: rotateZ(0deg);
+    }
+}
+.error500{
+    &-body-con{
+        width: 700px;
+        height: 500px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        &-title{
+            text-align: center;
+            font-size: 240px;
+            font-weight: 700;
+            color: #2d8cf0;
+            height: 260px;
+            line-height: 260px;
+            margin-top: 40px;
+            .error500-0-span{
+                display: inline-block;
+                position: relative;
+                width: 170px;
+                height: 170px;
+                border-radius: 50%;
+                border: 20px solid #ed3f14;
+                color: #ed3f14;
+                margin-right: 10px;
+                i{
+                    display: inline-block;
+                    font-size: 120px;
+                    position: absolute;
+                    bottom: -10px;
+                    left: 10px;
+                    transform-origin: center bottom;
+                    animation: error500animation 3s ease 0s infinite alternate;
+                }
+            }
+        }
+        &-message{
+            display: block;
+            text-align: center;
+            font-size: 30px;
+            font-weight: 500;
+            letter-spacing: 4px;
+            color: #dddde2;
+        }
+    }
+    &-btn-con{
+        text-align: center;
+        padding: 20px 0;
+        margin-bottom: 40px;
+    }
+}
+</style>
diff --git a/manager/src/views/goods-unit/index.vue b/manager/src/views/goods-unit/index.vue
new file mode 100644
index 00000000..1c658d97
--- /dev/null
+++ b/manager/src/views/goods-unit/index.vue
@@ -0,0 +1,340 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch"> </Row>
+          <Row class="operation">
+            <Button @click="add" type="primary" >添加</Button>
+
+            <Button @click="delAll">批量删除</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="计量单位" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  addGoodsUnit,
+  getGoodsUnitPage,
+  updateGoodsUnit,
+  delGoodsUnit, delSensitive,
+} from "@/api/index";
+export default {
+  name: "bill",
+  components: {},
+  data() {
+    return {
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        name: "",
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        name: [
+          {
+            required: true,
+            message: "请输入计量单位",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "计量单位",
+          key: "name",
+          minWidth: 120
+        },
+
+        {
+          title: "创建时间",
+          key: "createTime",
+          width: 180
+        },
+        {
+          title: "更新时间",
+          key: "updateTime",
+          width: 180
+        },
+        {
+          title: "操作人",
+          key: "createBy",
+          minWidth: 150
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "修改"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+
+      getGoodsUnitPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+
+          if (this.modalType == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            addGoodsUnit(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            updateGoodsUnit(this.id, this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.form = {};
+      this.$refs.form.resetFields();
+
+      this.modalVisible = true;
+    },
+    detail(v) {
+      this.modalType = 1;
+      this.id = v.id;
+      this.modalTitle = "修改";
+      this.modalVisible = true;
+      this.form.name = v.name;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delGoodsUnit(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          delGoodsUnit(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+ @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/goods/goods-industry-statistics/index.vue b/manager/src/views/goods/goods-industry-statistics/index.vue
new file mode 100644
index 00000000..a700b051
--- /dev/null
+++ b/manager/src/views/goods/goods-industry-statistics/index.vue
@@ -0,0 +1,240 @@
+<template>
+  <Card>
+    <Form
+    label-position="left"
+      ref="searchForm"
+      :model="params"
+      inline
+      :label-width="100"
+      class="search-form"
+    >
+      <Form-item label="选择店铺" prop="sn">
+        <span class="tips" v-if="storeName"
+          >{{ storeName }}
+          <Button
+            @click="
+              () => {
+                storeName = '';
+                params.shopId = '';
+              }
+            "
+            type="text"
+            >清空</Button
+          >
+        </span>
+        <Button size="small" @click="handleClickShop" type="primary"
+          >选择店铺</Button
+        >
+      </Form-item>
+      <Form-item label="选择会员" prop="sn">
+        <span class="tips" v-if="memberName"
+          >{{ memberName }}
+          <Button
+            @click="
+              () => {
+                memberName = '';
+                params.memberId = '';
+              }
+            "
+            type="text"
+            >清空</Button
+          >
+        </span>
+        <Button size="small" @click="handleClickMember" type="primary"
+          >选择会员</Button
+        >
+      </Form-item>
+      <Form-item label="选择时间类型" prop="sn">
+        <Select v-model="params.timeType" style="width: 200px">
+          <Option
+            v-for="item in typeList"
+            :value="item.value"
+            :key="item.value"
+            >{{ item.label }}</Option
+          >
+        </Select>
+      </Form-item>
+      <Form-item label="按年查询" prop="sn">
+        <DatePicker
+          type="year"
+          placeholder="Select year"
+          style="width: 200px"
+          v-model="year"
+        ></DatePicker>
+      </Form-item>
+      <Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
+        <InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
+      </Form-item>
+    </Form>
+
+    <Tabs v-model="orderStatus" @on-click="handleClickType">
+      <TabPane label="行业订单数量" name="NUM">
+        <Table :columns="columns" :data="data"></Table>
+
+      </TabPane>
+      <TabPane label="行业订单金额" name="PRICE">
+        <Table :columns="columns" :data="data"></Table>
+
+      </TabPane>
+    </Tabs>
+
+    <Modal v-model="modalFlag" width="1200" :title="selectName">
+      <!-- 店铺 -->
+      <shopLayout v-if="shopFlag" @callback="callbackShop" ref="shops" />
+      <!-- 会员 -->
+      <memberLayout v-else @callback="callbackMember" ref="members" />
+    </Modal>
+  </Card>
+</template>
+<script>
+import shopLayout from "@/views/seller/shop/shopList";
+import memberLayout from "@/views/member/list/index";
+import * as API_Goods from "@/api/goods";
+export default {
+  components: {
+    shopLayout,
+    memberLayout,
+  },
+  data() {
+    return {
+      storeName: "",
+      memberName: "",
+      shopFlag: false,
+      selectName: "选择",
+      modalFlag: false,
+      priceData: "",
+      orderStatus: "NUM",
+
+      shopList: {},
+      memberList: {},
+
+      typeList: [
+        {
+          value: "YEAR",
+          label: "年",
+        },
+        {
+          value: "MONTH",
+          label: "月",
+        },
+      ],
+      total: 0,
+      year:"",
+      params: {
+
+        type: "PRICE",
+        timeType: "YEAR",
+        pageNumber: 1,
+        pageSize: 10,
+        year: "",
+        shopId: "",
+        memberId: "",
+      },
+      columns: [
+        {
+          title: "商品一级分类",
+          key: "categoryName",
+        },
+        {
+          title: "销售数量",
+          key: "num",
+        },
+        {
+          title: "销售金额",
+          key: "price",
+        },
+      ],
+      data: [],
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        this.init();
+      },
+      deep: true,
+    },
+    year(val) {
+      this.params.year = new Date(val).getFullYear();
+    },
+  },
+  methods: {
+    // 选择店铺
+    handleClickShop() {
+      this.modalFlag = true;
+      this.selectName += "店铺";
+      this.shopFlag = true;
+      this.$nextTick(() => {
+        this.$refs.shops.selectedShop = true;
+      });
+    },
+    // 选择会员
+    handleClickMember() {
+      this.modalFlag = true;
+      this.selectName += "会员";
+      this.$nextTick(() => {
+        this.$refs.members.selectedMember = true;
+      });
+    },
+
+    callbackMember(val) {
+      this.memberName = val.username;
+      this.params.memberId = val.id;
+      this.modalFlag = false;
+    },
+
+    callbackShop(val) {
+      this.storeName = val.storeName;
+      this.params.shopId = val.id;
+      this.modalFlag = false;
+    },
+
+    // 点击分页
+    changePage(index) {
+      this.params.pageNumber = index;
+    },
+
+    handleClickType(name) {
+      this.params.type = name;
+    },
+    init(name) {
+      Promise.all([
+        API_Goods.goodsCategoryStatistics(this.params),
+      ]).then((res) => {
+        if (res[0].result) {
+          this.data = res[0].result;
+        }
+
+      });
+    },
+  },
+  mounted() {
+   let data = new Date();
+
+    this.year = data;
+    this.year && this.params.month
+      ? this.timeType == "MONTH"
+      : this.timeType == "YEAR";
+  },
+};
+</script>
+<style scoped lang="scss">
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+.order-col {
+  display: flex;
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+.order-list {
+  display: flex;
+}
+.tips {
+  margin: 0 8px;
+}
+</style>
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
new file mode 100644
index 00000000..d68713c7
--- /dev/null
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -0,0 +1,451 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  placeholder="请输入商品名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="商品编号" prop="sn">
+                <Input
+                  type="text"
+                  v-model="searchForm.sn"
+                  placeholder="请输入商品编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="状态" prop="status">
+                <Select
+                  v-model="searchForm.marketEnable"
+                  placeholder="请选择"
+                  clearable
+                  style="width: 200px"
+                >
+                  <Option value="UPPER">上架</Option>
+                  <Option value="DOWN">下架</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin: 5px 0px;height: 80px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.original" style="height: 60px;margin-top: 1px;width: 60px">
+                  </div>
+
+                  <div style="margin-left: 13px;">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="underForm"
+        :model="underForm"
+        :label-width="100"
+        :rules="formValidate"
+      >
+        <FormItem label="下架原因" prop="reason">
+          <Input v-model="underForm.reason" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="lower(form.id)"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
+export default {
+  name: "goods",
+  components: {},
+  data() {
+    return {
+      id: "", //要操作的id
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      underForm: {
+        reason: "",
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        goodsName: "",
+        sn: "",
+        marketEnable: "",
+        price: "",
+        sellerName: "",
+      },
+      // 表单验证规则
+
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 180,
+          slot: "goodsSlot",
+        },
+        {
+          title: "商品编号",
+          key: "sn",
+          minWidth: 150,
+          tooltip: true
+        },
+        {
+          title: "成本价",
+          key: "price",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.cost, "￥")
+            );
+          },
+        },
+        {
+          title: "价格",
+          key: "price",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "状态",
+          key: "marketEnable",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.marketEnable == "DOWN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "下架",
+                  },
+                }),
+              ]);
+            } else if (params.row.marketEnable == "UPPER") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "上架",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+        {
+          title: "审核状态",
+          key: "isAuth",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.isAuth == "TOBEAUDITED") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "待审核",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "PASS") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "审核通过",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "REFUSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核拒绝",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 100,
+          tooltip: true
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 150,
+          render: (h, params) => {
+            if (params.row.marketEnable == "DOWN") {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.upper(params.row);
+                      },
+                    },
+                  },
+                  "上架"
+                ), h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.showDetail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                )
+              ]);
+            } else {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "下架"
+                ), h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.showDetail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                )
+              ]);
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据
+      getGoodsListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.records) {
+          this.data = res.records;
+          this.total = res.total;
+        }
+      });
+    },
+    edit(v) {
+      this.id = v.id;
+      if (v.underMessage != "{}") {
+        this.underForm.reason = v.underMessage;
+      }
+
+      this.modalType = 1;
+      this.modalTitle = "下架操作";
+      this.modalVisible = true;
+    },
+    lower(id) {
+      lowGoods(this.id, this.underForm).then((res) => {
+        this.$Modal.remove();
+        if (res.success) {
+          this.$Message.success("操作成功");
+          this.modalVisible = false;
+          this.getDataList();
+        }
+      });
+    },
+    upper(v) {
+      this.$Modal.confirm({
+        title: "确认上架",
+        content: "您确认要上架 " + v.goodsName + " ?",
+        loading: true,
+        onOk: () => {
+          upGoods(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+
+    //查看商品详情
+    showDetail(v) {
+      let id = v.id;
+      this.$router.push({
+        name: "goods-detail",
+        query: { id: id },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue
new file mode 100644
index 00000000..68894165
--- /dev/null
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  placeholder="请输入商品名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="商品编号" prop="sn">
+                <Input
+                  type="text"
+                  v-model="searchForm.sn"
+                  placeholder="请输入商品编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 80px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.original" style="height: 60px;margin-top: 3px;width: 60px">
+                  </div>
+
+                  <div style="margin-left: 13px">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import {authGoods, getAuthGoodsListData} from "@/api/goods";
+
+  export default {
+    name: "goods",
+    components: {},
+    data() {
+      return {
+        id: "", //要操作的id
+        loading: true, // 表单加载状态
+        modalType: 0, // 添加或编辑标识
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "create_time", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        underForm: {
+          reason: "",
+        },
+        goodsAuditForm: {
+          is_auth: 1,
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          goodsName: "",
+          sn: "",
+          marketEnable: "",
+          price: "",
+          sellerName: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 180,
+            slot: "goodsSlot",
+            tooltip: true
+          },
+          {
+            title: "商品编号",
+            key: "sn",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            title: "成本价",
+            key: "price",
+            minWidth: 130,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.cost, "￥")
+              );
+            },
+          },
+          {
+            title: "价格",
+            key: "price",
+            minWidth: 130,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.price, "￥")
+              );
+            },
+          },
+          {
+            title: "审核状态",
+            key: "isAuth",
+            minWidth: 130,
+            render: (h, params) => {
+              if (params.row.isAuth == "TOBEAUDITED") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "待审核",
+                    },
+                  }),
+                ]);
+              } else if (params.row.isAuth == "PASS") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "审核通过",
+                    },
+                  }),
+                ]);
+              } else if (params.row.isAuth == "REFUSE") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "审核拒绝",
+                    },
+                  }),
+                ]);
+              }
+            },
+          },
+
+          {
+            title: "店铺名称",
+            key: "storeName",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 200,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.examine(params.row, 1);
+                      },
+                    },
+                  },
+                  "通过"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.examine(params.row, 2);
+                      },
+                    },
+                  },
+                  "拒绝"
+                ), h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.showDetail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                )
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据
+        this.searchForm.isAuth = 0;
+        getAuthGoodsListData(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.records) {
+            this.data = res.records;
+            this.total = res.total;
+          }
+        });
+      },
+      examine(v, isAuth) {
+        let examine = "通过";
+        this.goodsAuditForm.isAuth = "PASS";
+        if (isAuth != 1) {
+          examine = "拒绝";
+          this.goodsAuditForm.isAuth = "REFUSE";
+        }
+        this.$Modal.confirm({
+          title: "确认审核",
+          content: "您确认要审核" + examine + " " + v.goodsName + " ?",
+          loading: true,
+          onOk: () => {
+            authGoods(v.id, this.goodsAuditForm).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("审核成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+
+
+      //查看商品详情
+      showDetail(v) {
+        let id = v.id;
+        this.$router.push({
+          name: "goods-detail",
+          query: { id: id },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/goods/goods-info/goodsDetail.scss b/manager/src/views/goods/goods-info/goodsDetail.scss
new file mode 100644
index 00000000..bf0bfa1e
--- /dev/null
+++ b/manager/src/views/goods/goods-info/goodsDetail.scss
@@ -0,0 +1,381 @@
+/*选择商品品类*/
+.content-goods-publish {
+  padding: 15px;
+  padding-bottom: 50px;
+  margin: 0 auto;
+  text-align: center;
+  border: 1px solid #ddd;
+  background: none repeat 0 0 #fff;
+
+  /*商品品类*/
+  .goods-category {
+    text-align: left;
+    padding: 10px;
+    background: #fafafa;
+    border: 1px solid #e6e6e6;
+
+    ul {
+      padding: 8px 4px 8px 8px;
+      list-style: none;
+      width: 300px;
+      background: none repeat 0 0 #fff;
+      border: 1px solid #e6e6e6;
+      display: inline-block;
+      letter-spacing: normal;
+      margin-right: 15px;
+      vertical-align: top;
+      word-spacing: normal;
+
+      li {
+        line-height: 20px;
+        padding: 5px;
+        cursor: pointer;
+        color: #333;
+        font-size: 12px;
+        display: flex;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  /** 当前品类被选中的样式 */
+  .activeClass {
+    background-color: #d9edf7;
+    border: 1px solid #bce8f1;
+    color: #3a87ad;
+  }
+
+  /*!*当前选择的商品品类文字*!*/
+  .current-goods-category {
+    text-align: left;
+    padding: 10px;
+    width: 100%;
+    border: 1px solid #fbeed5;
+    color: #c09853;
+    background-color: #fcf8e3;
+    margin: 10px auto;
+    padding: 8px 35px 8px 14px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    font-weight: bold;
+  }
+}
+
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    text-align: left;
+  }
+}
+
+/*平铺*/
+div.base-info-item>div {
+  margin-left: 5%;
+}
+
+div.base-info-item {
+
+  h4 {
+    margin-bottom: 10px;
+    padding: 0 10px;
+    border: 1px solid #ddd;
+    background-color: #f8f8f8;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+    line-height: 40px;
+    text-align: left;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 80px;
+
+
+    .layout {
+      margin-bottom: 20px;
+
+      .sku-item-content {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: center;
+        width: 100%;
+
+        .sku-item-content-name {
+          display: flex;
+          align-items: flex-start;
+          width: 100%;
+        }
+      }
+
+    }
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .form-item-view-bottom {
+    margin-bottom: 50px;
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+  /deep/ .el-collapse-item__header {
+    text-align: left;
+    background-color: #f8f8f8;
+    padding: 0 10px;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+  }
+
+  .el-form-item {
+    margin-left: 5%;
+    width: 25%;
+  }
+
+  /deep/ .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 12%;
+    text-align: left;
+    color: #999;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding: 10px 0;
+    text-align: left;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 88.7%;
+  padding: 10px;
+  background-color: #ffc;
+  position: fixed;
+  bottom: 0px;
+  left: 10%;
+  text-align: center;
+  z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.step-view {
+  width: 33%;
+  height: 40px;
+  font-size: 19px;
+  text-align: center;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+}
+
+.add-sku-btn {
+  margin-top: 10px;
+}
+
+.sku-item:not(:first-child) {
+  margin-top: 10px;
+  
+}
+
+.sku-upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
+  margin-right: 4px;
+}
+
+.preview-picture {
+  width: 100%;
+  margin: 0 auto;
+  display: block;
+  // text-align: center;
+  border: 1px solid transparent;
+  // justify-self: center;
+  // align-self: center;
+}
+
+.preview-picture img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, .6);
+}
+
+.sku-upload-list:hover .sku-upload-list-cover {
+  display: block;
+}
+
+.sku-upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+
+.demo-upload-list{
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  margin-right: 4px;
+}
+.demo-upload-list img{
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover{
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0,0,0,.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover{
+  display: block;
+}
+.demo-upload-list-cover i{
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
\ No newline at end of file
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
new file mode 100644
index 00000000..5653d27a
--- /dev/null
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <Form
+      :label-width="120"
+    >
+      <div class="content-goods-publish">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="商品分类">
+              <span v-for="item in goods.categoryName"> {{ item }} > </span>
+            </FormItem>
+            <FormItem label="商品名称" prop="goodsName">
+              {{ goods.goodsName }}
+            </FormItem>
+
+            <FormItem label="商品卖点" prop="sellingPoint">
+              {{ goods.sellingPoint }}
+            </FormItem>
+<!--            <FormItem label="商品品牌" prop="brandId">-->
+<!--              {{ goods.brandId }}-->
+<!--            </FormItem>-->
+          </div>
+          <h4>商品交易信息</h4>
+          <div class="form-item-view">
+            <FormItem
+              class="form-item-view-el"
+              label="计量单位"
+              prop="goodsUnit"
+            > {{ goods.goodsUnit }}
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="销售模式"
+              prop="salesModel"
+            >
+              {{ goods.salesModel === 'RETAIL' ? '零售型' : '批发型' }}
+            </FormItem>
+          </div>
+          <h4>商品规格及图片</h4>
+          <div class="form-item-view">
+            <FormItem label="商品编号" prop="sn">
+              {{ goods.sn }}
+            </FormItem>
+            <FormItem label="商品价格" prop="price">
+              ¥{{ goods.price | unitPrice }}
+            </FormItem>
+            <FormItem label="市场价格" prop="cost">
+
+              ¥{{ goods.cost | unitPrice }}
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="商品图片"
+              prop="goodsGalleryFiles"
+            >
+
+              <div
+                class="demo-upload-list"
+                v-for="(item, __index) in goods.goodsGalleryList"
+                :key="__index"
+              >
+                <img :src="item"/>
+                <div class="demo-upload-list-cover">
+                  <Icon
+                    type="ios-eye-outline"
+                    @click.native="handleViewGoodsPicture(item)"
+                  ></Icon>
+                </div>
+
+                <Modal title="View Image" v-model="goodsPictureVisible">
+                  <img
+                    :src="previewGoodsPicture"
+                    v-if="goodsPictureVisible"
+                    style="width: 100%"
+                  />
+                </Modal>
+              </div>
+
+
+            </FormItem>
+
+
+            <FormItem
+              class="form-item-view-el"
+              label="商品规格"
+            >
+
+              <Table :columns="skuColumn" :data="skuData">
+
+                <!-- 商品栏目格式化 -->
+                <template slot="showImage" slot-scope="scope">
+
+                  <div style="margin-top: 5px;height: 80px; display: flex;">
+                    <div style="">
+                      <img :src="scope.row.image" style="height: 60px;margin-top: 1px;width: 60px">
+                    </div>
+                  </div>
+                </template>
+              </Table>
+
+            </FormItem>
+
+
+          </div>
+          <h4>商品详情描述</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el" label="商品描述" prop="intro">
+              <div v-html="goods.intro"></div>
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="移动端描述"
+              prop="skuList"
+            >
+              <div v-html="goods.mobileIntro"></div>
+            </FormItem>
+          </div>
+          <h4>商品物流信息</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el" label="商品重量" prop="weight">
+              <Input v-model="goods.weight">
+                <span slot="append">kg</span>
+              </Input>
+            </FormItem>
+          </div>
+        </div>
+      </div>
+    </Form>
+  </div>
+</template>
+
+<script>
+
+import {getGoodsDetail} from "@/api/goods";
+
+export default {
+
+  name: "goodsDetail",
+  data() {
+    return {
+      goods: '',
+      previewGoodsPicture: '',
+      goodsPictureVisible: false,
+      skuColumn: [
+        {
+          title: '规格',
+          key: 'specs'
+        },
+        {
+          title: '编号',
+          key: 'sn'
+        },
+        {
+          title: '重量',
+          key: 'weight'
+        },
+        {
+          title: '成本',
+          key: 'cost'
+        },
+        {
+          title: '价格',
+          key: 'price'
+        },
+        {
+          title: '图片',
+          slot: "showImage",
+        }
+      ],
+      skuData: []
+    }
+  },
+  mounted() {
+    this.initGoods(this.$route.query.id);
+  }
+  ,
+  methods: {
+    initGoods(id) {
+      getGoodsDetail(id).then(res => {
+        this.goods = res.result;
+        let that = this
+        res.result.skuList.forEach(function (sku, index, array) {
+          console.log(sku)
+          that.skuData.push({
+            'specs': sku.goodsName,
+            'sn': sku.sn,
+            'weight': sku.weight,
+            'cost': that.$options.filters.unitPrice(sku.cost, "¥"),
+            'price': that.$options.filters.unitPrice(sku.price, "¥"),
+            'image': sku.thumbnail,
+          });
+        })
+        console.warn(this.skuData)
+
+      });
+    }
+    ,
+
+    handleViewGoodsPicture(url) {
+      this.previewGoodsPicture = url;
+      this.goodsPictureVisible = true;
+    }
+    ,
+  }
+  ,
+
+}
+;
+</script>
+
+<style lang="scss" soped>
+@import "./goodsDetail.scss";
+
+.ivu-table table {
+  width: 100% !important;
+}
+
+</style>
diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue
new file mode 100644
index 00000000..d58607a8
--- /dev/null
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -0,0 +1,403 @@
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="品牌名称" prop="name">
+                <Input
+                  type="text"
+                  v-model="searchForm.name"
+                  placeholder="请输入品牌名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="operation padding-row">
+            <Button @click="add" type="primary">添加</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="品牌名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="品牌图标" prop="logo">
+          <upload-pic-input
+            v-model="form.logo"
+            style="width: 100%"
+          ></upload-pic-input>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {getManagerBrandPage, addBrand, disableBrand} from "@/api/goods";
+  import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+  export default {
+    name: "brand",
+    components: {
+      uploadPicInput,
+    },
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "create_time", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          name: "",
+          logo: "",
+          deleteFlag: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "品牌名称",
+            key: "name",
+            width: 200,
+            resizable: true,
+            sortable: false,
+          },
+          {
+            title: "品牌图标",
+            key: "logo",
+            align: "left",
+            render: (h, params) => {
+              return h("img", {
+                attrs: {
+                  src: params.row.logo,
+                  alt: "加载图片失败",
+                },
+                style: {
+                  cursor: "pointer",
+                  width: "80px",
+                  height: "60px",
+                  margin: "10px 0",
+                  "object-fit": "contain",
+                },
+              });
+            },
+          },
+          {
+            title: "状态",
+            key: "deleteFlag",
+            align: "left",
+            render: (h, params) => {
+              if (params.row.deleteFlag == 0) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "启用",
+                    },
+                  }),
+                ]);
+              } else if (params.row.deleteFlag == 1) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "禁用",
+                    },
+                  }),
+                ]);
+              }
+            },
+            filters: [
+              {
+                label: "启用",
+                value: 0,
+              },
+              {
+                label: "禁用",
+                value: 1,
+              },
+            ],
+            filterMultiple: false,
+            filterMethod(value, row) {
+              if (value == 0) {
+                return row.deleteFlag == 0;
+              } else if (value == 1) {
+                return row.deleteFlag == 1;
+              }
+            },
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 180,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              let enableOrDisable = "";
+              if (params.row.deleteFlag == 0) {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                      type: "error",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.disable(params.row);
+                      },
+                    },
+                  },
+                  "禁用"
+                );
+              } else {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.enable(params.row);
+                      },
+                    },
+                  },
+                  "启用"
+                );
+              }
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "编辑"
+                ),
+                enableOrDisable,
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getManagerBrandPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            console.warn(12)
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            if (this.modalType === 0) {
+              // 添加 避免编辑后传入id等数据 记得删除
+              delete this.form.id;
+              addBrand(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            } else {
+              // 编辑
+              addBrand(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      add() {
+        this.modalType = 0;
+        this.modalTitle = "添加";
+        this.$refs.form.resetFields();
+        delete this.form.id;
+        this.modalVisible = true;
+      },
+      edit(v) {
+        this.modalType = 1;
+        this.modalTitle = "编辑";
+        this.$refs.form.resetFields();
+        // 转换null为""
+        for (let attr in v) {
+          if (v[attr] === null) {
+            v[attr] = "";
+          }
+        }
+        let str = JSON.stringify(v);
+        let data = JSON.parse(str);
+        this.form = data;
+        this.modalVisible = true;
+      },
+      enable(v) {
+        this.$Modal.confirm({
+          title: "确认启用",
+          content: "您确认要启用品牌 " + v.name + " ?",
+          loading: true,
+          onOk: () => {
+            disableBrand(v.id, {disable: false}).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      disable(v) {
+        this.$Modal.confirm({
+          title: "确认禁用",
+          content: "您确认要禁用品牌 " + v.name + " ?",
+          loading: true,
+          onOk: () => {
+            disableBrand(v.id, {disable: true}).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
new file mode 100644
index 00000000..20154c58
--- /dev/null
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -0,0 +1,528 @@
+<template>
+  <div class="wrapper">
+    <div class="operation">
+      <Button @click="addParent" icon="md-add">添加一级分类</Button>
+      选择分类:
+      <Select @on-change="changeSortCate" v-model="sortCate" style="width:200px">
+        <Option v-for="item in sortCateList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+      </Select>
+
+    </div>
+    <tree-table ref="treeTable" size="default" :loading="loading" :data="tableData" :columns="columns" :border="true" :show-index="false" :is-fold="true" :expand-type="false" primary-key="id">
+
+      <template slot="action" slot-scope="scope">
+        <Dropdown v-show="scope.row.level == 2"  transfer="true" trigger="click">
+          <Button size="small">
+            绑定
+            <Icon type="ios-arrow-down"></Icon>
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem @click.native="brandOperation(scope.row)">编辑绑定品牌</DropdownItem>
+            <DropdownItem @click.native="specOperation(scope.row)">编辑绑定规格</DropdownItem>
+            <DropdownItem @click.native="parameterOperation(scope.row)">编辑绑定参数</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+
+        &nbsp;
+        <Dropdown transfer="true" trigger="click">
+          <Button size="small">
+            操作
+            <Icon type="ios-arrow-down"></Icon>
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
+            <DropdownItem v-if="scope.row.deleteFlag == 1" @click.native="enable(scope.row)">启用</DropdownItem>
+            <DropdownItem v-if="scope.row.deleteFlag == 0" @click.native="disable(scope.row)">禁用</DropdownItem>
+            <DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+        &nbsp;
+        <Button v-show="scope.row.level != 2" type="primary" @click="addChildren(scope.row)" size="small" icon="md-add" style="margin-right: 5px">添加子分类
+        </Button>
+      </template>
+
+      <template slot="commissionRate" slot-scope="scope">
+        {{ scope.row.commissionRate }}%
+      </template>
+
+      <template slot="deleteFlag" slot-scope="scope">
+        <div v-if="scope.row.deleteFlag == 0">
+          <Badge text="正常启用" status="success"></Badge>
+        </div>
+        <div v-if="scope.row.deleteFlag == 1">
+          <Badge text="禁用" status="error"></Badge>
+        </div>
+      </template>
+    </tree-table>
+
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="form" :model="formAdd" :label-width="100" :rules="formValidate">
+        <div v-if="showParent">
+          <FormItem label="上级分类" prop="parentId">
+            {{ parentTitle }}
+            <Input v-model="formAdd.parentId" clearable style="width: 100%; display: none" />
+          </FormItem>
+        </div>
+        <FormItem label="层级" prop="level" style="display: none">
+          <Input v-model="formAdd.level" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="分类名称" prop="name">
+          <Input v-model="formAdd.name" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="分类图标" prop="image">
+          <upload-pic-input v-model="formAdd.image" style="width: 100%"></upload-pic-input>
+        </FormItem>
+        <FormItem label="排序值" prop="sortOrder" style="width: 345px">
+          <InputNumber v-model="formAdd.sortOrder"></InputNumber>
+        </FormItem>
+        <FormItem label="佣金比例(%)" prop="commissionRate" style="width: 345px">
+          <InputNumber v-model="formAdd.commissionRate"></InputNumber>
+        </FormItem>
+        <FormItem label="是否启用" prop="deleteFlag">
+          <i-switch size="large" v-model="formAdd.deleteFlag" :true-value="0" :false-value="1">
+            <span slot="open">启用</span>
+            <span slot="close">禁用</span>
+          </i-switch>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="Submit">提交</Button>
+      </div>
+    </Modal>
+
+    <Modal :title="modalBrandTitle" v-model="modalBrandVisible" :mask-closable="false" :width="500">
+      <Form ref="brandForm" :model="brandForm" :label-width="100">
+        <Select v-model="brandForm.categoryBrands" multiple>
+          <Option v-for="item in brandWay" :value="item.id" :key="item.id">{{ item.name }}</Option>
+
+        </Select>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalBrandVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="saveCategoryBrand">提交</Button>
+      </div>
+    </Modal>
+
+    <Modal :title="modalSpecTitle" v-model="modalSpecVisible" :mask-closable="false" :width="500">
+      <Form ref="specForm" :model="specForm" :label-width="100">
+        <Select v-model="specForm.category_specs" multiple>
+          <Option v-for="item in specifications" :value="item.id" :key="item.id" :label="item.specName">
+          </Option>
+        </Select>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalSpecVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="saveCategorySpec">提交</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import {
+  insertCategory,
+  updateCategory,
+  getBrandListData,
+  delCategory,
+  getCategoryBrandListData,
+  saveCategoryBrand,
+  getSpecificationList,
+  getCategorySpecListData,
+  disableCategory,
+  saveCategorySpec,
+  getCategoryTree,
+} from "@/api/goods";
+import TreeTable from "@/views/my-components/tree-table/Table/Table";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import * as filters from "@/utils/filters";
+
+export default {
+  name: "lili-components",
+  components: {
+    TreeTable,
+    uploadPicInput,
+  },
+  data() {
+    return {
+      categoryList: [],
+      sortCateList: [], //筛选出分类第一级
+      sortCate: "", //筛选的数据
+      currView: "index",
+      loading: false,
+      selectCount: 0,
+      brands: [], //品牌集合
+      specifications: [], //规格集合
+      categoryId: "",
+      category_brands: [], //已经选择的品牌
+      category_specs: [], //已经选择的规格
+      expandLevel: 1,
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalBrandVisible: false, //品牌关联编辑显示
+      modalSpecVisible: false, //品牌关联编辑显示
+      modalTitle: "", // 添加或编辑标题
+      showParent: false, // 是否展示上级菜单
+      parentTitle: "", // 父级菜单名称
+      modalBrandTitle: "",
+      modalSpecTitle: "",
+      formAdd: {
+        // 添加或编辑表单对象初始化数据
+        parentId: "",
+        name: "",
+        image: "",
+        sortOrder: "",
+        deleteFlag: 0,
+        commissionRate: "",
+        level: 0,
+      },
+      brandForm: {
+        categoryBrands: [],
+      },
+      brandWay: "", //请求绑定品牌的信息
+      specForm: {},
+      // 表单验证规则
+      formValidate: {},
+      columns: [
+        {
+          title: "分类名称",
+          key: "name",
+          minWidth: "120px",
+        },
+        {
+          title: "状态",
+          key: "deleteFlag",
+          headerAlign: "center",
+          type: "template",
+          template: "deleteFlag",
+        },
+        {
+          title: "佣金(%)",
+          key: "commissionRate",
+          headerAlign: "center",
+          type: "template",
+          template: "commissionRate",
+        },
+        {
+          fixed: "right",
+          title: "操作",
+          key: "action",
+          align: "left",
+          headerAlign: "center",
+          type: "template",
+          template: "action",
+        },
+      ],
+      tableData: [],
+    };
+  },
+  methods: {
+
+    changeSortCate(val) {
+      let way = this.categoryList.find((item) => {
+        return item.name == val;
+      });
+      this.tableData = [way];
+    },
+    init() {
+      this.getAllList(0);
+      this.getBrandList();
+      this.getSpecList();
+    },
+    //获取所有品牌
+    getBrandList() {
+      getBrandListData().then((res) => {
+        this.brandWay = res;
+      });
+    },
+    //获取所有规格
+    getSpecList() {
+      getSpecificationList().then((res) => {
+        if (res.success) {
+          this.specifications = res;
+        }
+      });
+    },
+    //弹出品牌关联框
+    brandOperation(v) {
+      getCategoryBrandListData(v.id).then((res) => {
+        this.categoryId = v.id;
+        this.modalBrandTitle = "品牌关联";
+        this.brandForm.categoryBrands = res.result.map((item) => item.id);
+        // this.brandWay = {...res.result}
+        this.modalBrandVisible = true;
+      });
+    },
+    //弹出规格关联框
+    specOperation(v) {
+      getCategorySpecListData(v.id).then((res) => {
+        this.categoryId = v.id;
+        this.modalSpecTitle = "规格关联";
+        this.specForm.category_specs = res.map((item) => item.id);
+        this.modalSpecVisible = true;
+      });
+    },
+    //保存分类规格绑定
+    saveCategorySpec() {
+      saveCategorySpec(this.categoryId, this.specForm).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("操作成功");
+          this.modalSpecVisible = false;
+        }
+      });
+    },
+    //保存分类品牌绑定
+    saveCategoryBrand() {
+      saveCategoryBrand(this.categoryId, this.brandForm).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("操作成功");
+          this.modalBrandVisible = false;
+        }
+      });
+    },
+    parameterOperation(v) {
+      this.$router.push({ name: "parameter", query: { id: v.id } });
+    },
+    refresh() {
+      this.loading = true;
+      let that = this;
+      setTimeout(function () {
+        that.loading = false;
+      }, 1000);
+    },
+    addChildren(v) {
+      this.modalType = 0;
+      this.modalTitle = "添加子分类";
+      this.parentTitle = v.name;
+      this.formAdd.level = eval(v.level + "+1");
+      this.showParent = true;
+      // this.$refs.form.resetFields();
+      delete this.formAdd.id;
+      this.formAdd.parentId = v.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.formAdd.id = v.id;
+      this.formAdd.name = v.name;
+      this.formAdd.level = v.level;
+      this.formAdd.parentId = v.parentId;
+      this.formAdd.sortOrder = v.sortOrder;
+      this.formAdd.commissionRate = v.commissionRate;
+      this.formAdd.deleteFlag = v.deleteFlag;
+      this.formAdd.image = v.image;
+      this.showParent = false;
+      this.modalVisible = true;
+    },
+    addParent() {
+      this.modalType = 0;
+      this.modalTitle = "添加一级分类";
+      this.parentTitle = "顶级分类";
+      this.showParent = true;
+      this.$refs.form.resetFields();
+      delete this.formAdd.id;
+      this.formAdd.parentId = 0;
+      this.modalVisible = true;
+    },
+    Submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.formAdd.id;
+            insertCategory(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加成功");
+                this.getAllList(0);
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          } else {
+            // 编辑
+            updateCategory(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+                this.getAllList(0);
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          }
+        }
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delCategory(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList(0);
+            }
+          });
+        },
+      });
+    },
+    getAllList(parent_id) {
+      this.loading = true;
+      getCategoryTree(parent_id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          // 仅展开指定级数 默认后台已展开所有
+          let expandLevel = this.expandLevel;
+          localStorage.setItem("category", JSON.stringify(res.result));
+          res.result.forEach((e, index, arr) => {
+            this.sortCateList.push({
+              label: e.name,
+              value: e.name,
+            });
+            this.sortCate = arr[0].name;
+            if (expandLevel == 1) {
+              if (e.level == 0) {
+                e.expand = false;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 2) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 3) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = true;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            }
+          });
+
+          this.categoryList = res.result;
+          this.tableData = [res.result[0]];
+        }
+      });
+    },
+    enable(v) {
+      this.$Modal.confirm({
+        title: "确认启用",
+        content: "您是否要启用当前分类 " + v.name + " 及其子分类?",
+        loading: true,
+        okText: "是",
+        cancelText: "否",
+        onOk: () => {
+          disableCategory(v.id, { enableOperations: 0 }).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList(0);
+            }
+          });
+        },
+        onCancel: () => {
+          this.getAllList(0);
+        },
+      });
+    },
+    disable(v) {
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您是否要禁用当前分类 " + v.name + " 及其子分类?",
+        loading: true,
+        okText: "是",
+        cancelText: "否",
+        onOk: () => {
+          disableCategory(v.id, { enableOperations: true }).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList(0);
+            }
+          });
+        },
+        onCancel: () => {
+          this.getAllList(0);
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+.wrapper {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  padding: 20px;
+}
+.article {
+  font-size: 16px;
+  font-weight: 400;
+  margin: 12px 0;
+}
+
+.href-text {
+  font-size: 12px;
+}
+
+.operation {
+  margin-bottom: 2vh;
+}
+
+.select-count {
+  font-weight: 600;
+  color: #40a9ff;
+}
+</style>
diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
new file mode 100644
index 00000000..f0d7534e
--- /dev/null
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -0,0 +1,336 @@
+<template>
+  <div style="width: 100%;">
+
+    <Card>
+      <Button @click="handleAddParamsGroup" type="primary">添加</Button>
+
+    </Card>
+
+    <div class="row">
+      <Card v-if="paramsGroup.length==0">
+        暂无参数绑定信息
+      </Card>
+      <div class="paramsGroup" v-else>
+
+        <Card style="width: 350px; margin:7px;" v-for="group in paramsGroup" :key="group.groupId" :bordered="false">
+          <p slot="title">
+            <Icon type="ios-film-outline"></Icon>&nbsp;{{ group.groupName }}
+          </p>
+          <p slot="extra">
+            <Dropdown slot="extra">
+              <a href="javascript:void(0)">
+                操作
+                <Icon type="ios-arrow-down"></Icon>
+              </a>
+              <Dropdown-menu slot="list">
+                <Dropdown-item @click.native="handleEditParamsGroup(group)">编辑</Dropdown-item>
+                <Dropdown-item @click.native="handleDeleteParamGroup(group)">删除</Dropdown-item>
+              </Dropdown-menu>
+            </Dropdown>
+            <Icon type="arrow-down-b"></Icon>
+          </p>
+          <template v-if="group.params && group.params.length > 0">
+            <div v-for="param in group.params" :key="param.param_id" class="params">
+              <span>{{ param.paramName }} 【{{
+                  param.paramType | paramTypeFilter
+                }}】</span>
+
+              <span>
+                <i-button type="text" @click="handleEditParams(group, param)">编辑</i-button>
+                <i-button type="text" size="small" style="color: #f56c6c" @click="handleDeleteParam(group, param)">删除</i-button>
+              </span>
+            </div>
+          </template>
+          <div v-else style="align-content: center">暂无数据...</div>
+          <div style="text-align: center">
+            <i-button type="text" @click="handleAddParams(group)">添加</i-button>
+          </div>
+        </Card>
+
+      </div>
+
+    </div>
+    <div>
+      <Modal :title="modalTitle" v-model="dialogParamsVisible" :mask-closable="false" :width="500">
+        <Form ref="paramForm" :model="paramForm" :label-width="100" :rules="formValidate">
+          <FormItem label="参数名称" prop="paramName">
+            <Input v-model="paramForm.paramName" style="width: 100%" />
+          </FormItem>
+          <FormItem label="参数类型" prop="paramType">
+            <Select :loading="userLoading" v-model="paramForm.paramType">
+              <Option :value="1" :key="1">输入项</Option>
+              <Option :value="2" :key="2">选择项</Option>
+            </Select>
+          </FormItem>
+          <FormItem label="可选值" prop="options">
+            <i-input v-model="paramForm.options" type="textarea" :rows="3" placeholder="请输入可选值,选择项实用逗号分隔"></i-input>
+          </FormItem>
+
+          <FormItem label="选项" prop="specName3">
+            <Checkbox :value="Number" v-model="paramForm.required">必填</Checkbox>
+            <Checkbox v-model="paramForm.isIndex">可索引</Checkbox>
+          </FormItem>
+        </Form>
+
+        <div slot="footer">
+          <Button type="text" @click="dialogParamsVisible = false">取消</Button>
+          <Button type="primary" :loading="submitLoading" @click="submitParamForm">提交</Button>
+        </div>
+      </Modal>
+    </div>
+
+    <div>
+      <Modal :title="modalTitle" v-model="dialogParamsGroupVisible" :mask-closable="false" :width="500">
+        <Form ref="paramGroupForm" :model="paramGroupForm" :label-width="100" :rules="paramGroupValidate">
+          <FormItem label="参数名称" prop="groupName">
+            <Input v-model="paramGroupForm.groupName" style="width: 100%" />
+          </FormItem>
+        </Form>
+
+        <div slot="footer">
+          <Button type="text" @click="dialogParamsGroupVisible = false">取消</Button>
+          <Button type="primary" :loading="submitLoading" @click="submitParamGroupForm">提交</Button>
+        </div>
+      </Modal>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getCategoryParamsListData,
+  insertGoodsParams,
+  updateGoodsParams,
+  deleteParams,
+  insertParamsGroup,
+  updateParamsGroup,
+  deleteParamsGroup,
+} from "@/api/goods";
+export default {
+  name: "categoryParams",
+  components: {},
+  data() {
+    return {
+      /** 分类ID */
+      categoryId: this.$route.query.id,
+      /** 参数组 */
+      paramsGroup: [],
+      /** 添加或编辑标识 */
+      modalType: 0,
+      /** 添加或编辑标题 */
+      modalTitle: "",
+      modalTitle1: "",
+      /** 参数添加或编辑弹出框 */
+      dialogParamsVisible: false,
+      /** 参数组添加或编辑弹出框 */
+      dialogParamsGroupVisible: false,
+      /** 参数ID **/
+      paramId: "",
+      //参数表单
+      paramForm: {},
+      paramGroupForm: {},
+      /** 添加、编辑参数 规格 */
+      formValidate: {
+        paramName: [
+          { required: true, message: "参数名称不能为空", trigger: "blur" },
+        ],
+      },
+      /** 参数组*/
+      paramGroupValidate: {
+        groupName: [
+          { required: true, message: "参数组名称不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  filters: {
+    paramTypeFilter(val) {
+      return val === 1 ? "输入项" : "选择项";
+    },
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    //弹出添加参数框
+    handleAddParams(group) {
+      this.paramForm = {
+        paramName: "",
+        paramType: 1,
+        options: "",
+        required: false,
+        isIndex: false,
+        groupId: group.groupId,
+        categoryId: this.categoryId,
+      };
+      this.modalTitle = "添加参数";
+      this.modalType = 0;
+      this.dialogParamsVisible = true;
+    },
+    //弹出修改参数框
+    handleEditParams(group, param) {
+      this.paramForm = {
+        paramName: param.paramName,
+        paramType: param.paramType,
+        options: param.options,
+        required: param.required,
+        isIndex: param.isIndex,
+        groupId: group.groupId,
+        categoryId: this.categoryId,
+        id: param.id,
+      };
+      this.modalType = 1;
+      this.modalTitle = "修改参数";
+      this.dialogParamsVisible = true;
+    },
+    //弹出修改参数组框
+    handleEditParamsGroup(group) {
+      this.paramGroupForm = {
+        groupName: group.groupName,
+        categoryId: this.categoryId,
+        id: group.groupId,
+      };
+      this.modalType = 1;
+      this.modalTitle = "修改参数组";
+      this.dialogParamsGroupVisible = true;
+    },
+    handleAddParamsGroup() {
+      (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
+      this.modalTitle = "添加参数组";
+      this.dialogParamsGroupVisible = true;
+    },
+    //保存参数组
+    submitParamGroupForm() {
+      this.$refs.paramGroupForm.validate((valid) => {
+        if (valid) {
+          if (this.modalType === 0) {
+            insertParamsGroup(this.paramGroupForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("参数组修改成功");
+                this.getDataList();
+                this.dialogParamsVisible = false;
+              }
+            });
+          } else {
+            updateParamsGroup(this.paramGroupForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("参数组修改成功");
+                this.getDataList();
+                this.dialogParamsVisible = false;
+              }
+            });
+          }
+          this.dialogParamsGroupVisible = false;
+        }
+      });
+    },
+    //保存参数
+    submitParamForm() {
+      this.$refs.paramForm.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            this.paramForm.isIndex = Number(this.paramForm.isIndex);
+            this.paramForm.required = Number(this.paramForm.required);
+            insertGoodsParams(this.paramForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("参数添加成功");
+                this.getDataList();
+                this.dialogParamsVisible = false;
+              }
+            });
+          } else {
+            this.paramForm.isIndex = Number(this.paramForm.isIndex);
+            this.paramForm.required = Number(this.paramForm.required);
+            updateGoodsParams(this.paramForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("参数修改成功");
+                this.getDataList();
+                this.dialogParamsVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    getDataList() {
+      getCategoryParamsListData(this.categoryId).then((res) => {
+        if (res.success) {
+          this.paramsGroup = res.result;
+        }
+      });
+    },
+    //删除参数方法
+    handleDeleteParam(group, param) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + param.paramName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deleteParams(param.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除参数成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //删除参数组方法
+    handleDeleteParamGroup(group) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + group.groupName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deleteParamsGroup(group.groupId).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除参数成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" >
+.row {
+  overflow: hidden;
+  margin: 20px 0;
+}
+.params {
+  align-items: center;
+  display: flex;
+  padding: 3px;
+  background-color: #f5f7fa;
+  font-size: 14px;
+  justify-content: space-between;
+}
+.ivu-card-head {
+  background-color: #f5f7fa;
+}
+
+.ivu-btn {
+  font-size: 13px;
+}
+.paramsGroup {
+  flex-wrap: wrap;
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+}
+</style>
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
new file mode 100644
index 00000000..c81e1b5c
--- /dev/null
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -0,0 +1,426 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="规格名称" prop="specName">
+                <Input
+                  type="text"
+                  v-model="searchForm.specName"
+                  placeholder="请输入规格名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="operation padding-row">
+            <Button @click="add" type="primary" >添加</Button>
+            <Button @click="delAll" >批量删除</Button>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="规格名称" prop="specName">
+          <Input v-model="form.specName" maxlength="30" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="saveSpec"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+      :title="modalTitle"
+      v-model="dialogSpecValuesVisible"
+      :mask-closable="false"
+      :width="500"
+      :styles="{ top: '30px' }"
+      class="permModal"
+    >
+      <Form ref="specForm" :model="specForm" :label-width="100">
+        <Select
+          v-model="specForm.specValue"
+          placeholder="输入后回车添加"
+          multiple
+          filterable
+          allow-create
+          :popper-append-to-body="false"
+          popper-class="spec-values-popper"
+          style="width: 100%; text-align: left; margin-right: 10px"
+        >
+          <Option
+            v-for="item in specValues"
+            :value="item.specValue"
+            :key="item.id"
+            :label="item.specValue"
+          >
+          </Option>
+        </Select>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="dialogSpecValuesVisible = false"
+          >取消</Button
+        >
+        <Button
+          type="primary"
+          :loading="submitLoading"
+          @click="submitSpecValuesForm"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getSpecListData,
+  insertSpec,
+  updateSpec,
+  delSpec,
+  getSpecValuesListData,
+  saveSpecValues,
+} from "@/api/goods";
+export default {
+  name: "spec",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      dialogSpecValuesVisible: false, // 添加或编辑规格值
+      specTitle: "", // 添加或编辑规格值
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "asc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        specName: "",
+        specValue: "",
+      },
+      specForm: {},
+      /** 编辑规格值 */
+      specValues: [],
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "规格名称",
+          key: "specName",
+          width: 200,
+        },
+        {
+          title: "规格值",
+          key: "specValue",
+          minWidth: 250,
+          tooltip: true
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 250,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editSpec(params.row);
+                    },
+                  },
+                },
+                "编辑规格值"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getSpecListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.loading = false;
+    },
+    submitSpecValuesForm() {
+      saveSpecValues(this.specForm.specId, this.specForm).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("规格值保存成功");
+          this.getDataList();
+          this.modalVisible = false;
+          this.dialogSpecValuesVisible = false;
+        }
+      });
+    },
+    saveSpec() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据
+            delete this.form.id;
+            insertSpec(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            updateSpec(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.$refs.form.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] === null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.modalVisible = true;
+    },
+    editSpec(v) {
+      getSpecValuesListData(v.id).then((res) => {
+        this.modalType = 1;
+        this.modalTitle = "编辑";
+        this.specValues = res.result;
+        this.specForm.specValue = res.result.map(item => item.specValue)
+        this.specForm.specId = v.id;
+        this.dialogSpecValuesVisible = true;
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.specName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delSpec(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          delSpec(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.clearSelectAll();
+              this.searchForm.pageNumber = 1
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/goods/goods-refund/index.vue b/manager/src/views/goods/goods-refund/index.vue
new file mode 100644
index 00000000..68a6b05d
--- /dev/null
+++ b/manager/src/views/goods/goods-refund/index.vue
@@ -0,0 +1,251 @@
+<template>
+  <Card>
+    <Form
+      label-position="left"
+      ref="searchForm"
+      :model="params"
+      inline
+      :label-width="100"
+      class="search-form"
+    >
+      <Form-item label="选择店铺" prop="sn">
+        <span class="tips" v-if="storeName"
+          >{{ storeName }}
+          <Button
+            @click="
+              () => {
+                storeName = '';
+                params.shopId = '';
+              }
+            "
+            type="text"
+            >清空</Button
+          >
+        </span>
+        <Button size="small" @click="handleClickShop" type="primary"
+          >选择店铺</Button
+        >
+      </Form-item>
+
+      <Form-item label="选择时间类型">
+        <Select v-model="params.timeType" style="width: 200px">
+          <Option
+            v-for="item in typeList"
+            :value="item.value"
+            :key="item.value"
+            >{{ item.label }}</Option
+          >
+        </Select>
+      </Form-item>
+      <Form-item label="按年查询">
+        <DatePicker
+          type="year"
+          placeholder="Select year"
+          style="width: 200px"
+          v-model="year"
+        ></DatePicker>
+      </Form-item>
+      <Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
+        <InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
+      </Form-item>
+    </Form>
+
+    <div class="order-list">
+      <div class="order-col">
+        <div>金额</div>
+        <div>{{ priceData | unitPrice }}</div>
+      </div>
+    </div>
+    <Tabs v-model="orderStatus" @on-click="handleClickType">
+      <TabPane label="订单列表" name="PRICE">
+        <Table :columns="columns" :data="data"></Table>
+        <div class="page-col">
+          <Page @on-change="changePage" :total="total" show-total />
+        </div>
+      </TabPane>
+    </Tabs>
+
+    <Modal v-model="modalFlag" width="1200" :title="selectName">
+      <!-- 店铺 -->
+      <shopLayout v-if="shopFlag" @callback="callbackShop" ref="shops" />
+      <!-- 会员 -->
+      <memberLayout v-else @callback="callbackMember" ref="members" />
+    </Modal>
+  </Card>
+</template>
+<script>
+import shopLayout from "@/views/seller/shop/shopList";
+import memberLayout from "@/views/member/list/index";
+import * as API_Goods from "@/api/goods";
+export default {
+  components: {
+    shopLayout,
+    memberLayout,
+  },
+  data() {
+    return {
+      storeName: "",
+      memberName: "",
+      shopFlag: false,
+      selectName: "选择",
+      modalFlag: false,
+      priceData: "",
+      orderStatus: "PRICE",
+
+      shopList: {},
+      memberList: {},
+
+      typeList: [
+        {
+          value: "YEAR",
+          label: "年",
+        },
+        {
+          value: "MONTH",
+          label: "月",
+        },
+      ],
+      total: 0,
+      year: "",
+      params: {
+        type: "PRICE",
+        timeType: "YEAR",
+        pageNumber: 1,
+        pageSize: 10,
+        year: "",
+        shopId: "",
+        memberId: "",
+      },
+      columns: [
+        {
+          title: "售后号",
+          key: "refundSn",
+        },
+        {
+          title: "卖家名称",
+          key: "sellerName",
+        },
+        {
+          title: "商品名称",
+          key: "name",
+        },
+        {
+          title: "规格名称",
+          key: "specs",
+        },
+        {
+          title: "会员名称",
+          key: "memberName",
+        },
+
+        {
+          title: "实际退款金额",
+          key: "finalPrice",
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice)
+            );
+          },
+        },
+      ],
+      data: [],
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        this.init();
+      },
+      deep: true,
+    },
+
+    year(val) {
+      this.params.year = new Date(val).getFullYear();
+    },
+  },
+  methods: {
+    // 选择店铺
+    handleClickShop() {
+      this.modalFlag = true;
+      this.selectName += "店铺";
+      this.shopFlag = true;
+      this.$nextTick(() => {
+        this.$refs.shops.selectedShop = true;
+      });
+    },
+    // 选择会员
+    handleClickMember() {
+      this.modalFlag = true;
+      this.selectName += "会员";
+      this.$nextTick(() => {
+        this.$refs.members.selectedMember = true;
+      });
+    },
+
+    callbackMember(val) {
+      this.memberName = val.username;
+      this.params.memberId = val.id;
+      this.modalFlag = false;
+    },
+
+    callbackShop(val) {
+      this.storeName = val.storeName;
+      this.params.shopId = val.id;
+      this.modalFlag = false;
+    },
+
+    // 点击分页
+    changePage(index) {
+      this.params.pageNumber = index;
+    },
+
+    handleClickType(name) {
+      this.params.type = name;
+    },
+    init(name) {
+      Promise.all([
+        API_Goods.refundStatistics(this.params),
+        !this.priceData ? API_Goods.refundPriceStatistics(this.params) : "",
+      ]).then((res) => {
+        if (res[0].result) {
+          this.data = res[0].result.records;
+          this.total = res[0].result.total;
+        }
+        if (res[1].result) {
+          this.priceData = res[1].result;
+        }
+      });
+    },
+  },
+  mounted() {
+    let data = new Date();
+
+    this.year = data;
+    this.year && this.params.month
+      ? this.timeType == "MONTH"
+      : this.timeType == "YEAR";
+  },
+};
+</script>
+<style scoped lang="scss">
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+.order-col {
+  display: flex;
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+.order-list {
+  display: flex;
+}
+.tips {
+  margin: 0 8px;
+}
+</style>
diff --git a/manager/src/views/goods/goods-review/index.scss b/manager/src/views/goods/goods-review/index.scss
new file mode 100644
index 00000000..a2bb8e00
--- /dev/null
+++ b/manager/src/views/goods/goods-review/index.scss
@@ -0,0 +1,48 @@
+.left-container {
+  float: left;
+}
+
+.right-container {
+  float: left;
+  margin-left: 50px;
+}
+
+.img {
+  width: 100%;
+  height: 100%;
+}
+img {
+  vertical-align: middle;
+  border-style: none;
+}
+.product {
+  width: 140px;
+  height: 160px;
+  border: 1px solid #d9d9d9;
+  border-radius: 3px;
+}
+.show{
+  label{
+    font-size: 14px;
+  }
+  margin-top: 15px;
+}
+
+label {
+  font-size: 12px;
+  color: #666;
+  margin-top: 4px;
+  display: block;
+  float: left;
+  margin-right: 2px;
+}
+.border-b {
+  border-bottom: 1px solid #e9e9e9;
+  width: 500px;
+  overflow: hidden;
+  position: relative;
+  margin-top: 12px;
+}
+.div-height{
+  line-height: 25px;
+}
diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue
new file mode 100644
index 00000000..e9809fa2
--- /dev/null
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -0,0 +1,394 @@
+<template>
+  <div class="search">
+    <Row>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="会员名称" prop="memberName">
+              <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px"/>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                 @on-sort-change="changeSort" @on-selection-change="changeSelect">
+            <!-- 页面展示 -->
+            <template slot="shopDisableSlot" slot-scope="scope">
+              <div>
+              </div>
+              <i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="scope.row.status"
+                        @on-change="changeSwitch(scope.row)">
+                <span slot="open">展示</span>
+                <span slot="close">隐藏</span>
+              </i-switch>
+            </template>
+          </Table>
+
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+                @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+                size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+    </Row>
+
+    <Modal v-model="infoFlag" width="800" :title="infoTitle">
+
+      <div class="info-list" style="overflow: hidden">
+        <div class="left-container">
+          <div class="product">
+            <img class="img" :src=infoData.goodsImage>
+          </div>
+          <div class="show">
+            <label>页面展示：</label>
+            <i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="infoData.status"
+                      @on-change="changeRadio" style="margin-top: 3px">
+              <span slot="open">展示</span>
+              <span slot="close">隐藏</span>
+            </i-switch>
+          </div>
+        </div>
+        <div class="right-container">
+          <div class="border-b">{{ infoData.goodsName }}</div>
+          <div class="border-b">
+            <div class="div-height"> 店铺名称：{{ infoData.sellerName }}</div>
+            <div class="div-height"> 订单号：{{ infoData.orderNo }}</div>
+          </div>
+
+          <div class="border-b">
+            <List>
+              <ListItem>
+                <ListItemMeta :avatar="infoData.memberProfile" :title="infoData.memberName"
+                              :description="infoData.content"/>
+              </ListItem>
+              <div class="" v-if="infoData.haveImage == 1">
+                评价图
+                <div style="margin-left: 40px">
+                  <img style="width: 100px;height: 110px;margin-left: 2px"
+                       v-for="(img,index) in infoData.image.split(',')" v-if="infoData.image.length !=0" :src="img"
+                       alt=""/>
+                </div>
+              </div>
+            </List>
+          </div>
+          <div class="border-b" v-if="infoData.reply">
+            <div>
+              <div>
+                <div style="float: left"> 商家回复：</div>
+                <div style="margin-left: 60px">{{ infoData.reply }}</div>
+              </div>
+              <div v-if="infoData.haveReplyImage == 1">
+                <div style="margin-left: 60px">
+                  <img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')"
+                       v-if="infoData.replyImage.length !=0" :src="img" alt=""/>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Member from "@/api/member";
+
+export default {
+  name: "shop",
+  components: {},
+  data() {
+    return {
+      pageShow: true,
+      infoData: "",
+      infoFlag: false,
+      infoTitle: "",
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      drop: false,
+
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        memberName: "",
+        storeName: "",
+        shopDisable: "",
+        id: "",
+        createTime: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+          align: "left",
+          tooltip: true,
+        },
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 120,
+          align: "left",
+          tooltip: true,
+        },
+        {
+          title: "评价",
+          key: "grade",
+          align: "left",
+          width: 90,
+          render: (h, params) => {
+            if (params.row.grade == "GOOD") {
+              return h(
+                "Tag",
+                {
+                  props: {
+                    color: "success",
+                  },
+                },
+                "好评"
+              );
+            } else if (params.row.grade == "MODERATE") {
+              return h(
+                "Tag",
+                {
+                  props: {
+                    color: "warning",
+                  },
+                },
+                "中评"
+              );
+            } else {
+              return h(
+                "Tag",
+                {
+                  props: {
+                    color: "error",
+                  },
+                },
+                "差评"
+              );
+            }
+          },
+        },
+        {
+          title: "评价内容",
+          key: "content",
+          align: "left",
+          minWidth: 200,
+          tooltip: true,
+        },
+        {
+          title: "评价时间",
+          key: "createTime",
+          align: "left",
+          width: 170
+        },
+        {
+          title: "页面展示",
+          key: "shopDisable",
+          align: "left",
+          width: 100,
+          slot: "shopDisableSlot",
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "info",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.info(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    changeRadio(val) {
+      let status = val;
+      API_Member.updateMemberReview(this.infoData.id, {status}).then(
+        (res) => {
+          this.$Message.success("修改成功!");
+          this.init();
+        }
+      );
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    //列表直接选择页面是否展示
+    changeSwitch(v) {
+      let status = v.status;
+      API_Member.updateMemberReview(v.id, {status: status}).then((res) => {
+        this.init();
+      });
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      API_Member.getMemberReview(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //评价详情
+    info(v) {
+      this.infoFlag = true;
+      this.infoTitle = `用户${v.memberName}的评价详情`;
+      API_Member.getMemberInfoReview(v.id).then((res) => {
+        if (res.result) {
+          this.infoData = res.result;
+        }
+      });
+    },
+
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除会员" + v.memberName + "的评论?",
+        loading: true,
+        onOk: () => {
+          API_Member.delMemberReview(v.id).then((res) => {
+            this.$Message.success("修改成功");
+            this.init();
+          });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          this.deleteRequest("/shop/delByIds/" + ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./index.scss";
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/home/home.scss b/manager/src/views/home/home.scss
new file mode 100644
index 00000000..63baefde
--- /dev/null
+++ b/manager/src/views/home/home.scss
@@ -0,0 +1,222 @@
+.card {
+  margin: 10px 10px 20px;
+  padding: 0 20px 20px;
+  background: #fff;
+  border: 1px solid #e7e7e7;
+
+  border-radius: 0.4em;
+}
+h4 {
+  margin: 20px 0;
+  font-size: 18px;
+}
+/deep/ .ivu-icon {
+  margin-left: 40px;
+  margin-right: 40px;
+}
+.count-item,
+.todo-item {
+  height: 84px;
+  display: flex;
+
+  justify-content: center;
+  align-items: center;
+
+  border-radius: 0.4em;
+  flex: 1;
+  font-weight: bold;
+  margin-right: 20px;
+}
+
+.todo-item {
+  flex-direction: column;
+  background: #ebebeb88;
+  .counts {
+    margin: 4px 0;
+    color: $theme_color;
+  }
+  > div {
+    margin: 4px 0;
+  }
+}
+.todo-item,
+.count-item,
+.today-item,
+.charts,
+.transform {
+  transition: 0.35s;
+}
+.todo-item:hover,
+.count-item:hover,
+.today-item:hover,
+.charts:hover,
+.transform:hover {
+  cursor: pointer;
+  transform: translateY(-10px);
+  z-index: 99;
+}
+.count-item {
+  transition: 0.35s;
+  cursor: pointer;
+  color: #fff;
+  justify-content: flex-start;
+}
+.count-item:nth-of-type(1) {
+  background-image: linear-gradient(109.6deg, rgba($color: #ff7171, $alpha: 0.6) 11.2%, #ff7171 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #ff7171, $alpha: 0.3);
+}
+.count-item:nth-of-type(2) {
+  background-image: linear-gradient(109.6deg, rgba($color: #ffaa71, $alpha: 0.6) 11.2%, #ffaa71 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #ffaa71, $alpha: 0.3);
+}
+.count-item:nth-of-type(3) {
+  background-image: linear-gradient(109.6deg, rgba($color: #93b5e1, $alpha: 0.6) 11.2%, #93b5e1 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #93b5e1, $alpha: 0.3);
+}
+.count-item:nth-of-type(4) {
+  background-image: linear-gradient(109.6deg, rgba($color: #848ccf, $alpha: 0.6) 11.2%, #848ccf 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #848ccf, $alpha: 0.3);
+}
+.counts {
+  line-height: 1;
+  font-size: 21px;
+}
+.flow-box-item {
+  > .counts {
+    color: #ffaa71;
+  }
+}
+.count-list {
+}
+
+.flow-list {
+  height: 330px;
+}
+.svg {
+  width: 20px;
+  height: 20px;
+}
+.flow-item {
+  display: flex;
+  flex: 1;
+}
+.flow {
+  background: #ebebeb88 !important;
+  border: none;
+  padding: 0;
+}
+.flow-member {
+  width: 200px;
+  margin-right: 20px;
+  font-weight: bold;
+
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  > div {
+    font-size: 18px;
+    margin-top: 20px;
+  }
+  > span {
+    color: #ffaa71;
+    font-size: 43px;
+    letter-spacing: 3px;
+    margin-top: 90px;
+    font-style: italic;
+  }
+}
+.flow-box {
+  padding-top: 20px;
+  width: 400px;
+  justify-content: space-between;
+  margin: 10px 0 20px;
+  > .flow-box-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    font-size: 15px;
+    margin: 0 20px;
+    > div {
+      margin: 4px 0;
+    }
+  }
+}
+.flow-box-splice {
+  background: #fff;
+  width: 190px;
+  margin-right: 20px;
+  padding: 20px;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  > div {
+    margin: 4px 0;
+  }
+  > .counts {
+    color: #ffaa71;
+  }
+
+  flex-direction: column;
+}
+.flow-box-splice:nth-last-of-type(1) {
+  margin-right: 0;
+}
+.flow-splice {
+}
+
+.flow-box-splice,
+.flow-member,
+.card,
+.today-box,
+.flow-wrapper {
+  box-shadow: 1px 3px 12px rgba($color: #e7e7e7, $alpha: 0.3);
+  border-radius: 0.4em;
+  box-shadow: 1px 3px 12px rgba($color: #e7e7e7, $alpha: 0.3);
+}
+.flow-wrapper {
+  background: #fff;
+  padding: 0 30px;
+}
+.today-box {
+  flex: 3;
+  background: #fff;
+  margin-left: 20px;
+  padding: 0 30px;
+}
+
+.today-item {
+  width: 30%;
+  margin-bottom: 20px;
+  border-radius: 0.4em;
+  font-weight: bold;
+  background: #ebebeb88;
+  padding: 20px;
+  > span {
+    color: $theme_color;
+    font-size: 21px;
+  }
+}
+
+.charts {
+  margin: 10px 10px 20px;
+  padding: 20px 20px 20px;
+  background: #fff;
+}
+.chart-item {
+  width: 48%;
+  margin-right: 1%;
+}
+
+.today-list {
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
new file mode 100644
index 00000000..ecdfafa1
--- /dev/null
+++ b/manager/src/views/home/home.vue
@@ -0,0 +1,492 @@
+<template>
+  <div>
+    <!-- 统计 -->
+
+    <div class="card">
+      <h4>
+
+        基本信息
+      </h4>
+      <div class="count-list flex">
+        <div class="count-item" @click="navigateTo('managerGoods')">
+          <div>
+            <Icon class="icon" size="31" type="md-photos" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.goodsNum ||0}}</div>
+            <div>商品数量</div>
+          </div>
+
+        </div>
+        <div class="count-item" @click="navigateTo('memberList')">
+          <div>
+            <Icon class="icon" size="31" type="md-person" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.memberNum ||0}}</div>
+            <div>会员数量</div>
+          </div>
+
+        </div>
+        <div class="count-item" @click="navigateTo('orderList')">
+          <div>
+            <Icon class="icon" size="31" type="md-list" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.orderNum ||0}}</div>
+            <div>订单数量</div>
+          </div>
+
+        </div>
+        <div class="count-item" @click="navigateTo('shopList')">
+          <div>
+            <Icon class="icon" size="31" type="ios-stats" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.storeNum ||0}}</div>
+            <div>店铺数量</div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+    <!-- 今日待办 -->
+
+    <div class="card">
+      <h4>今日待办</h4>
+      <div class="todo-list flex">
+        <div class="todo-item" @click="navigateTo('applyGoods')">
+          <div class="counts">{{$store.state.notices.goods || 0}}</div>
+          <div>待审核商品</div>
+        </div>
+        <div class="todo-item" @click="navigateTo('shopAuth')">
+          <div class="counts">{{$store.state.notices.store|| 0}}</div>
+          <div>待审核店铺</div>
+        </div>
+        <div class="todo-item" @click="navigateTo('orderComplaint')">
+          <div class="counts">{{$store.state.notices.complain|| 0}}</div>
+          <div>待审核投诉</div>
+        </div>
+        <div class="todo-item" @click="navigateTo('afterSaleOrder')">
+          <div class="counts">{{$store.state.notices.refund|| 0}}</div>
+          <div>待审核售后</div>
+        </div>
+        <div class="todo-item" @click="navigateTo('distribution')">
+          <div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
+          <div>待审核分销提现</div>
+        </div>
+        <div class="todo-item" @click="navigateTo('billList')">
+          <div class="counts">{{$store.state.notices.waitPayBill|| 0}}</div>
+          <div>待审核分账</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 今日，流量概括 -->
+    <div class="card flow">
+      <div class="flow-list flex">
+        <div class="flow-item ">
+          <div class="flow-member">
+            <div>
+
+              当前在线人数
+            </div>
+            <span>
+              {{homeData.currentNumberPeopleOnline || 0}}
+            </span>
+          </div>
+          <div class="flow-wrapper">
+            <h4>
+              流量概括
+            </h4>
+            <div class="card flow-box flex">
+              <div class="flow-box-item">
+                <div>
+                  今日访客数
+                </div>
+                <div class="counts">
+
+                  {{homeData.todayUV || 0}}
+                </div>
+              </div>
+              <div class="flow-box-item">
+                <div>
+                  昨日访客数
+                </div>
+                <div class="counts">
+                  {{homeData.yesterdayUV || 0}}
+                </div>
+              </div>
+            </div>
+
+            <div class="flow-splice flex">
+              <div class="flow-box-splice">
+                <div>
+                  前七日访客数
+                </div>
+                <div class="counts">
+                  {{homeData.lastSevenUV || 0}}
+                </div>
+              </div>
+              <div class="flow-box-splice">
+                <div>
+                  前三十日访客数
+                </div>
+                <div class="counts">
+                  {{homeData.lastThirtyUV || 0}}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="today-box">
+          <h4> 今日概括</h4>
+          <div class="today-list flex">
+            <div class="today-item">
+              <div>今日订单数</div>
+              <span>{{homeData.todayOrderNum}}</span>
+            </div>
+            <div class="today-item">
+              <div>今日交易额</div>
+
+              <span>￥{{homeData.todayOrderPrice | unitPrice }}</span>
+            </div>
+            <div class="today-item">
+              <div>今日新增店铺</div>
+              <span>{{homeData.todayStoreNum || 0}}</span>
+            </div>
+            <div class="today-item">
+              <div>今日新增会员数</div>
+              <span>{{homeData.todayMemberNum || 0}}</span>
+            </div>
+            <div class="today-item">
+              <div>今日上架商品数量</div>
+              <span>{{homeData.todayGoodsNum || 0}}</span>
+            </div>
+            <div class="today-item">
+              <div>今日新增评论</div>
+              <span>{{homeData.todayMemberEvaluation || 0}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- chart -->
+    <div class="charts  flex">
+      <div class="chart-item">
+        <h4>流量统计</h4>
+        <div id="pvChart"></div>
+      </div>
+      <div class="chart-item">
+        <h4>交易统计</h4>
+        <div id="orderChart"></div>
+      </div>
+    </div>
+
+    <!-- top10商品 -->
+    <div class="card transform">
+      <h4>热卖商品TOP10</h4>
+      <Table stripe :columns="tophotGoodsColumns" :data="topHotGoodsData"></Table>
+    </div>
+
+    <!-- top10店铺 -->
+    <div class="card transform">
+      <h4>热卖店铺TOP10</h4>
+      <Table stripe :columns="tophotShopsColumns" :data="topHotShopsData"></Table>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { homeStatistics, hotGoods, hotShops, getNoticePage } from "@/api/index";
+import show from "./show.vue";
+import * as API_Goods from "@/api/goods";
+
+import { Chart } from "@antv/g2";
+import * as API_Member from "@/api/member";
+import Cookies from "js-cookie";
+export default {
+  name: "home",
+  components: {
+    show,
+  },
+  data() {
+    return {
+      tophotShopsColumns: [
+        {
+          type: "index",
+          width: 100,
+          title: "排名",
+          align: "center",
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+        },
+
+        {
+          title: "价格",
+          key: "price",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "销量",
+          key: "num",
+          width: 100,
+          sortable: true,
+        },
+      ],
+
+      tophotGoodsColumns: [
+        {
+          type: "index",
+          width: 100,
+          title: "排名",
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+        },
+
+        {
+          title: "价格",
+          key: "price",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "销量",
+          key: "num",
+          width: 100,
+          sortable: true,
+        },
+      ],
+      topHotGoodsData: [], //热卖商品集合
+      topHotShopsData: [], //热卖店铺集合
+      awaitTodoData: "", //今日待办集合
+      homeData: "",
+      username: "",
+      pvChart: "",
+      orderChart: "",
+      params: {
+        searchType: "LAST_SEVEN",
+      },
+      // 订单传参
+      orderParams: {
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        year: "",
+        shopId: "",
+        memberId: "",
+      },
+    };
+  },
+
+  computed: {
+    currNav() {
+      return this.$store.state.app.currNav;
+    },
+    avatarPath() {
+      return localStorage.avatorImgPath;
+    },
+  },
+  methods: {
+    navigateTo(name) {
+      this.$router.push({
+        name,
+      });
+    },
+    // top10热卖商品
+    async toHotGoods() {
+      let res = await hotGoods();
+      res.success ? (this.topHotGoodsData = res.result) : "";
+    },
+
+    // top10热卖店铺
+    async topHotShops() {
+      let res = await hotShops();
+      res.success ? (this.topHotShopsData = res.result) : "";
+    },
+    // 今日待办
+    async awaitTodo() {
+      let res = await getNoticePage();
+      res.success ? (this.awaitTodoData = res.result) : "";
+    },
+
+    async getHomeData() {
+      let res = await homeStatistics();
+      if (res.success) {
+        if (
+          res.result.todayOrderPrice &&
+          res.result.todayOrderPrice != "null"
+        ) {
+          res.result.todayOrderPrice = parseInt(res.result.todayOrderPrice);
+        } else {
+          res.result.todayOrderPrice = 0;
+        }
+
+        this.homeData = res.result;
+      }
+    },
+
+    // 实例化订单图表
+    async initOrderChartList(name) {
+      const res = await API_Goods.getOrderChart(this.orderParams);
+      if (res.success) {
+        this.chartList = res.result;
+
+        if (!this.orderChart) {
+          this.orderChart = new Chart({
+            container: "orderChart",
+            autoFit: true,
+            height: 500,
+            padding: [70, 35, 70, 35],
+          });
+        }
+
+        this.initOrderChart(); //订单表
+      }
+    },
+
+    initOrderChart() {
+      // 默认已经加载 legend-filter 交互
+      let data = this.chartList;
+
+      data.forEach((item) => {
+        item.createTime = item.createTime.split(" ")[0];
+        item.title = "交易额";
+      });
+      this.orderChart.data(data);
+
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.orderChart
+        .line()
+        .position("createTime*price")
+        .label("price")
+        .color("title")
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("createTime*price")
+        .label("price")
+        .color("title")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+      this.orderChart.render();
+    },
+
+    // 浏览量统计图
+    initPvChart() {
+      let uv = [];
+      let pv = [];
+      this.data.forEach((item) => {
+        uv.push({
+          date: item.date,
+          uvNum: item.uvNum,
+          title: "访客数UV",
+          pv: item.uvNum,
+        });
+
+        pv.push({
+          date: item.date,
+          pvNum: item.pvNum,
+          pv: item.pvNum,
+          title: "浏览量PV",
+        });
+      });
+
+      let data = [...uv, ...pv];
+
+      this.pvChart.data(data);
+      this.pvChart.scale({
+        activeQuantity: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
+      this.pvChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.pvChart
+        .line()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("smooth");
+
+      this.pvChart
+        .point()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+
+      this.pvChart.render();
+    },
+
+    // 浏览量
+    async getPvChart() {
+      API_Member.getStatisticsList(this.params).then((res) => {
+        if (res.result) {
+          this.data = res.result;
+
+          if (!this.pvChart) {
+            this.pvChart = new Chart({
+              container: "pvChart",
+              autoFit: true,
+              height: 500,
+              padding: [70, 35, 70, 35],
+            });
+          }
+          this.initPvChart();
+        }
+      });
+    },
+
+    // 初始化信息
+    init() {
+      if (Cookies.get("userInfo")) {
+        let userInfo = JSON.parse(Cookies.get("userInfo"));
+        this.username = userInfo.username;
+      }
+      this.toHotGoods();
+      this.topHotShops();
+      this.awaitTodo();
+      this.getHomeData();
+      this.getPvChart();
+      this.initOrderChartList();
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./home.scss";
+</style>
diff --git a/manager/src/views/home/show.vue b/manager/src/views/home/show.vue
new file mode 100644
index 00000000..acb2f321
--- /dev/null
+++ b/manager/src/views/home/show.vue
@@ -0,0 +1,88 @@
+
+<template>
+  <div>
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          inline
+          :label-width="70"
+
+          @keydown.enter.native="handleGo"
+        >
+          <Form-item label="链接地址" prop="url">
+            <Input type="text" v-model="url" placeholder="http://" clearable style="width: 350px" />
+          </Form-item>
+          <Form-item style="margin-left:-50px;">
+            <Button @click="handleGo" type="primary" icon="ios-send" style="margin-right:5px">前往</Button>
+            <Button @click="handleOpen" icon="md-open">新窗口中打开</Button>
+          </Form-item>
+        </Form>
+      </Row>
+      <Divider style="margin-top:-10px;margin-bottom:0px;" />
+      <Row>
+        <div style="position:relative;">
+          <iframe
+            id="iframe"
+            :src="go"
+            frameborder="0"
+            width="100%"
+            :height="height"
+            scrolling="auto"
+          ></iframe>
+          <Spin fix size="large" v-if="loading"></Spin>
+        </div>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "show",
+  data() {
+    return {
+      loading: false,
+      go: "",
+      url: "",
+      html: "",
+      height: "525px"
+    };
+  },
+  computed: {
+    currNav() {
+      return this.$store.state.app.currNav;
+    }
+  },
+  methods: {
+    initUrl() {
+      let url;
+      if (this.currNav == "doc") {
+        url = "https://www.kancloud.cn/lili/lili/content";
+      }
+      if (url) {
+        this.url = url;
+        this.go = url;
+      }
+    },
+    handleGo() {
+      let url = this.url;
+      this.go = this.url;
+    },
+    handleOpen() {
+      window.open(this.url);
+    }
+  },
+  watch: {
+    currNav(v, oldV) {
+      this.initUrl();
+    }
+  },
+  mounted() {
+    // 计算高度
+    let height = document.documentElement.clientHeight;
+    this.height = Number(height - 217) + "px";
+    this.initUrl();
+  }
+};
+</script>
diff --git a/manager/src/views/lili-components/affix-time.vue b/manager/src/views/lili-components/affix-time.vue
new file mode 100644
index 00000000..c7b71bd6
--- /dev/null
+++ b/manager/src/views/lili-components/affix-time.vue
@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <div class="breadcrumb">
+      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList" :key="index"> {{item.title}}</span>
+      <div class="date-picker">
+
+        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" style="width:200px;margin-left:10px;">
+
+          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">{{ item.year+'年'+item.month+'月' }}</Option>
+
+        </Select>
+      </div>
+      <div class="shop-list" v-if="!closeShop">
+        <Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询" style="width:200px;margin-left:10px;">
+          <Scroll :on-reach-bottom="handleReachBottom">
+            <Option v-for="(item,index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
+          </Scroll>
+        </Select>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getShopListData } from "@/api/shops.js";
+export default {
+  props: ["closeShop"],
+  data() {
+    return {
+      month: "",
+      year: "",
+
+      defuaultWay: {
+        title: "最近7天",
+        selected: true,
+        searchType: "LAST_SEVEN",
+      },
+
+      selectedWay: {
+        title: "最近7天",
+        selected: true,
+        searchType: "LAST_SEVEN",
+      },
+      storeId: "",
+      dates: [],
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        storeName: "",
+      },
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
+
+      shopTotal: "",
+      shopsData: [],
+    };
+  },
+  mounted() {
+    this.getFiveYears();
+    this.getShopList();
+  },
+  methods: {
+    handleReachBottom() {
+      setTimeout(() => {
+        if (this.params.pageNumber * this.params.pageSize <= this.total) {
+          this.params.pageNumber++;
+          this.getShopList();
+        }
+      }, 1500);
+    },
+    getShopList() {
+      getShopListData(this.params).then((res) => {
+        if (res.success) {
+          /**
+           * 解决数据请求中，滚动栏会一直上下跳动
+           */
+          this.shopTotal = res.result.total;
+
+          this.shopsData.push(...res.result.records);
+        }
+      });
+    },
+    changeshop(val) {
+      this.selectedWay.storeId = this.storeId;
+      this.$emit("selected", this.selectedWay);
+    },
+
+    // 获取近5年 年月
+    getFiveYears() {
+      let getYear = new Date().getFullYear();
+
+      let lastFiveYear = getYear - 5;
+      let maxMonth = new Date().getMonth() + 1;
+      let dates = [];
+      // 循环出过去5年
+      for (let year = lastFiveYear; year <= getYear; year++) {
+        for (let month = 1; month <= 12; month++) {
+          if (year == getYear && month > maxMonth) {
+          } else {
+            dates.push({
+              year: year,
+              month: month,
+            });
+          }
+        }
+      }
+      this.dates = dates.reverse();
+    },
+
+    changeSelect() {
+      console.log(this.month);
+      if (this.month) {
+        this.dateList.forEach((res) => {
+          res.selected = false;
+        });
+        this.selectedWay.year = this.month.split("-")[0];
+        this.selectedWay.month = this.month.split("-")[1];
+        this.selectedWay.searchType = "";
+
+        this.$emit("selected", this.selectedWay);
+        // console.log(this.$emit("selected", this.selectedWay));
+      } else {
+      }
+    },
+
+    clickBreadcrumb(item) {
+      this.dateList.forEach((res) => {
+        res.selected = false;
+      });
+      item.selected = true;
+      item.storeId = this.storeId;
+      this.month = "";
+
+      if (item.searchType == "") {
+        item.searchType = "LAST_SEVEN";
+      }
+
+      this.selectedWay = item;
+      // this.month = "";
+      this.selectedWay.year = new Date().getFullYear();
+      this.selectedWay.month = "";
+
+      this.$emit("selected", this.selectedWay);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.breadcrumb {
+  display: flex;
+  align-items: center;
+  > span {
+    margin-right: 15px;
+    cursor: pointer;
+  }
+}
+.active {
+  color: $theme_color;
+  position: relative;
+}
+.date-picker {
+}
+.active:before {
+  content: "";
+  position: absolute;
+  bottom: -10px;
+  left: 0;
+  width: 100%;
+  height: 3px;
+  background: $theme_color;
+}
+</style>
diff --git a/manager/src/views/lili-components/multiple-region.vue b/manager/src/views/lili-components/multiple-region.vue
new file mode 100644
index 00000000..af2ec330
--- /dev/null
+++ b/manager/src/views/lili-components/multiple-region.vue
@@ -0,0 +1,159 @@
+<template>
+  <Modal :mask-closable="false" :value="switched" v-model="switched" title="选择地址" @on-ok="submit" @on-cancel="cancel">
+    <div class="flex">
+      <Spin size="large" fix v-if="spinShow"></Spin>
+      <Tree ref="tree" class="tree" :data="data" expand-node show-checkbox multiple></Tree>
+    </div>
+  </Modal>
+</template>
+<script>
+import { getAllCity } from "@/api/index";
+export default {
+  data() {
+    return {
+      switched: false,
+      asyncLoading: false,
+      num: 10,
+      modalFlag: false,
+      spinShow: false,
+      timerNum: 10,
+      data: [],
+      id: 0,
+      selectedWay: [],
+      addValidate: {
+        parentName: "无父级",
+      },
+      ruleValidate: {
+        adCode: [
+          {
+            required: true,
+            message: "区域编码不能为空",
+            trigger: "blur",
+          },
+        ],
+
+        center: [
+          {
+            required: true,
+            message: "经纬度不能为空",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: "名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      callBackData: "",
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    cancel() {
+      this.switched = false;
+      // this.$emit("close",true)
+    },
+    open(val) {
+      if (val) {
+        this.callBackData = val;
+        this.data = JSON.parse(JSON.stringify(this.data));
+        val.areaId.split(",").forEach((ids) => {
+          this.data.forEach((item) => {
+            if (item.id == ids) {
+              item.selected = true;
+
+            }
+            item.children &&
+              item.children.forEach((child) => {
+                if (child.id == ids) {
+                  child.checked = true;
+                }
+              });
+          });
+        });
+
+        console.log(this.data);
+      }
+
+      this.switched = true;
+    },
+
+    submit() {
+      // 筛选出省市
+      let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
+      let sort = [];
+      list.forEach((item) => {
+        item.selectedList = [];
+        if (item.level == "province") {
+          sort.push({
+            ...item,
+          });
+        }
+        sort.forEach((sortItem, sortIndex) => {
+          if (item.level != "province" && sortItem.id == item.parentId) {
+            sortItem.selectedList.push({
+              ...item,
+            });
+          }
+        });
+      });
+
+      this.$emit(
+        "selected",
+        list.filter((item) => {
+          return item.level == "province";
+        })
+      );
+
+      this.cancel();
+    },
+
+    init() {
+      getAllCity().then((res) => {
+        if (res.result) {
+          res.result.forEach((item) => {
+            item.children.forEach((child) => {
+              child.title = child.name;
+            });
+
+            let data = {
+              title: item.name,
+
+              ...item,
+            };
+            this.data.push(data);
+            this.selectedWay.push({ name: data.title, id: data.id });
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.flex {
+  display: flex;
+  position: relative;
+}
+.tree {
+  flex: 2;
+}
+.form {
+  flex: 8;
+}
+.button-list {
+  margin-left: 80px;
+  > * {
+    margin: 0 4px;
+  }
+}
+/deep/ .ivu-modal-body {
+  height: 400px !important;
+  overflow: auto;
+}
+</style>
diff --git a/manager/src/views/lili-components/region.vue b/manager/src/views/lili-components/region.vue
new file mode 100644
index 00000000..7210cf0f
--- /dev/null
+++ b/manager/src/views/lili-components/region.vue
@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <Cascader
+      :data="data"
+      :load-data="loadData"
+      change-on-select
+      @on-visible-change="handleChangeOnSelect"
+      @on-change="change"
+    ></Cascader>
+  </div>
+</template>
+<script>
+
+import * as API_Setup from "@/api/index.js";
+export default {
+  data() {
+    return {
+      data: [],
+      selected: [],
+      id: 0,
+      changeOnSelect: false,
+    };
+  },
+  mounted() {
+    this.init();
+  },
+
+  props: ['addressId'],
+  methods: {
+    change(val, selectedData) {
+      /**
+       * @returns [regionId,region]
+       */
+      this.$emit("selected", [
+        val,
+        selectedData[selectedData.length - 1].__label.split("/"),
+      ]);
+    },
+    /**
+     * 动态设置change-on-select的值
+     * 当级联选择器弹窗展开时，设置change-on-select为true，即可以点选菜单选项值发生变化
+     * 当级联选择器弹窗关闭时，设置change-on-select为false，即能够设置初始值
+     */
+    handleChangeOnSelect(value) {
+      this.changeOnSelect = value;
+    },
+    loadData(item, callback) {
+      item.loading = true;
+      API_Setup.getRegion(item.value).then((res) => {
+        if (res.result.length <= 0) {
+          item.loading = false;
+          this.selected = item;
+
+          /**
+           * 处理数据并返回
+           */
+        } else {
+          res.result.forEach((child) => {
+            item.loading = false;
+
+            let data = {
+              value: child.id,
+              label: child.name,
+              loading: false,
+              children: [],
+            };
+
+            if (
+              child.level == "street" ||
+              item.label == "香港特别行政区" ||
+              item.label == "澳门特别行政区"
+            ) {
+              item.children.push({
+                value: child.id,
+                label: child.name,
+              });
+            } else {
+              item.children.push(data);
+            }
+          });
+          this.selected = item;
+          callback();
+        }
+      });
+    },
+    init() {
+      API_Setup.getRegion(this.id).then((res) => {
+        let way = [];
+
+        res.result.forEach((item) => {
+          let data;
+          // 台湾省做处理
+          if (item.name == "台湾省") {
+            data = {
+              value: item.id,
+              label: item.name,
+            };
+          } else {
+            data = {
+              value: item.id,
+              label: item.name,
+              loading: false,
+              children: [],
+            };
+          }
+          way.push(data);
+        });
+
+        this.data = way;
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
new file mode 100644
index 00000000..1760db7f
--- /dev/null
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="wrapper">
+    <div class="wap-content">
+      <div class="query-wrapper">
+        <div class="query-item">
+          <div>搜索范围</div>
+          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName=''; goodsParams.pageNumber = 1; getQueryGoodsList()" @on-enter="()=>{goodsData=[];goodsParams.pageNumber =1; getQueryGoodsList();}" icon="ios-search" clearable
+            style="width: 150px" v-model="goodsParams.goodsName" />
+        </div>
+        <div class="query-item">
+          <Cascader v-model="category" placeholder="请选择商品分类" style="width: 250px" :data="skuList"></Cascader>
+        </div>
+        <div class="query-item">
+          <Button type="primary" @click="goodsData=[]; getQueryGoodsList();" icon="ios-search">搜索</Button>
+        </div>
+      </div>
+      <div style="positon:retavle;">
+        <Scroll class="wap-content-list" :on-reach-bottom="handleReachBottom" :distance-to-edge="[3,3]">
+          <div class="wap-content-item" :class="{ active: item.selected }" @click="checkedGoods(item, index)" v-for="(item, index) in goodsData" :key="index">
+            <div>
+              <img :src="item.thumbnail" alt="" />
+            </div>
+            <div class="wap-content-desc">
+              <div class="wap-content-desc-title">{{ item.goodsName }}</div>
+              <div class="wap-sku">{{ item.goodsUnit }}</div>
+              <div class="wap-content-desc-bottom">
+                <div>￥{{ item.price | unitPrice }}</div>
+              </div>
+            </div>
+          </div>
+          <Spin size="large" fix v-if="loading"></Spin>
+
+          <div v-if="empty" class="empty">暂无商品信息</div>
+        </Scroll>
+
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+export default {
+  data() {
+    return {
+      type: "multiple", //单选或者多选 single  multiple
+
+      skuList: [],
+      model1: "",
+
+      selectedWay: [], //选中商品集合
+      total: "",
+      goodsParams: {
+        pageNumber: 1,
+        pageSize: 18,
+        order: "desc",
+        goodsName: "",
+        sn: "",
+        categoryPath: "",
+        marketEnable: "UPPER",
+        isAuth: "PASS",
+      },
+      category: [],
+      goodsData: [],
+      empty: false,
+      loading: false,
+    };
+  },
+  props: ["clearFlag"],
+  watch: {
+    category(val) {
+      this.goodsParams.categoryPath = val[0];
+    },
+    selectedWay: {
+      handler() {
+        this.$emit("selected", this.selectedWay);
+      },
+      deep: true,
+    },
+
+    "goodsParams.categoryPath": {
+      handler: function () {
+        this.goodsData = [];
+        (this.goodsParams.pageNumber = 0), this.getQueryGoodsList();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    handleReachBottom() {
+      setTimeout(() => {
+        if (
+          this.goodsParams.pageNumber * this.goodsParams.pageSize <=
+          this.total
+        ) {
+          this.goodsParams.pageNumber++;
+          this.getQueryGoodsList();
+        }
+      }, 1500);
+    },
+    getQueryGoodsList() {
+      API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
+        this.initGoods(res);
+      });
+    },
+
+    initGoods(res) {
+      if (res.result.records.length !=0) {
+        res.result.records.forEach((item) => {
+          item.selected = false;
+          item.___type = "goods"; //设置为goods让pc wap知道标识
+        });
+        /**
+         * 解决数据请求中，滚动栏会一直上下跳动
+         */
+        this.total = res.result.total;
+        this.goodsData.push(...res.result.records);
+
+        // console.log(this.goodsData);
+      } else {
+        this.empty = true;
+      }
+    },
+    // 查询商品
+    init() {
+      API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
+        // 商品
+        this.initGoods(res);
+      });
+      if (localStorage.getItem('category')) {
+        this.deepGroup(JSON.parse(localStorage.getItem('category')))
+      } else {
+        setTimeout(() => {
+          this.deepGroup(JSON.parse(localStorage.getItem('category')))
+        },3000)
+      }
+    },
+
+    deepGroup(val) {
+      val.forEach((item) => {
+        let childWay = []; //第二级
+        // 第二层
+        if (item.children) {
+          item.children.forEach((child) => {
+            // // 第三层
+            if (child.children) {
+              child.children.forEach((grandson, index, arr) => {
+                arr[index] = {
+                  value: grandson.id,
+                  label: grandson.name,
+                  children: "",
+                };
+              });
+            }
+            let children = {
+              value: child.id,
+              label: child.name,
+              children: child.children,
+            };
+            childWay.push(children);
+          });
+        }
+        // 第一层
+        let way = {
+          value: item.id,
+          label: item.name,
+          children: childWay,
+        };
+
+        this.skuList.push(way);
+      });
+    },
+
+    /**
+     * 点击商品
+     */
+    checkedGoods(val, index) {
+      // 如果单选的话
+      if (this.type != "multiple") {
+        this.goodsData.forEach((item) => {
+          item.selected = false;
+        });
+        this.selectedWay = [];
+        val.selected = true;
+        this.selectedWay.push(val);
+
+        return false;
+      }
+
+      if (val.selected == false) {
+        val.selected = true;
+        this.selectedWay.push(val);
+      } else {
+        val.selected = false;
+        this.selectedWay.splice(index, 1);
+      }
+      // console.log(this.selectedWay);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+.wap-content {
+  width: 100%;
+}
+.empty {
+  text-align: center;
+  padding: 8px 0;
+  width: 100%;
+}
+.wap-content {
+  flex: 1;
+  padding: 0;
+}
+.wap-content-list {
+  position: relative;
+}
+.wap-content-item {
+  width: 210px;
+  margin: 10px 7px;
+  padding: 6px 0;
+}
+// .wap-content-item{
+
+// }
+.active {
+  background: url("../../assets/selected.png") no-repeat;
+  background-position: right;
+  background-size: 10%;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
new file mode 100644
index 00000000..b0bfb141
--- /dev/null
+++ b/manager/src/views/lili-dialog/index.vue
@@ -0,0 +1,81 @@
+<template>
+  <Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable>
+    <goodsDialog @selected="
+        (val) => {
+          goodsData = val;
+        }
+      " v-if="goodsFlag" ref="goodsDialog" />
+    <linkDialog @selectedLink="
+        (val) => {
+          linkData = val;
+        }
+      " v-else class="linkDialog" />
+  </Modal>
+</template>
+<script>
+import goodsDialog from "./goods-dialog";
+import linkDialog from "./link-dialog";
+export default {
+  components: {
+    goodsDialog,
+    linkDialog,
+  },
+  data() {
+    return {
+      goodsFlag: false,
+      goodsData: "", //选择的商品
+      linkData: "", //选择的链接
+      flag: false,
+    };
+  },
+  props: ["types"],
+  watch: {},
+  mounted() {},
+  methods: {
+    // 关闭弹窗
+    clickClose() {
+      this.$emit("closeFlag", false);
+      this.goodsFlag = false;
+    },
+    // 单选商品
+    singleGoods() {
+      var timer = setInterval(() => {
+        if (this.$refs.goodsDialog) {
+          this.$refs.goodsDialog.type = "single";
+          clearInterval(timer);
+        }
+      }, 100);
+    },
+    clickOK() {
+      if (this.goodsFlag) {
+        this.$emit("selectedGoodsData", this.goodsData);
+      } else {
+        this.$emit("selectedLink", this.linkData);
+      }
+      this.clickClose();
+    },
+    open(type) {
+      this.flag = true;
+      if (type == "goods") {
+        this.goodsFlag = true;
+      } else {
+        this.goodsFlag = false;
+      }
+    },
+    close() {
+      this.flag = false;
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+/deep/ .ivu-modal {
+  overflow: hidden;
+  height: 650px !important;
+}
+/deep/ .ivu-modal-body {
+  width: 100%;
+  height: 500px;
+  overflow: hidden;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue
new file mode 100644
index 00000000..a5a55da6
--- /dev/null
+++ b/manager/src/views/lili-dialog/link-dialog.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="wrapper">
+
+    <Tabs :value="wap[0].title" class="tabs">
+      <TabPane :label="item.title" :name="item.title" @click="clickTag(item, i)" v-for="(item, i) in wap" :key="i">
+        <component ref="lili-component" :is="templateWay[item.name]" @selected="
+          (val) => {
+            changed = val;
+          }
+        " />
+      </TabPane>
+    </Tabs>
+
+  </div>
+</template>
+<script>
+import wap from "./wap.js";
+import goodsDialog from "./goods-dialog";
+import templateWay from "./template/index";
+export default {
+  components: {
+    goodsDialog,
+  },
+  data() {
+    return {
+      templateWay,
+      changed: "",
+      selected: 0,
+      selectedLink: "", //选中的链接
+      wap
+    };
+  },
+  watch: {
+    changed: {
+      handler(val) {
+        this.$emit("selectedLink", val[0]); //因为是单选，所以直接返回第一个
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选
+    });
+
+    this.wap.forEach((item) => {
+      item.selected = false;
+    });
+  },
+  methods: {},
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+.wap-content-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.wap-flex {
+  margin: 2px;
+}
+.tabs {
+  width: 100%;
+}
+
+/deep/ .ivu-modal {
+  overflow: hidden;
+  height: 650px !important;
+}
+/deep/ .ivu-modal-body {
+  width: 100%;
+  height: 500px;
+  overflow: hidden;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/style.scss b/manager/src/views/lili-dialog/style.scss
new file mode 100644
index 00000000..d1ee770e
--- /dev/null
+++ b/manager/src/views/lili-dialog/style.scss
@@ -0,0 +1,96 @@
+.wrapper {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    .wap-list {
+        flex: 2;
+        text-align: center;
+        overflow-y: auto;
+        height: 100%;
+    }
+    > .wap-list,
+
+    .wap-content {
+        flex: 8;
+    }
+}
+.wap-sku {
+    font-size: 12px;
+    color: #999;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    white-space: nowrap;
+}
+.query-wrapper {
+    display: flex;
+    margin: 8px 0;
+    > .query-item {
+        display: flex;
+        align-items: center;
+        > * {
+            margin: 0 4px;
+        }
+    }
+}
+/deep/ .ivu-scroll-container {
+    width: 100% !important;
+    height: 400px !important;
+}
+/deep/ .ivu-scroll-content {
+    /* */
+    display: flex;
+    flex-wrap: wrap;
+}
+.wap-content-list {
+    overflow-y: auto;
+}
+.wap-item {
+    padding: 10px 0;
+    cursor: pointer;
+}
+.wap-item:hover {
+    background: #ededed;
+}
+
+
+.wap-content-item {
+
+    cursor: pointer;
+
+    display: flex;
+    height: 80px;
+    padding: 2px;
+    overflow: hidden;
+    align-items: center;
+    margin: 10px ;
+    /deep/ img {
+        width: 60px;
+        height: 60px;
+        text-align: center;
+    }
+    .wap-content-desc {
+        width: 180px;
+        padding: 8px;
+        > .wap-content-desc-title {
+            display: -webkit-box;
+            font-size: 12px;
+            color: #666;
+
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            -webkit-line-clamp: 2;
+        }
+        > .wap-content-desc-bottom {
+            font-size: 12px;
+            padding: 4px 0;
+            color: #999;
+            display: flex;
+            justify-content: space-between;
+            > div:nth-of-type(1) {
+                color: $theme_color;
+            }
+        }
+    }
+}
diff --git a/manager/src/views/lili-dialog/template/category.vue b/manager/src/views/lili-dialog/template/category.vue
new file mode 100644
index 00000000..66127a55
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/category.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="wrapper">
+    <!-- 一级分类 -->
+    <div class="list">
+      <div class="list-item" :class="{active:parentIndex === cateIndex}" @click="handleClickChild(cate,cateIndex)" v-for="(cate,cateIndex) in categoryList" :key="cateIndex">
+        {{cate.name}}
+      </div>
+    </div>
+    <!-- 二级分类 -->
+    <div class="list">
+      <div class="list-item" :class="{active:secondIndex === secondI}" @click="handleClickSecondChild(second,secondI)" v-if="secondLevel.length != 0" v-for="(second,secondI) in secondLevel"
+        :key="secondI">
+        {{second.name}}
+      </div>
+    </div>
+    <!--三级分类 -->
+    <div class="list">
+      <div class="list-item" :class="{active:thirdIndex === thirdI}" @click="handleClickthirdChild(third,thirdI)" v-if="thirdLevel.length != 0" v-for="(third,thirdI) in thirdLevel" :key="thirdI">
+        {{third.name}}
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+export default {
+  data() {
+    return {
+      parentIndex: '', // 分类父级下标
+      secondIndex: '', // 分类二级下标
+      thirdIndex: '', // 分类三级下标
+      categoryList: [], // 分类列表一级数据
+      secondLevel: [], // 分类列表二级数据
+      thirdLevel: [], // 分类列表三级数据
+      selectedData: "", // 已选分类数据
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    // 点击一级
+    handleClickChild(item, index) {
+      this.parentIndex = index;
+      this.secondLevel = item.children;
+      item.___type = "category";
+      item.allId = item.id;
+
+      this.secondIndex = '';
+      this.thirdIndex = '';
+      this.thirdLevel = []
+      this.$emit("selected", [item]);
+      // 点击第一级的时候默认显示第二级第一个
+      // this.handleClickSecondChild(item.children, 0);
+    },
+    // 点击二级
+    handleClickSecondChild(second, index) {
+      second.___type = "category";
+      second.allId = `${second.parentId},${second.id}`
+
+      this.secondIndex = index;
+      this.thirdLevel = second.children;
+      this.thirdIndex = '';
+      this.$emit("selected", [second]);
+      // this.handleClickthirdChild(second.children[0], 0);
+    },
+    // 点击三级
+    handleClickthirdChild(item, index) {
+      item.___type = "category";
+      item.allId = `${this.categoryList[this.parentIndex].id},${item.parentId},${item.id}`
+      this.$emit("selected", [item]);
+      this.thirdIndex = index;
+    },
+    init() {
+      let category = JSON.parse(localStorage.getItem('category'))
+      if (category) {
+        category.forEach((item) => {
+          item.___type = "category";
+        });
+        this.categoryList = category;
+        // this.handleClickChild(category[0], 0);
+      } else {
+        setTimeout(() => {
+          category = JSON.parse(localStorage.getItem('category'))
+          category.forEach((item) => {
+            item.___type = "category";
+          });
+          this.categoryList = category;
+          // this.handleClickChild(category[0], 0);
+        },3000)
+      }
+      
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.list {
+  width: 30%;
+  margin: 0 1.5%;
+  height: 400px;
+  overflow: auto;
+  > .list-item {
+    padding: 10px;
+    transition: 0.35s;
+    cursor: pointer;
+  }
+  .list-item:hover {
+    background: #ededed;
+  }
+}
+.active {
+  background: #ededed;
+}
+.wrapper {
+  overflow: hidden;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/template/index.js b/manager/src/views/lili-dialog/template/index.js
new file mode 100644
index 00000000..83d39f35
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/index.js
@@ -0,0 +1,15 @@
+
+import category from './category.vue'
+import shops from './shops.vue'
+import marketing from './marketing.vue'
+import pages from './pages.vue'
+import goods from '../goods-dialog.vue'
+import other from './other.vue'
+export default {
+  pages,
+  marketing,
+  shops,
+  category,
+  goods,
+  other,
+}
diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue
new file mode 100644
index 00000000..40932bf2
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/marketing.vue
@@ -0,0 +1,445 @@
+<template>
+  <div class="wrapper">
+    <div class="list">
+
+      <div class="list-item" @click="clickPromotion(item,index)" v-for="(item,index) in Object.keys(promotionList)" :key="index" :class="{active:selectedIndex == index}">
+        {{ typeOption[item].title}}
+      </div>
+
+      <!-- <div class="list-item" >暂无活动</div> -->
+    </div>
+    <div class="content">
+      <div v-if="showPromotionList">
+        <!-- <div class="search-views">
+          <Input v-model="value11" disabled class="search">
+          <span slot="prepend">店铺名称</span>
+          </Input>
+          <Button type="primary">选择</Button>
+
+        </div> -->
+
+        <div class="tables">
+
+          <Table height="350" border tooltip :loading="loading" :columns="activeColumns" :data="showPromotionList"></Table>
+
+          <Page @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" class="page" :total="totals" size="small" show-elevator />
+
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getAllPromotion,
+  getPromotionSeckill,
+  getPromotionGoods,
+} from "@/api/promotion";
+
+// 引用店铺
+// import shopListDialog from "@/views/seller/shop/";
+export default {
+  data() {
+    return {
+      totals: "",
+      loading: true, //表格请求数据为true
+      promotionList: "",
+      selectedIndex: 0, //左侧菜单选择
+      promotions: "", //选中的活动key
+      index: 999,
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+      },
+      pintuanColumns: [
+        {
+          title: "活动标题",
+          key: "title",
+          tooltip: true,
+          width: 250,
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          tooltip: true,
+        },
+        {
+          title: "店铺名称",
+          key: "sellerName",
+          tooltip: true,
+        },
+        {
+          title: "开始时间",
+          key: "startTime",
+          tooltip: true,
+        },
+        {
+          title: "结束时间",
+          key: "endTime",
+          tooltip: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          fixed: "right",
+          width: 100,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: this.index == params.index ? "primary" : "",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.selectedPromotion(params);
+                    },
+                  },
+                },
+                this.index == params.index ? "已选" : "选择"
+              ),
+            ]);
+          },
+        },
+      ],
+      seckillColumns: [
+        {
+          title: "商品名称",
+          key: "goodsName",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          title: "店铺名称",
+          key: "sellerName",
+          tooltip: true,
+        },
+        {
+          title: "活动时间",
+          key: "timeLine",
+          tooltip: true,
+          render: (h, params) => {
+            return h("div", {}, `${params.row.timeLine}点`);
+          },
+        },
+
+        {
+          title: "原价",
+          key: "originalPrice",
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              {},
+              this.$options.filters.unitPrice(params.row.originalPrice)
+            );
+          },
+        },
+        {
+          title: "现价",
+          key: "price",
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              {
+                style: {},
+              },
+              this.$options.filters.unitPrice(params.row.price)
+            );
+          },
+        },
+        {
+          title: "状态",
+          key: "promotionApplyStatus",
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "div",
+              {
+                style: {},
+              },
+              params.row.promotionApplyStatus == "APPLY"
+                ? "申请"
+                : params.row.promotionApplyStatus == "PASS"
+                ? "通过"
+                : "拒绝"
+            );
+          },
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          width: 100,
+          fixed: "right",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: this.index == params.index ? "primary" : "",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.selectedPromotion(params);
+                    },
+                  },
+                },
+                this.index == params.index ? "已选" : "选择"
+              ),
+            ]);
+          },
+        },
+      ],
+
+      activeColumns: [],
+
+      columns: [
+        {
+          title: "活动标题",
+          key: "title",
+          tooltip: true,
+          width: 200,
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          tooltip: true,
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          tooltip: true,
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          tooltip: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          fixed: "right",
+          width: 100,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: this.index == params.index ? "primary" : "",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.selectedPromotion(params);
+                    },
+                  },
+                },
+                this.index == params.index ? "已选" : "选择"
+              ),
+            ]);
+          },
+        },
+      ],
+
+      promotionData: "", //商品集合
+
+      showPromotionList: [], //显示当前促销的商品
+      typeOption: {
+        FULL_DISCOUNT: {
+          title: "满减",
+          methodsed: () => {
+            this.showPromotionList = [];
+            this.activeColumns = this.pintuanColumns;
+            this.params.promotionType = "FULL_DISCOUNT";
+
+            this.sortGoods("FULL_DISCOUNT");
+          },
+        },
+        PINTUAN: {
+          title: "拼团",
+          methodsed: (id) => {
+            this.showPromotionList = [];
+            this.activeColumns = this.pintuanColumns;
+            this.params.promotionType = "PINTUAN";
+            this.sortGoods("PINTUAN");
+          },
+        },
+        SECKILL: {
+          title: "秒杀",
+          methodsed: () => {
+            this.showPromotionList = [];
+            this.activeColumns = this.seckillColumns;
+            this.params.seckillId = this.promotionList["SECKILL"].id;
+            delete this.params.promotionType;
+
+            getPromotionSeckill(this.params).then((res) => {
+              delete this.params.seckillId;
+              this.showPromotionList = this.showPromotionList.concat(
+                res.result.records
+              );
+
+              this.totals = res.result.total;
+              console.log(this.totals);
+            });
+          },
+        },
+        COUPON: {
+          title: "优惠券",
+          methodsed: () => {
+            this.showPromotionList = [];
+            this.params.promotionType = "COUPON";
+            this.sortGoods("COUPON");
+          },
+        },
+        POINTS_GOODS: {
+          title: "积分商品",
+          methodsed: () => {
+            this.showPromotionList = [];
+            this.params.promotionType = "POINTS_GOODS";
+            this.sortGoods("POINTS_GOODS");
+          },
+        },
+      },
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    params: {
+      handler() {
+        this.index = 999;
+        this.typeOption[this.promotions] &&
+          this.typeOption[this.promotions].methodsed();
+      },
+      deep: true,
+    },
+  },
+
+  methods: {
+    sortGoods(type) {
+      this.loading = true;
+      this.params.pageNumber - 1;
+      getPromotionGoods(this.promotionList[type].id, this.params).then(
+        (res) => {
+          this.loading = false;
+          if (res.result) {
+            this.$nextTick(() => {
+              this.showPromotionList = this.showPromotionList.concat(
+                res.result.records
+              );
+              console.log(this.totals);
+              this.totals = res.result.total;
+            });
+          }
+        }
+      );
+    },
+    // 选择活动
+    selectedPromotion(val) {
+      console.log(val);
+      val.row.___type = "marketing";
+      val.row.___promotion = this.promotions;
+      this.$emit("selected", [val.row]);
+      console.log([val.row]);
+
+      this.index = val.index;
+    },
+    // 获取所有营销的活动
+    async init() {
+      let res = await getAllPromotion();
+      if (res.success) {
+        this.loading = false;
+        this.getPromotion(res);
+        this.clickPromotion(this.typeOption[Object.keys(res.result)[0]], 0);
+      } else {
+        this.loading = false;
+      }
+    },
+    getPromotion(res) {
+      this.promotionList = res.result;
+
+      if (Object.keys(res.result).length) {
+        this.typeOption[Object.keys(res.result)[0]].methodsed(
+          this.promotionList[Object.keys(res.result)[0]].id
+        );
+      }
+    },
+
+    // 点击某个活动查询活动列表
+    clickPromotion(val, i) {
+      this.promotions = val;
+      this.selectedIndex = i;
+      this.params.pageNumber = 1;
+      this.typeOption[val] &&
+        this.typeOption[val].methodsed(this.promotionList[val].id);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+img {
+  max-width: 100% !important;
+}
+.search {
+  width: 300px;
+}
+.page {
+  margin-top: 2vh;
+  text-align: right;
+}
+.time {
+  font-size: 12px;
+}
+.tables {
+  height: 400px;
+  margin-top: 20px;
+  overflow: auto;
+  width: 100%;
+}
+/deep/ .ivu-table-wrapper {
+  width: 100%;
+}
+.list {
+  margin: 0 1.5%;
+  height: 400px;
+  overflow: auto;
+  > .list-item {
+    padding: 10px;
+    transition: 0.35s;
+    cursor: pointer;
+  }
+  .list-item:hover {
+    background: #ededed;
+  }
+}
+.list {
+  flex: 1;
+  width: auto;
+}
+.content {
+  overflow: hidden;
+  flex: 4;
+}
+.active {
+  background: #ededed;
+}
+.wrapper {
+  overflow: hidden;
+}
+.search-views {
+  display: flex;
+  > * {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/manager/src/views/lili-dialog/template/other.vue b/manager/src/views/lili-dialog/template/other.vue
new file mode 100644
index 00000000..96c058e9
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/other.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <Row :gutter="30">
+      <Col span="6" v-for="(item,index) in linkList" :key="index" v-if="(item.title !== '拼团频道' && item.title !== '签到') || $route.name !== 'renovation'">
+        <div class="card" :class="{'active':selectedIndex == index}" @click="handleLink(item,index)">
+          <Icon size="24" :type="item.icon" />
+          <p>{{item.title}}</p>
+        </div>
+      </Col>
+      <!-- 外部链接，只有pc端跳转 -->
+      <Col span="6" v-if="$route.name === 'renovation'">
+        <div class="card" :class="{'active':selectedIndex == linkList.length}" @click="handleLink(linkItem,linkList.length)">
+          <Poptip v-model="linkVisible">
+              <Icon size="24" :type="linkItem.icon" />
+              <p>{{linkItem.title}}</p>
+              <div slot="title">链接地址</div>
+              <div slot="content">
+                  <Input type="text" @keyup="handleLink(linkItem,linkList.length)" v-model="linkItem.url" placeholder="https://"></Input>
+              </div>
+          </Poptip>
+          
+        </div>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      linkList: [
+        {
+          title: "首页",
+          icon: "md-home",
+          ___type: "home",
+        },
+        {
+          title: "购物车",
+          icon: "md-cart",
+          ___type: "cart",
+        },
+        {
+          title: "收藏商品",
+          icon: "md-heart",
+          ___type: "collection",
+        },
+        {
+          title: "我的订单",
+          icon: "md-document",
+          ___type: "order",
+        },
+        {
+          title: "个人中心",
+          icon: "md-person",
+          ___type: "user",
+        },
+        {
+          title: "拼团频道",
+          icon: "md-flame",
+          ___type: "group",
+        },
+        {
+          title: "秒杀频道",
+          icon: "md-flame",
+          ___type: "seckill",
+        },
+        {
+          title: "领券中心",
+          icon: "md-pricetag",
+          ___type: "coupon",
+        },
+        {
+          title: "签到",
+          icon: "md-happy",
+          ___type: "sign",
+        },
+        
+      ],
+      linkItem: {
+        title: "外部链接",
+        icon: "ios-link",
+        ___type: "link",
+        url: ''
+      },
+      linkVisible: false,
+      selectedIndex: 9999999,
+    };
+  },
+  methods: {
+    handleLink(val, index) {
+      val = {...val,___type:'other'}
+      this.selectedIndex = index;
+      if (index === this.linkList.length) {
+        this.linkVisible = true
+      } else {
+        this.linkVisible = false
+      }
+      this.$emit("selected",[val])
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../style.scss";
+.card {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  padding: 20px 0;
+  margin: 10px 0;
+  text-align: center;
+  transition: 0.35s;
+  cursor: pointer;
+  /deep/ p {
+    margin: 10px 0;
+  }
+  border: 1px solid #ededed;
+}
+.card:hover{
+   background: #ededed;
+}
+.active {
+  background: #ededed;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/template/pages.vue b/manager/src/views/lili-dialog/template/pages.vue
new file mode 100644
index 00000000..8a151a3f
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/pages.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="wrapper">
+    <div class="list">
+      <div class="list-item active">
+        文章页
+      </div>
+    </div>
+    <div class="content">
+      <Article @callbacked="callbackArticle" :selected="true" />
+    </div>
+
+  </div>
+</template>
+<script>
+import Article from "@/views/page/article-manage/articleList.vue";
+export default {
+  components: {
+    Article,
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    callbackArticle(val) {
+      val.___type = "pages";
+
+      val.___path = "/pages/public/article";
+
+      this.$emit("selected", [val]);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .ivu-card-body {
+  height: 414px;
+  overflow: auto;
+}
+.ivu-table-wrapper ivu-table-wrapper-with-border{
+  height: 300px  !important;
+}
+.list {
+  margin: 0 1.5%;
+  height: 400px;
+  overflow: auto;
+  > .list-item {
+    padding: 10px;
+    transition: 0.35s;
+    cursor: pointer;
+  }
+  .list-item:hover {
+    background: #ededed;
+  }
+}
+.list {
+  flex: 2;
+  width: auto;
+}
+.content {
+  overflow: hidden;
+  flex: 8;
+  height: 431px;
+}
+.active {
+  background: #ededed;
+}
+.wrapper {
+  height: 416px;
+  overflow: hidden;
+}
+/deep/ .ivu-table {
+  height: 300px !important;
+  overflow: auto;
+}
+/deep/ .ivu-card-body {
+  padding: 0;
+  height: auto;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/template/shops.vue b/manager/src/views/lili-dialog/template/shops.vue
new file mode 100644
index 00000000..af5b3e8a
--- /dev/null
+++ b/manager/src/views/lili-dialog/template/shops.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="shop">
+    <div class="wap-content">
+      <div class="query-wrapper">
+        <div class="query-item">
+          <div>店铺名称</div>
+          <Input placeholder="请输入店铺名称" @on-clear="shopsData=[]; params.storeName=''; params.pageNumber =1; init()" @on-enter="()=>{shopsData=[]; params.pageNumber =1; init();}" icon="ios-search" clearable style="width: 150px"
+            v-model="params.storeName" />
+        </div>
+
+        <div class="query-item">
+          <Button type="primary" @click="shopsData=[];params.pageNumber =1; init();" icon="ios-search">搜索</Button>
+        </div>
+      </div>
+      <div>
+        <Scroll class="wap-content-list" :on-reach-bottom="handleReachBottom" :distance-to-edge="23">
+          <div class="wap-content-item" @click="clickShop(item,index)" :class="{ active:selected == index }" v-for="(item, index) in shopsData" :key="index">
+            <div>
+              <img class="shop-logo" :src="item.storeLogo" alt="" />
+            </div>
+            <div class="wap-content-desc">
+              <div class="wap-content-desc-title">{{ item.storeName }}</div>
+
+              <div class="self-operated" :class="{'theme_color':item.selfOperated }">{{ item.selfOperated ? '自营' : '非自营' }}</div>
+              <div class="wap-sku" :class="{'theme_color':!item.shopDisable }">{{ item.shopDisable ? '开启中' : '关闭' }}</div>
+            </div>
+          </div>
+          <Spin size="large" fix v-if="loading"></Spin>
+        </Scroll>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getShopListData } from "@/api/shops.js";
+export default {
+  data() {
+    return {
+      loading: false,
+      total: "",
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        storeName: "",
+      },
+      shopsData: [],
+      selected: 9999999999, //设置一个不可能选中的index
+    };
+  },
+  watch: {},
+
+  created() {
+    this.init();
+  },
+  methods: {
+    handleReachBottom() {
+      setTimeout(() => {
+        if (this.params.pageNumber * this.params.pageSize <= this.total) {
+          this.params.pageNumber++;
+          this.init();
+        }
+      }, 1500);
+    },
+    init() {
+      this.loading = true;
+      getShopListData(this.params).then((res) => {
+        if (res.success) {
+          /**
+           * 解决数据请求中，滚动栏会一直上下跳动
+           */
+          this.total = res.result.total;
+
+          this.shopsData.push(...res.result.records);
+
+          this.loading = false;
+        }
+      });
+    },
+    clickShop(val, i) {
+      this.selected = i;
+      val = { ...val, ___type: "shops" };
+      this.$emit("selected", [val]);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../style.scss";
+.shop {
+  display: flex;
+}
+.self-operated {
+  font-size: 12px;
+  color: #999;
+}
+.wap-content-list {
+  flex-wrap: wrap;
+}
+.shop-logo {
+  object-fit: cover;
+}
+.wap-content-item {
+}
+.active {
+  background: url("../../../assets/selected.png") no-repeat;
+  background-position: right;
+  background-size: 10%;
+}
+</style>
diff --git a/manager/src/views/lili-dialog/wap.js b/manager/src/views/lili-dialog/wap.js
new file mode 100644
index 00000000..2d2d675c
--- /dev/null
+++ b/manager/src/views/lili-dialog/wap.js
@@ -0,0 +1,33 @@
+export default [
+  {
+    title: "商品",
+    url: "0",
+    openGoods: true,
+    name: "goods"
+  },
+  {
+    title: "分类",
+    url: "1",
+    name: "category"
+  },
+  {
+    title: "店铺",
+    url: "2",
+    name: "shops"
+  },
+  {
+    title: "活动",
+    url: "3",
+    name: "marketing"
+  },
+  {
+    title: "页面",
+    url: "3",
+    name: "pages"
+  },
+  {
+    title: "其他",
+    url: "3",
+    name: "other"
+  }
+];
diff --git a/manager/src/views/lili-empty/index.vue b/manager/src/views/lili-empty/index.vue
new file mode 100644
index 00000000..413afcb2
--- /dev/null
+++ b/manager/src/views/lili-empty/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class="empty">
+    <img  src="../../assets/empty.png" alt="">
+    暂无数据
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss" scoped>
+.empty{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  >img{
+    margin-bottom: 10px;
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/floorList copy.vue b/manager/src/views/lili-floor-renovation/floorList copy.vue
new file mode 100644
index 00000000..ac7610e5
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/floorList copy.vue	
@@ -0,0 +1,254 @@
+<template>
+  <div class="floor-list">
+    <div class="list">
+      <div class="template-saved" v-for="item in templateList" :key="item.id">
+        <div class="template-title">
+          <span>{{ item.name }}</span>
+          <span :class="{ 'theme-color': item.pageShow == 'OPEN' }">{{
+            item.pageShow == "OPEN" ? "已发布" : "未发布"
+          }}</span>
+        </div>
+        <div class="template-content">
+          <!-- <img :src="item.img || require(`@/assets/img-error.png`)" alt=""> -->
+          <div class="cover">
+            <Button icon="md-color-palette" @click="decorate(item.id)"
+              >装修</Button
+            >
+            <Button icon="md-pricetags" @click="Template(item)">编辑</Button>
+            <Button
+              icon="md-send"
+              v-if="item.pageShow == 'CLOSE'"
+              @click="releaseTemplate(item.id)"
+              >发布</Button
+            >
+            <Button
+              icon="md-trash"
+              v-if="item.pageShow == 'CLOSE'"
+              @click="delTemplate(item.id)"
+              >删除</Button
+            >
+          </div>
+        </div>
+      </div>
+      <div class="new-template" @click="createTemp">
+        <Icon type="md-add" />
+        <div>新建模板</div>
+      </div>
+    </div>
+    <Modal
+      v-model="showModal"
+      title="模板设置"
+      draggable
+      width="600"
+      :z-index="100"
+      :loading="loading"
+      mask-closable="false"
+      @on-ok="newTemplate"
+      @on-cancel="showModal = false"
+    >
+      <Form ref="form" :model="formData" :rules="rules" :label-width="80">
+        <FormItem label="模板名称" prop="name">
+          <Input v-model="formData.name" placeholder="请输入模板名称" />
+        </FormItem>
+      </Form>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_floor from "@/api/other.js";
+export default {
+  name: "floorList",
+  data() {
+    return {
+      showModal: false,
+      templateList: [],
+      formData: {
+        status: false,
+        name: "",
+      },
+      rules: {
+        name: [{ required: true, message: "请输入模板名称", trigger: "blur" }],
+      },
+      loading: true,
+    };
+  },
+  mounted() {
+    let height = window.innerHeight - 150;
+    document.querySelector(".floor-list").style.height = height + "px";
+    this.getTemplateList();
+  },
+  methods: {
+    newTemplate() {
+      // 添加，编辑模板
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const data = this.formData;
+          data.status ? (data.pageShow = "OPEN") : (data.pageShow = "CLOSE");
+          delete data.status;
+          (data.pageType = "INDEX"), (data.pageClientType = "PC");
+          if (data.id) {
+            API_floor.updateHome(data.id, data).then((res) => {
+              this.$Message.success("编辑模板成功");
+              this.showModal = false;
+              this.getTemplateList();
+            });
+          } else {
+            API_floor.setHomeSetup(data).then((res) => {
+              this.$Message.success("新建模板成功");
+              this.showModal = false;
+              this.getTemplateList();
+            });
+          }
+        } else {
+          this.loading = false;
+        }
+      });
+    },
+
+    createTemp() {
+      // 新建表单
+      this.$refs.form.resetFields();
+      this.showModal = true;
+    },
+
+    Template(item) {
+      // 编辑表单
+      item.pageShow == "OPEN" ? (item.status = true) : (item.status = false);
+      this.formData = item;
+      this.showModal = true;
+    },
+
+    decorate(id) {
+      // 装修
+      this.$router.push({ name: "renovation", query: { id: id } });
+    },
+
+    getTemplateList() {
+      //模板列表
+      let params = {
+        pageNumber: 1,
+        pageSize: 999,
+        pageType: "INDEX",
+        pageClientType: "PC",
+      };
+      API_floor.getHomeList(params).then((res) => {
+        if (res.code == 200) {
+          this.templateList = res.result.records;
+        }
+      });
+    },
+
+    releaseTemplate(id) {
+      //发布模板
+      API_floor.releasePageHome(id).then((res) => {
+        if (res.code === 200) {
+          this.$Message.success("发布模板成功");
+          this.getTemplateList();
+        }
+      });
+    },
+
+    delTemplate(id) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "<p>确定删除该模板吗？</p>",
+        onOk: () => {
+          API_floor.removePageHome(id).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success("删除模板成功");
+              this.getTemplateList();
+            }
+          });
+        },
+        onCancel: () => {},
+      });
+    },
+  },
+  computed: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.floor-list {
+  background-color: #fff;
+  width: 100%;
+}
+.list {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  display: flex;
+  flex-wrap: wrap;
+  > div {
+    width: 260px;
+    height: 450px;
+    margin: 10px 15px;
+    border: 1px solid #eee;
+    border-radius: 5px;
+  }
+  .new-template {
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    border: 2px dashed $theme_color;
+    color: $theme_color;
+    background: #f88c7138;
+    .ivu-icon {
+      font-size: 30px;
+      margin-bottom: 10px;
+    }
+  }
+  .template-saved {
+    overflow: hidden;
+    .template-title {
+      padding: 10px;
+      background: #eee;
+      display: flex;
+      justify-content: space-between;
+      .theme-color {
+        color: $theme_color;
+      }
+    }
+  }
+  .template-content {
+    height: 407px;
+    width: 100%;
+    position: relative;
+    background: #ddd;
+    &:hover {
+      .cover {
+        visibility: visible;
+      }
+    }
+    img {
+      width: 100%;
+      height: 100%;
+    }
+    .cover {
+      visibility: hidden;
+      width: 100%;
+      height: 407px;
+      background: rgba(0, 0, 0, 0.3);
+      position: absolute;
+      top: 0;
+      left: 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      .ivu-btn {
+        margin-bottom: 10px;
+        background: transparent;
+        color: #fff;
+        border-color: #fff;
+        &:hover {
+          background-color: $theme_color;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
new file mode 100644
index 00000000..dc1624cc
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -0,0 +1,251 @@
+<template>
+  <div class="wrapper">
+    <Card class="category">
+      <div :class="{active:i == selectedIndex}" class="category-item" v-for="(typeItem,i) in pageTypes" :key="typeItem.type">
+        <div @click="clickType(typeItem.type,i)">{{typeItem.title}}</div>
+      </div>
+    </Card>
+    <Card class="content">
+      <Button type="primary" @click="createTemp">添加页面</Button>
+      <div class="list">
+        <Spin size="large" fix v-if="loading"></Spin>
+        <div class="item item-title">
+          <div>页面名称</div>
+          <div class="item-config">
+            <div>状态</div>
+            <div>操作</div>
+          </div>
+        </div>
+
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div>{{ item.name || "暂无模板昵称" }}</div>
+          <div class="item-config">
+            <i-switch v-model="item.pageShow" @on-change="releaseTemplate(item.id)">
+              <span slot="open">开</span>
+              <span slot="close">关</span>
+            </i-switch>
+            <Button type="info" placement="right" @click="Template(item)" size="small">编辑</Button>
+            <Button type="success" placement="right" @click="decorate(item.id)" size="small">装修</Button>
+            <Poptip confirm title="删除此模板？" @on-ok="delTemplate(item.id)" @on-cancel="cancel">
+              <Button type="error" size="small">删除</Button>
+            </Poptip>
+          </div>
+        </div>
+        <div class="no-more" v-if="list.length ==0">暂无更多模板</div>
+      </div>
+
+    </Card>
+    <Modal
+      v-model="showModal"
+      title="模板设置"
+      draggable
+      width="600"
+      :z-index="100"
+      :loading="loading"
+      mask-closable="false"
+      @on-ok="newTemplate"
+      @on-cancel="showModal = false"
+    >
+      <Form ref="form" :model="formData" :rules="rules" :label-width="80">
+        <FormItem label="模板名称" prop="name">
+          <Input v-model="formData.name" placeholder="请输入模板名称" />
+        </FormItem>
+      </Form>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_floor from "@/api/other.js";
+export default {
+  name: "floorList",
+  data() {
+    return {
+      showModal: false,  // 添加modal的显示
+      selectedIndex: 0, // 首页还是专题选择的index
+      formData: { // 新建模态框的数据
+        status: false, // 模板是否开启
+        name: "", // 模板名称
+      },
+      columns: [ // 列表展示的column
+        {
+          title: "页面名称",
+          key: "name",
+        },
+        {
+          title: "状态",
+        },
+        {
+          title: "操作",
+          key: "action",
+        },
+      ],
+
+      loading: false, // 加载状态
+      pageTypes: [ // 那种类别的模板
+        {
+          type: "INDEX",
+          title: "首页",
+        }
+        // {
+        //   type: "SPECIAL",
+        //   title: "专题",
+        // },
+      ],
+      list: [], // 模板列表
+    };
+  },
+  mounted() {
+    this.getTemplateList();
+  },
+  methods: {
+    newTemplate() {
+      // 添加，编辑模板
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const data = this.formData;
+          data.status ? (data.pageShow = "OPEN") : (data.pageShow = "CLOSE");
+          delete data.status;
+          (data.pageType = "INDEX"), (data.pageClientType = "PC");
+          if (data.id) {
+            API_floor.updateHome(data.id, data).then((res) => {
+              this.$Message.success("编辑模板成功");
+              this.showModal = false;
+              this.getTemplateList();
+            });
+          } else {
+            API_floor.setHomeSetup(data).then((res) => {
+              this.$Message.success("新建模板成功");
+              this.showModal = false;
+              this.getTemplateList();
+            });
+          }
+        } else {
+          this.loading = false;
+        }
+      });
+    },
+
+    createTemp() {
+      // 新建表单
+      this.$refs.form.resetFields();
+      this.showModal = true;
+    },
+
+    Template(item) {
+      // 编辑表单
+      item.status = item.pageShow
+      this.formData = item;
+      this.showModal = true;
+    },
+
+    decorate(id) {
+      // 装修
+      this.$router.push({ name: "renovation", query: { id: id } });
+    },
+
+    getTemplateList() {
+      //模板列表
+      let params = {
+        pageNumber: 1,
+        pageSize: 999,
+        pageType: "INDEX",
+        pageClientType: "PC",
+      };
+      API_floor.getHomeList(params).then((res) => {
+        if (res.code == 200) {
+          this.list = res.result.records;
+          this.list.forEach(e => {
+            if (e.pageShow === 'OPEN') {
+              e.pageShow = true
+            } else {
+              e.pageShow = false
+            }
+          })
+        }
+      });
+    },
+
+    releaseTemplate(id) {
+      //发布模板
+      API_floor.releasePageHome(id).then((res) => {
+        if (res.code === 200) {
+          this.$Message.success("发布模板成功");
+          this.getTemplateList();
+        }
+      });
+    },
+
+    delTemplate(id) {
+      API_floor.removePageHome(id).then((res) => {
+        if (res.code === 200) {
+          this.$Message.success("删除模板成功");
+          this.getTemplateList();
+        }
+      });
+    },
+  },
+  computed: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.category-item {
+  cursor: pointer;
+  padding: 4px;
+}
+.active {
+  background: #ededed;
+}
+.item-title {
+  background: #f5f7fa;
+  height: 54px;
+}
+.no-more {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.wrapper {
+  background: #fff;
+  padding: 20px;
+  display: flex;
+}
+.category {
+  flex: 2;
+}
+.content {
+  flex: 8;
+}
+* {
+  margin: 5px;
+}
+.list {
+  min-height: 600px;
+  position: relative;
+}
+.item:nth-of-type(2) {
+  margin: 0 5px;
+}
+.item {
+  width: 100% !important;
+  padding: 0 4px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  > .item-config {
+    width: 250px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    div:nth-child(2){
+      margin-right: 80px;
+    }
+  }
+}
+.item:nth-of-type(3n) {
+  background: #f5f7fa;
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/modelConfig.js b/manager/src/views/lili-floor-renovation/modelConfig.js
new file mode 100644
index 00000000..55fb3711
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelConfig.js
@@ -0,0 +1,341 @@
+export const modelData = [
+    {
+        type:'carousel',
+        name:'图片轮播',
+        icon:'md-image',
+        showName:'',
+        size:"790*340",
+        options:{
+            list:[
+                {
+                    img:require('@/assets/nav/1.jpg'),
+                    url:''
+                },
+                {
+                    img:require('@/assets/nav/2.jpg'),
+                    url:''
+                },
+                {
+                    img:require('@/assets/nav/3.jpg'),
+                    url:''
+                }
+            ],
+        },
+    },
+    {
+        type:'hotAdvert',
+        name:'热门广告',
+        icon:'md-image',
+        showName:'',
+        options:{
+            list:[
+                {
+                    img:"https://demo.dscmall.cn/storage/data/gallery_album/116/original_img/116_P_1573790294398.png",
+                    url:'',
+                    size:'1200*自定义'
+                },
+                {
+                    img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434094179058.png',
+                    url:'',
+                    size:'230*190'
+                },
+                {
+                    img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434094179058.png',
+                    url:'',
+                    size:'230*190'
+                },
+                {
+                    img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434094179058.png',
+                    url:'',
+                    size:'230*190'
+                },
+                {
+                    img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434094179058.png',
+                    url:'',
+                    size:'230*190'
+                },
+                {
+                    img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434094179058.png',
+                    url:'',
+                    size:'230*190'
+                }
+            ],
+        },
+    },
+    {
+        type:'seckill',
+        name:'促销活动',
+        icon:'md-image',
+        showName:'',
+        options:{
+            list:[
+                {
+                    time:6,
+                    goodsList:[
+                        {img:require('@/assets/nav/1.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafads123213a', url:''},
+                        {img:require('@/assets/nav/2.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/3.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/4.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/5.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/1.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/2.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/3.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/4.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                        {img:require('@/assets/nav/5.jpg'), price:20, originalPrice:30, name:'阿迪达斯三叶草asdasdafadsa',url:''},
+                    ]
+                },
+                {
+                    time:8,
+                    goodsList:[
+                        {img:require('@/assets/nav/1.jpg'), url:''},
+                        {img:require('@/assets/nav/2.jpg'), url:''},
+                        {img:require('@/assets/nav/3.jpg'), url:''},
+                        {img:require('@/assets/nav/4.jpg'), url:''},
+                        {img:require('@/assets/nav/5.jpg'), url:''},
+                    ]
+                },
+                {
+                    time:10,
+                    goodsList:[
+                        {img:require('@/assets/nav/1.jpg'), url:''},
+                        {img:require('@/assets/nav/2.jpg'), url:''},
+                        {img:require('@/assets/nav/3.jpg'), url:''},
+                        {img:require('@/assets/nav/4.jpg'), url:''},
+                        {img:require('@/assets/nav/5.jpg'), url:''},
+                    ]
+                },
+                {
+                    time:12,
+                    goodsList:[
+                        {img:require('@/assets/nav/1.jpg'), url:''},
+                        {img:require('@/assets/nav/2.jpg'), url:''},
+                        {img:require('@/assets/nav/3.jpg'), url:''},
+                        {img:require('@/assets/nav/4.jpg'), url:''},
+                        {img:require('@/assets/nav/5.jpg'), url:''},
+                    ]
+                },
+                {
+                    time:14,
+                    goodsList:[]
+                },
+                {
+                    time:16,
+                    goodsList:[]
+                },
+                {
+                    time:18,
+                    goodsList:[]
+                }
+               
+            ]
+        },
+    },
+    {
+        type:'discountAdvert',
+        name:'折扣广告',
+        icon:'md-image',
+        options:{
+            bgImg:{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1516301201726549362.png',url:'',size:"1300*586"},
+            classification:[{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'}, {img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953445396793087.jpg',url:'', size:'190*210'},],
+            brandList:[{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953455883586458.jpg',url:'', size:'240*105'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953455883586458.jpg',url:'', size:'240*105'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953455883586458.jpg',url:'', size:'240*105'},{img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953455883586458.jpg',url:'', size:'240*105'},]
+        },
+    },
+    // {
+    //     type:'brand',
+    //     name:'首页品牌',
+    //     icon:'md-image',
+    //     options:{
+    //         brandViewList:[
+    //             {
+    //                 nameCn:'品牌闪购',
+    //                 nameEn:'BRAND SALE',
+    //                 img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953433212156689.jpg',
+    //                 url:''
+    //             },
+    //             {
+    //                 nameCn:'品牌活动',
+    //                 nameEn:'BRAND ACTIVITY',
+    //                 img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434269088434.jpg',
+    //                 url:''
+    //             },
+    //             {
+    //                 nameCn:'超级品牌日',
+    //                 nameEn:'SUPER BRAND',
+    //                 img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953434500632403.jpg',
+    //                 url:''
+    //             }
+    //         ],
+    //         signList:[
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},
+    //             {img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''},{img:'https://x.dscmall.cn/storage/data/brandlogo/1490074056964147533.jpg',follow:0,url:''}
+    //         ],
+    //     },
+    // },
+    {
+        type:'recommend',
+        name:'好货推荐',
+        icon:'md-image',
+        options:{
+            contentLeft:{
+                title:'发现好货',
+                secondTitle:'更多好货',
+                bgColor:'#449dae',
+                url:'',
+                list: [
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437520193959.jpg', name: '阿迪达斯三叶草', describe: '也许是每一款经典系列都应该有一个独特的故事吧', url:'',size:'160*160' },
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953437766680336.jpg', name: '360行车记录', describe: '夜行 监控 电子狗 蓝牙', url:'' ,size:'80*80'},
+                ]
+            },
+            contentRight:{
+                title:'特色推荐',
+                secondTitle:'更多特色推荐',
+                bgColor:'#a25684',
+                url:'',
+                list: [
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1516316460079621387.jpg', name: '好心情喝出来', describe: '遇见懂你的饮品', url:'',size:'80*80' },
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1516316460079621387.jpg', name: '好心情喝出来', describe: '遇见懂你的饮品', url:'',size:'80*80' },
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1516316460079621387.jpg', name: '好心情喝出来', describe: '遇见懂你的饮品', url:'',size:'80*80' },
+                    { img: 'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1516316460079621387.jpg', name: '好心情喝出来', describe: '遇见懂你的饮品', url:'',size:'80*80' },
+                ]
+            }
+        },
+    },
+    {
+        type:'newGoodsSort',
+        name:'新品排行',
+        icon:'md-image',
+        options:{
+            left:{
+                title:'特卖',
+                secondTitle:"更多特卖",
+                bgColor:'#c43d7e',
+                url:'',
+                list:[
+                    {name:'新年心愿单', describe:'满269减50,满999减100',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"160*160"},
+                    {name:'Ms.Maggie 冬季时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'Ms.Maggie 冬季时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'Ms.Maggie 冬季时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                ],
+            },
+            middle:{
+                title:'新品',
+                secondTitle:"更多新品",
+                bgColor:'#e66a07',
+                url:'',
+                list:[
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                    {name:'阿迪达斯 领跑时尚', describe:'满269减50',img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953440019595029.jpg', url:'',size:"90*90"},
+                ]
+            },
+            right:{
+                title:'排行榜',
+                secondTitle:"精品风向标",
+                bgColor:'#b62323',
+                url:'',
+                list:[
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                    {name:'小米红米3s手机壳保护套红米3高配版指纹男女款潮版磨砂硬壳防摔 收藏截图 送大礼包', price:14.9, img:'https://x.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1490165200470.jpg', url:''},
+                ]
+            }
+        },
+    },
+    {
+        type:'firstAdvert',
+        name:'首页广告',
+        icon:'md-image',
+        options:{
+            list:[
+                {name:'LILI生鲜', describe:"年货带回家 满199减60", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953435885264617.png', url:'',fromColor:'#e89621',toColor:"#f5c568",size:'170*170'},
+                {name:'LILI众筹', describe:"备孕有孕检测仪", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953436530337827.png', url:'', fromColor:"#325bb4", toColor:'#4c9afe',size:'170*170'},
+                {name:'LILI生鲜', describe:"年货带回家 满199减60", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953435885264617.png', url:'', fromColor:"#1c9daf", toColor:'#40cda7',size:'170*170'},
+                {name:'LILI众筹', describe:"备孕有孕检测仪", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953436530337827.png', url:'', fromColor:"#d13837", toColor:'#df6d4f',size:'170*170'},
+                {name:'LILI生鲜', describe:"年货带回家 满199减60", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953435885264617.png', url:'', fromColor:"#ca4283", toColor:'#eb75cf',size:'170*170'},
+                {name:'LILI众筹', describe:"备孕有孕检测仪", img:'https://x.dscmall.cn/storage/data/gallery_album/61/original_img/1515953436530337827.png', url:'', fromColor:"#5d40c1", toColor:'#8c5fdb',size:'170*170'},
+            ],
+        },
+    },
+    {
+        type:'bannerAdvert',
+        name:'横幅广告',
+        icon:'md-image',
+        options:{
+            img:'',
+            url:'',
+            size:'1200*自定义'
+        },
+    },
+    {
+        type:'notEnough',
+        name:'还没逛够',
+        icon:'md-image',
+        options:{
+            list:[
+                [{ img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },],
+                [{ img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },],
+                [{ img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },],
+                [{ img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },
+                { img:'https://demo.dscmall.cn/storage/images/201703/thumb_img/0_thumb_G_1489096810833.jpg', name:'Apple/苹果 13 英寸：MacBook Pro Multi-Touch Bar 和 Touch ID 2.9GHz 处理器 512GB 存储容量', price:6666, url:'' },],
+                
+            ],
+            navList:[
+                {title:'精选',desc:'猜你喜欢'},
+                {title:'智能先锋',desc:'大电器城'},
+                {title:'居家优品',desc:'品质生活'},
+                {title:'超市百货',desc:'百货生鲜'},
+            ]
+        },
+    },
+]
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
new file mode 100644
index 00000000..8e8cd903
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -0,0 +1,393 @@
+<template>
+    <div class="model-form">
+        <div class="model-content">
+            <!-- 头部广告，登录信息，不需要拖拽 -->
+            <div class="top-fixed-advert" :style="{backgroundColor:topAdvert.bgColor}">
+                <img :src="topAdvert.img" width="1200" height="80" alt="">
+                <div class="setup-box">
+                    <Button size="small" @click.stop="handleModel('topAdvert')">编辑</Button>
+                </div>
+            </div>
+            <div class="header-con">
+                <div><Icon type="md-pin" />北京</div>
+                <ul class="detail">
+                    <!-- <li>切换主题</li> -->
+                    <li>请登录</li>
+                    <li>我的订单</li>
+                    <li>我的足迹</li>
+                    <li><Icon size="18" type="ios-cart-outline" ></Icon>购物车</li>
+                    <li>店铺入驻</li>
+                </ul>
+            </div>
+            <div class="search-con">
+                <img :src="require('@/assets/logo.png')" class="logo" alt="">
+                <div class="search">
+                    <i-input v-model="searchData" size="large" placeholder="输入你想查找的商品">
+                        <Button slot="append">搜索</Button>
+                    </i-input>
+                    <!-- <Tag
+                        v-for="(item, index) in promotionTags"
+                        :key="index"
+                        class="mt_10"
+                    >
+                        {{item}}
+                    </Tag> -->
+                </div>
+            </div>
+            <div class="nav-con">
+                <div class="all-categories">全部商品分类</div>
+                <ul class="nav-item">
+                    <li v-for="(item,index) in navList.list" :key="index">
+                        <a href="#">{{item.name}}</a>
+                    </li>
+                </ul>
+                <div class="setup-box">
+                    <Button size="small" @click.stop="handleModel('quickNav')">编辑</Button>
+                </div>
+            </div>
+            <!-- 装修主体 -->
+            <div>
+                <draggable class="model-form-list"
+                    v-model="data.list"
+                    v-bind="{group:'model', ghostClass: 'ghost'}"
+                    @end="handleMoveEnd"
+                    @add="handleModelAdd"
+                >
+                    <template v-for="(element, index) in data.list">
+                        <model-form-item v-if="element && element.key" :key="element.key" :element="element" :index="index" :data="data"></model-form-item>
+                    </template>
+                </draggable>
+            </div>
+        </div>
+        <Modal
+            v-model="showModal"
+            title="顶部广告"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <!-- 顶部广告 -->
+            <div class="modal-top-advert">
+                <div>
+                    <img class="show-image" width="600" height="40" :src="topAdvert.img" alt />
+                </div>
+                <div class="tips">
+                    建议尺寸：<span>{{ topAdvert.size }}</span>
+                </div>
+                <div>
+                    图片链接：<span>{{ topAdvert.url }}</span><Button size="small" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    选择图片：<Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
+                </div>
+                <div>
+                    选择背景色：<ColorPicker v-model="topAdvert.bgColor" />
+                </div>
+            </div>
+        </Modal>
+        <Modal
+            v-model="showModalNav"
+            title="快捷导航"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <!-- 分类tab栏 -->
+            <div class="modal-tab-bar">
+                <Button type="primary" size='small' @click="handleAddNav">添加分类</Button>
+                <table cellspacing="0">
+                    <thead>
+                        <tr>
+                            <th width="250">分类名称</th>
+                            <th width="250">链接地址</th>
+                            <!-- <th width="150">排序</th> -->
+                            <th width="250">操作</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="(item, index) in navList.list" :key="index">
+                            <td><Input v-model="item.name" /></td>
+                            <td><Input v-model="item.url" disabled /></td>
+                            <!-- <td><Input v-model="item.sort"/></td> -->
+                            <td>
+                                <Button type="primary" size="small" @click="handleSelectLink(item,index)">选择链接</Button>&nbsp;
+                                <Button type="error" size="small" @click="handleDelNav(index)">删除</Button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+        <!-- 选择图片 -->
+        <Modal width="1200px" v-model="picModelFlag" footer-hide>
+            <ossManage @callback="callbackSelected" ref="ossManage" />
+        </Modal>
+    </div>
+</template>
+<script>
+import Draggable from 'vuedraggable'
+import ModelFormItem from './modelFormItem.vue'
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+    name:'modelForm',
+    components:{
+        Draggable,
+        ModelFormItem,
+        ossManage
+    },
+    props:['data'],
+    data(){
+        return{
+            picModelFlag: false, // 选择图片模态框
+            showModal: false, // 顶部广告模态框
+            showModalNav: false, // 分类nav模态框
+            selectedNav:null, //当前已选nav
+            // 模拟搜索框下方数据
+            promotionTags: [ "买2免1", "领200神券", "199减100", "母婴5折抢", "充100送20"], // 热词数据
+            topAdvert:{ // 头部广告图数据
+                type:'topAdvert',
+                img:'https://x.dscmall.cn/storage/data/gallery_album/108/original_img/108_P_1539564967582.jpg',
+                url:'',
+                bgColor:'#de000d',
+                size:'1200*80'
+            },
+            navList:{ // 分类nav数据
+                type:'navBar',
+                list:[
+                    {name:'秒杀', url:''}, {name:'闪购', url:''}, {name:'优惠券', url:''}, {name:'拍卖', url:''}, {name:'服装城', url:''},
+                ]
+            }
+        }
+    },
+    mounted(){
+        document.body.ondrop = function (event) {
+            let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1
+            if (isFirefox) {
+                event.preventDefault()
+                event.stopPropagation()
+            }
+        }
+    },
+    methods:{
+        handleSelectLink(item,index) { // 调起选择链接弹窗
+            if(item) this.selectedNav = item;
+            this.$refs.liliDialog.open('link')
+        },
+        selectedLink(val) {
+            console.log(val);
+            if(this.showModalNav){
+                this.selectedNav.url = this.$options.filters.formatLinkType(val);
+            }else {
+                this.topAdvert.url = this.$options.filters.formatLinkType(val);
+            }
+        },
+        handleDelNav(index){ // 删除导航
+            this.navList.list.splice(index,1)
+        },
+        handleAddNav(){ // 添加导航
+            this.navList.list.push(
+                {name:'',url:''}
+            )
+            console.log(this.navList.list)
+        },
+        handleMoveEnd ({newIndex, oldIndex}) {
+            console.log('index', newIndex, oldIndex)
+        },
+        handleModel (type) {
+            if(type == 'topAdvert'){
+                this.showModal = true;
+            } else {
+                this.showModalNav = true;
+            }
+        },
+        handleSelectImg() {
+            this.$refs.ossManage.selectImage = true;
+            this.picModelFlag = true;
+        },
+        callbackSelected (item) { // 选择图片回调
+            this.picModelFlag = false;
+            this.topAdvert.img = item.url;
+        },
+        handleModelAdd (evt) { // 拖拽，添加模块
+            const newIndex = evt.newIndex
+
+            // 为拖拽到容器的元素添加唯一 key
+            this.data.list[newIndex] = JSON.parse(JSON.stringify(this.data.list[newIndex]))
+            const key = Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999)
+            this.$set(this.data.list, newIndex, {
+                ...this.data.list[newIndex],
+                options: {
+                    ...this.data.list[newIndex].options,
+                },
+                key,
+                // 绑定键值
+                model: this.data.list[newIndex].type + '_' + key
+            })
+        },
+    },
+    watch: {
+
+    }
+}
+</script>
+<style lang="scss" scoped>
+    @import './modelList/setup-box.scss';
+    .model-form {
+        width: 1500px;
+    }
+    .model-content {
+        width: 1200px;
+        margin: 0 auto;
+        background: #fff;
+        min-height: 1200px;
+    }
+    .model-form-list{
+        min-height: 500px;
+    }
+    /**  顶部广告，头部，搜索框 start */
+    .top-fixed-advert{
+        display: flex;
+        width:1500px;
+        margin-left: -150px;
+        background: $theme_color;
+        justify-content: center;
+    }
+
+    .header-con {
+        display: flex;
+        justify-content: space-between;
+        height: 35px;
+        padding: 0 15px;
+        line-height: 35px;
+        color: #999;
+        font-weight: bold;
+        div,li{
+            &:hover{
+                color: $theme_color;
+                cursor: pointer;
+            }
+        }
+        .detail{
+            display: flex;
+            >li{
+                margin-left: 10px;
+                &::after{
+                    content: "|";
+                    padding-left: 10px;
+                }
+                &:last-child::after{
+                    content:'';
+                    padding-left: 0;
+                }
+                &:hover::after{
+                    color: #999;
+                }
+            }
+        }
+    }
+    /** 搜索框 */
+    .search-con {
+        padding-top: 15px;
+        margin: 0px auto;
+        margin-bottom: 10px;
+        width: 1200px;
+        position: relative;
+        .logo{
+            position: absolute;
+            top: 10px;
+            left: 10px;
+            width: 150px;
+            height: 50px;
+        }
+        .search {
+            width: 460px;
+            margin: 0 auto;
+            /deep/ .ivu-input.ivu-input-large {
+                border: 2px solid $theme_color;
+                font-size: 12px;
+                height: 34px;
+                &:focus {
+                    box-shadow: none;
+                }
+            }
+            /deep/ .ivu-input-group-append {
+                border: 1px solid $theme_color;
+                border-left: none;
+                height: 30px;
+                background-color: $theme_color;
+                color: #ffffff;
+                button {
+                    font-size: 14px;
+                    font-weight: 600;
+                    line-height: 1;
+                }
+            }
+        }
+    }
+    /** 商品分类 */
+    .nav-con{
+       width:1200px;
+       height: 40px;
+       background: #eee;
+       display: flex;
+       .all-categories{
+           width: 200px;
+           line-height: 40px;
+           color: #fff;
+           background-color: $theme_color;
+           text-align: center;
+           font-size: 16px;
+       }
+       .nav-item {
+            width: 1000px;
+            height: 40px;
+            line-height: 40px;
+            overflow: hidden;
+            list-style: none;
+            background-color: #eee;
+            display: flex;
+            li{
+                font-size: 16px;
+                font-weight: bold;
+                margin-left: 20px;
+                a{
+                    color:rgb(89, 88, 88);
+                    font-size: 15px;
+                    &:hover{color:$theme_color}
+                }
+            }
+        }
+    }
+    /**  顶部广告，头部，搜索框 end */
+
+    .top-fixed-advert, .nav-con{
+        position: relative;
+        &:hover{
+            .setup-box{
+                display: block;
+            }
+        }
+    }
+    /** 装修模态框 内部样式start */
+    .modal-top-advert{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        >*{
+            margin-bottom: 10px;
+        }
+    }
+</style>
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
new file mode 100644
index 00000000..4e4fad60
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -0,0 +1,425 @@
+<template>
+  <div class="model-item"
+      v-if="element && element.key" 
+    >
+        <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
+        <template v-if="element.type == 'carousel'">
+            <model-carousel :data="element"></model-carousel>
+        </template>
+        <!-- 热门广告 -->
+        <template v-if="element.type == 'hotAdvert'">
+            <div class="setup-content">
+                <img style="display:block;" :src="element.options.list[0].img" @click="$router.push(element.options.list[0].url)" width="1200" alt="">
+                <div class="setup-box">
+                    <div>
+                        <Button size="small" @click.stop="handleSelectModel(element.options.list[0])">编辑</Button>
+                    </div>
+                </div>
+            </div>
+            <ul class="advert-list">
+                <template  v-for="(item,index) in element.options.list">
+                    <li v-if="index!==0" @click="$router.push(item.url)" class="setup-content" :key="index">
+                        <img :src="item.img" width="230" height="190" alt="">
+                        <div class="setup-box">
+                            <div>
+                                <Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
+                            </div>
+                        </div>
+                    </li>
+                </template>
+            </ul>
+        </template>
+        <!-- 限时秒杀 待完善 -->
+        <template v-if="element.type == 'seckill'">
+            <seckill :data="element"></seckill>
+        </template>
+        <!-- 折扣广告 -->
+        <template v-if="element.type == 'discountAdvert'">
+            <div class="discountAdvert" :style="{'background-image' : 'url(' + element.options.bgImg.img + ')'}">
+                <div>
+                    <div v-for="(item,index) in element.options.classification" :key="index" class="setup-content">
+                        <img :src="item.img" width="190" height="210" alt="">
+                        <div class="setup-box">
+                            <div>
+                                <Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <div v-for="(item,index) in element.options.brandList" :key="index" class="setup-content">
+                        <img :src="item.img" width="240" height="105" alt="">
+                        <div class="setup-box">
+                            <div>
+                                <Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
+        <!-- 首页品牌 -->
+        <!-- <template v-if="element.type == 'brand'">
+            <div class="brand">
+                <div class="brand-view">
+                    <div class="brand-view-content" v-for="(brand,index) in element.options.brandViewList" :key="index">
+                        <div class="brand-view-title">
+                            <span><span class="fontsize_18 fw_bold">{{brand.nameCn}}</span> <span class="fw_bold">{{brand.nameEn}}</span></span>
+                            <span>更多&gt;</span>
+                        </div>
+                        <div class="brand-view-img">
+                            <img :src="brand.img" alt="">
+                        </div>
+                    </div>
+                </div>
+                <ul class="brand-list">
+                    <li v-for="(sign,index) in element.options.signList" :key="index">
+                        <div class="brand-img">
+                            <img :src="sign.img" alt="">
+                        </div>
+                        <div class="brand-mash">
+                            <Icon type="ios-heart-outline" />
+                            <div>关注人数：{{ sign.follow }}</div>
+                            <div>点击进入</div>
+                        </div>
+                    </li>
+                    <li class="refresh">
+                        <Icon type="md-refresh" />
+                        <div>换一批</div>
+                    </li>
+                </ul>
+            </div>
+        </template> -->
+        <!-- 好货推荐 -->
+        <template v-if="element.type == 'recommend'">
+            <recommend :data="element"></recommend>
+        </template>
+        <!-- 新品排行 -->
+        <template v-if="element.type == 'newGoodsSort'">
+            <new-goods-sort :data="element"></new-goods-sort>
+        </template>
+        <!-- 首页广告 -->
+        <template v-if="element.type == 'firstAdvert'">
+            <first-page-advert :data="element"></first-page-advert>
+        </template>
+        <!-- 横幅广告 -->
+        <template v-if="element.type == 'bannerAdvert'">
+            <div class="horizontal-advert setup-content">
+                <img v-if="element.options.img" width="1200" :src="element.options.img" alt="">
+                <div v-else class="default-con">
+                    <p>广告图片</p>
+                    <p>1200*自定义</p>
+                </div>
+                <div class="setup-box">
+                    <div>
+                        <Button size="small" @click.stop="handleSelectModel(element.options)">编辑</Button>
+                    </div>
+                </div>
+            </div>
+        </template>
+        <template v-if="element.type == 'notEnough'">
+            <not-enough :data="element"></not-enough>
+        </template>
+        <div class="del-btn">
+            <Button size="small" type="error" @click="handleModelDelete">删除</Button>
+        </div>
+        <Modal
+            v-model="showModal"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <!-- 热门广告两种图片尺寸 -->
+                    <img class="show-image" width="600" height="40" v-if="selected.size && selected.size.indexOf('1200')>=0" :src="selected.img" alt />
+                    <img class="show-image" width="230" height="190" v-if="selected.size && selected.size.indexOf('230*190')>=0" :src="selected.img" alt />
+                    <!-- 折扣广告三种图片尺寸 -->
+                    <img class="show-image" width="600" height="300" v-if="selected.size && selected.size.indexOf('1300')>=0" :src="selected.img" alt />
+                    <img class="show-image" width="190" height="210" v-if="selected.size && selected.size.indexOf('190*210')>=0" :src="selected.img" alt />
+                    <img class="show-image" width="240" height="105" v-if="selected.size && selected.size.indexOf('240*105')>=0" :src="selected.img" alt />
+                </div>
+                <div class="tips">
+                    建议尺寸：<span>{{ selected.size }}</span>
+                </div>
+                <div>
+                    图片链接：<span>{{ selected.url }}</span> <Button size="small" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    选择图片：<Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
+                </div>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+        <!-- 选择图片 -->
+        <Modal width="1200px" v-model="picModelFlag" footer-hide>
+            <ossManage @callback="callbackSelected" ref="ossManage" />
+        </Modal>
+    </div>
+</template>
+
+<script>
+import ModelCarousel from './modelList/carousel.vue';
+import FirstPageAdvert from './modelList/firstPageAdvert.vue';
+import NewGoodsSort from './modelList/newGoodsSort.vue';
+import Recommend from './modelList/recommend.vue';
+import NotEnough from './modelList/notEnough.vue';
+import Seckill from './modelList/seckill.vue';
+import ossManage from "@/views/sys/oss-manage/ossManage";
+
+export default {
+    name:'modelFormItem',
+    props: ['element', 'select', 'index', 'data'],
+    components:{
+        ModelCarousel, Recommend, NewGoodsSort, FirstPageAdvert, NotEnough, Seckill, ossManage
+    },
+    data () {
+        return {
+            showModal:false,
+            selected:{},
+            picModelFlag: false
+        }
+    },
+    mounted () {
+        
+    },
+    methods: {
+        handleSelectModel (item) {
+            this.selected = item;
+            this.showModal = true
+        },
+        handleModelDelete () {
+            this.$Modal.confirm({
+                title: '提示',
+                content: '<p>确定删除当前模块吗？</p>',
+                onOk: () => {
+                    this.$nextTick(() => {
+                        this.data.list.splice(this.index, 1)
+                    })
+                }
+            });
+            
+        },
+        handleSelectLink(item,index) { // 调起选择链接弹窗
+            this.$refs.liliDialog.open('link')
+        },
+        selectedLink(val) {
+            this.selected.url = this.$options.filters.formatLinkType(val);;
+        },
+        handleMoveEnd ({newIndex, oldIndex}) {
+            console.log('index', newIndex, oldIndex)
+        },
+        handleEditModel (type) {
+            this.showModal = true;
+        },
+        handleSelectImg(){ // 选择图片
+            this.$refs.ossManage.selectImage = true;
+            this.picModelFlag = true;
+        },
+        callbackSelected (val) {
+            this.picModelFlag = false;
+            this.selected.img = val.url;
+        }
+        
+    },
+    watch: {
+        
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './modelList/setup-box.scss';
+.model-item{
+    position: relative;
+    margin-bottom: 20px;
+    &:hover{
+        .del-btn{display: block;}
+    }
+}
+.del-btn{
+    width: 100px;
+    height: 100px;
+    display: none;
+    position: absolute;
+    right: -100px;
+    top: 0;
+    &:hover{
+        display: block;
+    }
+}
+/** 横幅广告 */
+.horizontal-advert{
+    width: 1200px;
+    height: auto;
+    .default-con{
+        height: 100px;
+        padding-top: 30px;
+        text-align: center;
+        background: #ddd;
+    }
+}
+/** 热门广告 */
+.advert-list{
+    background: $theme_color;
+    height:200px;
+    display: flex;
+    justify-content: space-around;
+    padding: 3px 10px;
+    >li{
+        img{
+            cursor: pointer;
+            border-radius: 10px;
+            transition: all 150ms ease-in-out;
+            &:hover{
+                transform: translateY(-3px);
+                box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
+            }
+        }
+    }
+}
+/** 限时秒杀 */
+.limit-img{
+    display: flex;
+    flex-direction: row;
+    img{
+        width: 300px;
+        height: 100px;
+    }
+}
+/** 折扣广告 */
+.discountAdvert{
+    height:566px;
+    background-repeat: no-repeat ;
+    margin-left: -97px;
+    position: relative;
+    >div {
+        padding-left: 295px;
+        display: flex;
+        flex-wrap: wrap;
+        &:nth-child(1) img{
+            margin: 10px 10px 0 0;
+        }
+        &:nth-child(2) img{
+            margin: 0 10px 0 0;
+        }
+    }
+    
+}
+/** 首页品牌 */
+.brand{
+    .brand-view{
+        display: flex;
+        margin-top: 10px;
+        .brand-view-content{
+            width: 470px;
+            margin-left: 10px;
+            img{
+                width: 100%;
+                height: 316px;
+            }
+            .brand-view-title{
+                height: 50px;
+                padding: 0 5px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+        }
+        .brand-view-content:first-child{
+            width: 240px;
+            margin-left: 0;
+        }
+    }
+    .brand-list{
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        li{
+            width: 121px;
+            height: 112px;
+            position: relative;
+            overflow: hidden;
+            border: 1px solid #f5f5f5;
+            margin: -1px -1px 0 0;
+            &:hover{
+                .brand-mash{display:flex;}
+            }
+            .brand-img{
+                text-align: center;
+                margin-top: 30px;
+                img{
+                    width: 100px;
+                    height: auto;
+                }
+            }
+            .brand-mash{
+                display: none;
+                position: absolute;
+                top: 0;
+                left: 0;
+                background: rgba(0, 0, 0, .5);
+                width: inherit;
+                height: inherit;
+                font-size: 12px;
+                font-weight: bold;
+                .ivu-icon{
+                    position: absolute;
+                    right: 10px;
+                    top: 10px;
+                    font-size: 15px;
+                }
+                align-items: center;
+                justify-content: center;
+                flex-direction: column;
+                color: #fff;
+                cursor: pointer;
+                div:last-child{
+                    background-color: $theme_color;
+                    border-radius: 9px;
+                    padding: 0 10px;
+                    margin-top: 5px;
+                }
+            }
+        }
+        .refresh{
+            display: flex;
+            align-items: center;
+            flex-direction: column;
+            justify-content: center;
+            .ivu-icon{
+                font-size: 18px;
+                transition: all .3s ease-out;
+            }
+            &:hover{
+                background-color: $theme_color;
+                color: #fff;
+                .ivu-icon{
+                    transform: rotateZ(360deg);
+                }
+            }
+        }
+    }
+}
+
+/** 装修模态框 内部样式start */
+.modal-top-advert{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    >*{
+        margin-bottom: 10px;
+    }
+}
+</style>
+
diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
new file mode 100644
index 00000000..a2563695
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="model-carousel">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航 -->
+      <div class="nav-side">导航栏占位区</div>
+      <div class="nav-content setup-content">
+        <!-- 轮播图 -->
+        <Carousel autoplay>
+          <CarouselItem v-for="(item, index) in data.options.list" :key="index">
+            <div style="overflow: hidden">
+              <img :src="item.img" width="790" height="340" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+        <div class="setup-box">
+          <div>
+            <Button size="small" @click.stop="handleSelectModel">编辑</Button>
+          </div>
+        </div>
+      </div>
+      <div class="nav-right">
+        <div class="person-msg">
+          <img src="../../../assets/play.png" alt />
+          <div>Hi，欢迎来到LiLi Shop</div>
+          <div>
+            <Button type="error" shape="circle">请登录</Button> &nbsp;
+            <Button size="small" shape="circle">我要开店</Button>
+          </div>
+        </div>
+        <div class="shop-msg">
+          <div>
+            <span>店铺信息</span>
+            <span>|</span>
+            <span>网站帮助分类</span>
+          </div>
+          <ul>
+            <li>免责条款</li>
+            <li>联系我们</li>
+            <li>咨询热点</li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <Modal
+      v-model="showModal"
+      title="快捷导航"
+      draggable
+      width="800"
+      :z-index="100"
+      mask-closable="false"
+      :on-ok="sureDecorate"
+      :on-cancel="cancelDecorate"
+    >
+      <div class="modal-tab-bar">
+        <Button type="primary" size="small" @click="handleAdd">添加轮播</Button>
+        &nbsp;
+        <span class="ml_10">图片尺寸:{{ data.size }}</span>
+        <div style="color: #999" class="fz_12">点击缩略图替换图片</div>
+        <table cellspacing="0">
+          <thead>
+            <tr>
+              <th width="250">所选图片</th>
+              <th width="250">链接地址</th>
+              <!-- <th width="150">排序</th> -->
+              <th width="250">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(item, index) in data.options.list" :key="index">
+              <td>
+                <img
+                  style="cursor: pointer"
+                  :src="item.img"
+                  @click="handleSelectImg(item)"
+                  width="200"
+                  height="100"
+                  alt=""
+                />
+              </td>
+              <td><Input v-model="item.url" disabled /></td>
+              <!-- <td><Input v-model="item.sort"/></td> -->
+              <td>
+                <Button
+                    type="primary"
+                    size="small"
+                    @click="handleSelectImg(item)"
+                    >选择图片</Button
+                >&nbsp;
+                <Button
+                  type="info"
+                  size="small"
+                  @click="handleSelectLink(item)"
+                  >选择链接</Button
+                >&nbsp;
+                <Button
+                  type="error"
+                  ghost
+                  size="small"
+                  @click="handleDel(index)"
+                  >删除</Button
+                >
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </Modal>
+    <!-- 选择商品。链接 -->
+    <liliDialog
+      ref="liliDialog"
+      @selectedLink="selectedLink"
+      @selectedGoodsData="selectedGoodsData"
+    ></liliDialog>
+    <!-- 选择图片 -->
+    <Modal width="1200px" v-model="picModelFlag" footer-hide>
+      <ossManage @callback="callbackSelected" ref="ossManage" />
+    </Modal>
+  </div>
+</template>
+
+<script>
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+  name: "modelCarousel",
+  props: ["data"],
+  components: {
+    ossManage
+  },
+  data() {
+    return {
+      showModal: false,
+      selected: null,
+      picModelFlag: false,
+    };
+  },
+
+  methods: {
+    handleSelectModel () {
+      // 编辑模块
+      this.showModal = true;
+    },
+    handleAdd () {
+      this.data.options.list.push({ img: "", url: "" });
+      this.$forceUpdate();
+    },
+    handleSelectLink (item) {
+      // 选择链接
+      this.$refs.liliDialog.open('link')
+      this.selected = item;
+    },
+    callbackSelected (item) { // 选择图片回调
+      this.picModelFlag = false;
+      this.selected.img = item.url;
+    },
+    handleDel(index) {
+      // 删除图片
+      this.data.options.list.splice(index, 1);
+    },
+    selectedLink(val) { // 选择链接回调
+      console.log(val);
+      this.selected.url = this.$options.filters.formatLinkType(val);
+      console.log(this.selected.url);
+    },
+    handleSelectImg(item) {
+      this.selected = item;
+      this.$refs.ossManage.selectImage = true;
+      this.picModelFlag = true;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import "./setup-box.scss";
+.model-carousel {
+  width: 1200px;
+  height: 340px;
+  overflow: hidden;
+}
+
+.nav-item li {
+  float: left;
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 30px;
+}
+.nav-item a {
+  text-decoration: none;
+  color: #555555;
+}
+.nav-item a:hover {
+  color: $theme_color;
+}
+/*大的导航信息，包含导航，幻灯片等*/
+.nav-body {
+  width: 1200px;
+  height: 340px;
+  margin: 0px auto;
+}
+.nav-side {
+  height: 100%;
+  width: 200px;
+  padding: 0px;
+  color: #fff;
+  float: left;
+  background-color: #6e6568;
+  line-height: 340px;
+  text-align: center;
+}
+
+/*导航内容*/
+.nav-content {
+  width: 800px;
+  height: 340px;
+  overflow: hidden;
+  float: left;
+  position: relative;
+}
+.nav-right {
+  float: left;
+  width: 200px;
+  .person-msg {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    margin: 20px auto;
+
+    button {
+      height: 25px !important;
+      margin-top: 10px;
+    }
+
+    .ivu-btn-default {
+      color: $theme_color;
+      border-color: $theme_color;
+    }
+
+    img {
+      margin-bottom: 10px;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+  }
+  .shop-msg {
+    div {
+      width: 100%;
+      margin: 10px 27px;
+      span {
+        cursor: pointer;
+        text-align: center;
+        font-weight: bold;
+        margin-left: 5px;
+      }
+      span:nth-child(1) {
+        @include content_color($theme_color);
+        margin-left: 0;
+      }
+      span:nth-child(2) {
+        font-weight: normal;
+      }
+      span:nth-child(3):hover {
+        color: $theme_color;
+      }
+    }
+
+    ul {
+      margin: 0 30px;
+      li {
+        cursor: pointer;
+        margin: 5px 0;
+        color: #999395;
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
new file mode 100644
index 00000000..ca916d08
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
@@ -0,0 +1,160 @@
+<template>
+    <div class="first-page-advert">
+        <div class="item setup-content" :style="{backgroundImage:`linear-gradient(to right, ${item.fromColor}, ${item.toColor})`}" v-for="(item, index) in options.list" :key="index">
+            <div>
+                <span class="line top-line"></span>
+                <p>{{item.name}}</p>
+                <span class="line btm-line"></span>
+                <p>{{item.describe}}</p>
+            </div>
+            <img :src="item.img" width="170" height="170" alt="">
+            <div class="setup-box">
+                <div><Button size="small" @click.stop="handleSelectModel(item)">编辑</Button></div>
+            </div>
+        </div>
+        <Modal
+            v-model="showModal"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <img class="show-image" width="170" height="170"  :src="selected.img" alt />
+                </div>
+                <div>
+                    <span>图片主标题：</span><Input v-model="selected.name" />
+                </div>
+                <div>
+                    <span>图片描述：</span><Input v-model="selected.describe" />
+                </div>
+                <div class="tips">
+                    建议尺寸：<span>{{ selected.size }}</span>
+                </div>
+                <div>
+                    图片链接：<span>{{ selected.url }}</span> <Button size="small" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    <span>渐变背景色：</span><Input v-model="selected.fromColor" /> <ColorPicker v-if="selected.fromColor" v-model="selected.fromColor" />
+                </div>
+                <div>
+                    <span>渐变背景色：</span><Input v-model="selected.toColor" /> <ColorPicker v-if="selected.toColor" v-model="selected.toColor" />
+                </div>
+                <div :style="{backgroundImage:`linear-gradient(to right, ${selected.fromColor}, ${selected.toColor})`}" class="exhibition"></div>
+                <div>
+                    选择图片：<Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
+                </div>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+        <!-- 选择图片 -->
+        <Modal width="1200px" v-model="picModelFlag" footer-hide>
+            <ossManage @callback="callbackSelected" ref="ossManage" />
+        </Modal>
+    </div>
+</template>
+<script>
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+    props:{
+        data:{
+            type: Object,
+            default: null
+        }
+    },
+    components:{ossManage},
+    data() {
+        return {
+            options: this.data.options,
+            showModal: false,
+            selected: {},
+            picModelFlag: false
+        }
+    },
+    methods:{
+        handleSelectModel (item,type) {
+            this.selected = item;
+            this.showModal = true
+        },
+        handleSelectLink(item,index) { // 调起选择链接弹窗
+            this.$refs.liliDialog.open('link')
+        },
+       
+        selectedLink(val) {
+            this.selected.url = this.$options.filters.formatLinkType(val);;
+        },
+        handleSelectImg(){ // 选择图片
+            this.$refs.ossManage.selectImage = true;
+            this.picModelFlag = true;
+        },
+        callbackSelected (val) {
+            this.picModelFlag = false;
+            this.selected.img = val.url;
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './setup-box.scss';
+.first-page-advert{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    // margin-top: -10px;
+    .item{
+        width: 393px;
+        height: 170px;
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        img{margin-left: 20px;}
+
+        &:nth-of-type(1),&:nth-of-type(2),&:nth-of-type(3){margin-top: 0;}
+
+        p:nth-of-type(1){
+            margin: 3px 0;
+            font-size: 18px;
+            color: #fff;
+        }
+        p:nth-of-type(2){
+            margin-top: 3px;
+            color: #fff;
+        }
+
+    }
+    .line{
+        position: relative;
+        display: block;
+        height: 2px;
+        background: url(../../../assets/festival_icon.png);
+        z-index: 1;
+    }
+    .top-line{
+        width: 78px;
+        background-position: -1px -3px;
+    }
+    .btm-line{
+        background-position: 0 -11px;
+        width: 154px;
+    }
+
+}
+.modal-top-advert{
+    align-items: start;
+    padding: 0 30px;
+    .exhibition{
+        width: 300px;
+        height: 50px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
new file mode 100644
index 00000000..090d3e64
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
@@ -0,0 +1,338 @@
+<template>
+    <div class="new-goods">
+
+        <div class="left">
+            <div class="top-header setup-content" :style="{background:options.left.bgColor}">
+                <span>{{options.left.title}}</span>
+                <span>{{options.left.secondTitle}} &gt;</span>
+                <div class="setup-box">
+                    <div><Button size="small" @click.stop="handleSelectModel(options.left,true)">编辑</Button></div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="con-item setup-content" v-for="(item, index) in options.left.list" :key="index">
+                    <div>
+                        <p>{{item.name}}</p>
+                        <p class="describe">{{item.describe}}</p>
+                    </div>
+                    <img :src="item.img" alt="">
+                    <div class="setup-box">
+                        <div><Button size="small" @click.stop="handleSelectModel(item)">编辑</Button></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="middle">
+            <div class="top-header setup-content" :style="{background:options.middle.bgColor}">
+                <span>{{options.middle.title}}</span>
+                <span>{{options.middle.secondTitle}} &gt;</span>
+                <div class="setup-box">
+                    <div><Button size="small" @click.stop="handleSelectModel(options.middle,true)">编辑</Button></div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="con-item setup-content" v-for="(item, index) in options.middle.list" :key="index">
+                    <div>
+                        <p>{{item.name}}</p>
+                        <p class="describe">{{item.describe}}</p>
+                    </div>
+                    <img :src="item.img" alt="">
+                    <div class="setup-box">
+                        <div><Button size="small" @click.stop="handleSelectModel(item)">编辑</Button></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="right">
+            <div class="top-header setup-content" :style="{background:options.right.bgColor}">
+                <span>{{options.right.title}}</span>
+                <span>{{options.right.secondTitle}} &gt;</span>
+                <div class="setup-box">
+                    <div><Button size="small" @click.stop="handleSelectModel(options.right,true)">编辑</Button></div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="setup-content" v-for="(item, index) in options.right.list" :key="index">
+                    <img :src="item.img" alt="">
+                    <p>{{item.name}}</p>
+                    <p>{{item.price | unitPrice('￥')}}</p>
+                    <div class="jiaobiao" :class="'jiaobiao'+(index+1)">{{index+1}}</div>
+                    <div class="setup-box">
+                        <div><Button size="small" @click.stop="handleSelectGoods(item)">编辑</Button></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 装修内容 -->
+        <Modal
+            v-model="showModal"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <img class="show-image" width="160" height="160" v-if="selected.size && selected.size.indexOf('160*160')>=0" :src="selected.img" alt />
+                    <img class="show-image" width="80" height="80" v-if="selected.size && selected.size.indexOf('90*90')>=0" :src="selected.img" alt />
+                </div>
+                <div>
+                    <span>图片主标题：</span><Input v-model="selected.name" />
+                </div>
+                <div>
+                    <span>图片描述：</span><Input v-model="selected.describe" />
+                </div>
+                <div class="tips">
+                    建议尺寸：<span>{{ selected.size }}</span>
+                </div>
+                <div>
+                    图片链接：<span>{{ selected.url }}</span> <Button size="small" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    <Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
+                    
+                    <Button size="small" type="primary" @click="handleSelectGoods('')">选择商品</Button>
+                </div>
+            </div>
+        </Modal>
+        <!-- 装修标题 -->
+        <Modal
+            v-model="showModalTitle"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <span>主标题：</span><Input v-model="selected.title" />
+                </div>
+                <div>
+                    <span>副标题：</span><Input v-model="selected.secondTitle" />
+                </div>
+                <div>
+                    <span>副标题链接：{{selected.url}}</span><Button size="small" class="ml_10" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    <span>背景色：</span><ColorPicker v-if="selected.bgColor" v-model="selected.bgColor" />
+                </div>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+        <!-- 选择图片 -->
+        <Modal width="1200px" v-model="picModelFlag" footer-hide>
+            <ossManage @callback="callbackSelected" ref="ossManage" />
+        </Modal>
+    </div>
+</template>
+<script>
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+    props:{
+        data:{
+            type:Object,
+            default:null
+        }
+    },
+    components:{
+      ossManage
+    },
+    data() {
+        return {
+            options:this.data.options,
+            showModal:false,
+            showModalTitle:false,
+            selected: {},
+            picModelFlag: false
+        }
+    },
+    methods:{
+        handleSelectModel (item, type) {
+            this.selected = item;
+            console.warn(item);
+            if(type){
+                this.showModalTitle = true
+            } else {
+                this.showModal = true
+            }
+            
+        },
+        handleSelectLink() { // 调起选择链接弹窗
+            this.$refs.liliDialog.open('link')
+        },
+        handleSelectGoods(item) { // 调起选择商品
+            console.warn(item);
+            if (item) this.selected = item;
+            this.$refs.liliDialog.open('goods')
+        },
+        selectedLink (val) {
+            this.selected.url = this.$options.filters.formatLinkType(val);
+        },
+        selectedGoodsData (val) {
+            let goods = val[0]
+            console.log(this.selected);
+            this.selected.img = goods.thumbnail
+            this.selected.price = goods.price
+            this.selected.name = goods.goodsName
+            this.selected.url = `/goodsDetail?skuId=${goods.id}&goodsId=${goods.goodsId}`
+        },
+       
+        handleMoveEnd ({newIndex, oldIndex}) {
+            console.log('index', newIndex, oldIndex)
+        },
+        handleEditModel (type) {
+            this.showModal = true;
+        },
+        handleSelectImg(){ // 选择图片
+            this.$refs.ossManage.selectImage = true;
+            this.picModelFlag = true;
+        },
+        callbackSelected (val) {
+            this.picModelFlag = false;
+            this.selected.img = val.url;
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './setup-box.scss';
+.new-goods{
+    display: flex;
+    justify-content: space-between;
+    >div{
+        width: 393px;
+        height: 440px;
+    }
+
+    .left>.content{
+        >div:nth-child(1){
+            height: 240px;
+            flex-direction: column;
+            border: 1px solid #eee;
+            border-top: none;
+            border-left: none;
+            justify-content: space-between;
+            img{
+                width: 160px;
+                height: 160px;
+            }
+            .describe{margin-top: 10px;}
+        }
+        >div:nth-child(2){border-right: 1px solid #eee;}
+        >div:nth-child(3),>div:nth-child(4){border-bottom: 1px solid #eee;}
+    }
+
+    .middle>.content{
+        >div{
+            border-style:solid;
+            border-color: #eee;
+            border-width: 0;
+            border-bottom-width: 1px;
+        }
+        >div:nth-child(1),>div:nth-child(2),>div:nth-child(3){border-right-width: 1px;}
+        >div:nth-child(6), >div:nth-child(3){border-bottom-width: 0;}
+    }
+
+    .right>.content{
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        font-size: 12px;
+        >div{
+            position: relative;
+            width: 120px;
+            padding: 5px 10px 0 10px;
+            img{
+                width: 100px;
+                height: 100px;
+            }
+            border-bottom: 1px solid #eee;
+            :nth-child(2){
+                height: 38px;
+                overflow: hidden;
+            }
+            :nth-child(3){
+                color: $theme_color;
+                margin-top: 5px;
+            }
+            .jiaobiao{
+                position: absolute;
+                width: 23px;
+                height: 23px;
+                top: 10px;
+                right: 16px;
+                background: url('../../../assets/festival_icon.png');
+                color: #FFF;
+                text-align: center;
+            }
+            .jiaobiao1,.jiaobiao4{
+                background-position: -2px -30px;
+            }
+            .jiaobiao2,.jiaobiao5{
+                background-position: -31px -30px;
+            }
+            .jiaobiao3,.jiaobiao6{
+                background-position: -60px -30px;
+            }
+        }
+        >div:nth-child(4),>div:nth-child(5),>div:nth-child(6){border: none;}
+    }
+
+    .top-header{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 50px;
+        padding: 0 10px;
+        background: #c43d7e;
+        color: #fff;
+        span:nth-child(1){
+            font-size: 20px;
+        }
+        span:nth-child(2){
+            font-size: 12px;
+        }
+    }
+    .content{
+        padding: 10px 12px 0;
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: column;
+        height: 370px;
+    }
+    .con-item{
+        width: 185px;
+        height: 120px;
+        display: flex;
+        padding-left: 10px;
+        padding-top: 10px;
+        img{
+            width: 90px;
+            height: 90px;
+            margin-top: 10px;
+        }
+    }
+    .describe{
+        color: #999;
+        font-size: 12px;
+        margin-top: 15px;
+    }
+}
+.modal-top-advert{
+    align-items: start;
+    padding: 0 30px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
new file mode 100644
index 00000000..7156027a
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue
@@ -0,0 +1,233 @@
+<template>
+    <div class="not-enough">
+        <ul class="nav-bar setup-content">
+            <li v-for="(item, index) in conData.options.navList" :class="currentIndex===index?'curr':''" @click="changeCurr(index)" :key="index">
+                <p>{{item.title}}</p>
+                <p>{{item.desc}}</p>
+            </li>
+            <div class="setup-box" style="width:100px;left:1100px;">
+                <div>
+                    <Button size="small" @click.stop="handleSelectModel">编辑</Button>
+                </div>
+            </div>
+        </ul>
+        <div class="content" v-if="showContent">
+            <div v-for="(item, index) in conData.options.list[currentIndex]" :key="index" class="setup-content">
+                <img :src="item.img" width="210" height="210" :alt="item.name">
+                <p>{{item.name}}</p>
+                <p>
+                    <span>{{item.price | unitPrice('￥')}}</span> 
+                    <!-- <span>{{item.price | unitPrice('￥')}}</span> -->
+                </p>
+                <div class="setup-box">
+                    <div>
+                        <Button size="small" @click.stop="handleSelectGoods(item)">编辑</Button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <Modal
+            v-model="showModal"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-tab-bar">
+                <Button type="primary" size='small' @click="handleAddNav">添加分类</Button>
+                <table cellspacing="0">
+                    <thead>
+                        <tr>
+                            <th width="250">主标题</th>
+                            <th width="250">描述</th>
+                            <th width="250">操作</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="(item, index) in conData.options.navList" :key="index">
+                            <td><Input v-model="item.title" /></td>
+                            <td><Input v-model="item.desc" /></td>
+                            <!-- <td><Input v-model="item.sort"/></td> -->
+                            <td v-if="index!=0">
+                                <Button type="error" size="small" @click="handleDelNav(index)">删除</Button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+    </div>
+</template>
+<script>
+export default {
+    props:{
+        data:{
+            type: Object,
+            default: null
+        }
+    },
+    data() {
+        return {
+            currentIndex:0,
+            conData:this.data,
+            selected:{},
+            showModal:false,
+            showContent:true,
+        }
+    },
+    watch:{
+        data:function(val){
+            this.conData = val
+        },
+        conData:function(val){
+            this.$emit('content',val)
+        }
+    },
+    mounted() {
+
+    },
+    methods:{
+        changeCurr(index){
+            this.currentIndex = index;
+        },
+        handleSelectModel (item,type) {
+            this.selected = item;
+            this.showModal = true
+        },
+        handleSelectLink(item,index) { // 调起选择链接弹窗
+            this.$refs.liliDialog.open('link')
+        },
+        handleSelectGoods(item) { // 调起选择链接弹窗
+            if(item) this.selected = item;
+            this.$refs.liliDialog.open('goods')
+        },
+        selectedLink(val) {
+           this.selected.url = this.$options.filters.formatLinkType(val);
+        },
+        selectedGoodsData(val){
+            console.log(val)
+            let goods = val[0]
+            this.selected.img = goods.thumbnail
+            this.selected.price = goods.price
+            this.selected.name = goods.goodsName
+            this.selected.url = `/goodsDetail?skuId=${goods.id}&goodsId=${goods.goodsId}`
+        },
+        handleDelNav(index){ // 删除导航
+            this.conData.options.navList.splice(index,1)
+            this.conData.options.list.splice(index,1)
+        },
+        handleAddNav(){ // 添加导航
+            this.conData.options.navList.push(
+                {title:'',desc:''}
+            )
+            this.conData.options.list.push(
+                [{ img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                { img:'', name:'', price:0, url:'' },
+                ],
+            )
+            this.showContent = false
+            this.$nextTick(()=>{
+                this.showContent = true;
+            })
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './setup-box.scss';
+.nav-bar{
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    margin-bottom: 10px;
+    background-color: rgb(218, 217, 217);
+    height: 60px;
+    align-items: center;
+    position: relative;
+    li{
+        padding: 0 30px;
+        text-align: center;
+        p:nth-child(1){
+            font-size: 16px;
+            border-radius: 50px;
+            padding: 0 7px;
+        }
+
+        p:nth-child(2){
+            font-size: 14px;
+            color: #999;
+        }
+
+        &:hover{
+            p{
+                color: $theme_color;
+            }
+            cursor: pointer;
+        }
+        border-right: 1px solid #eee;
+        
+    }
+    li:last-of-type{
+        border: none;
+    }
+   
+    .curr{
+        p:nth-child(1){
+            background-color: $theme_color;
+            
+            color: #fff;
+        }
+        p:nth-child(2){
+            color: $theme_color;
+        }
+    }
+}
+
+.content{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    >div{
+        padding: 10px;
+        box-sizing: border-box;
+        border: 1px solid #eee;
+        margin-bottom: 10px;
+        p:nth-of-type(1){
+            overflow: hidden;
+            width: 210px;
+            white-space: nowrap;
+            text-overflow:ellipsis;
+            margin: 10px 0 5px 0;
+        }
+        p:nth-of-type(2){
+            color: $theme_color;
+            font-size: 16px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            span:nth-child(2){
+                text-decoration: line-through;
+                font-size: 12px;
+                color: #999;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
new file mode 100644
index 00000000..e7528cb5
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue
@@ -0,0 +1,345 @@
+<template>
+    <div class="recommend">
+        <div class="recommend-left">
+            <div class="head-recommend setup-content" :style="{background:msgLeft.bgColor}">
+                <span>{{ msgLeft.title }}</span>
+                <span>{{ msgLeft.secondTitle }}&gt;</span>
+                <div class="setup-box">
+                    <div>
+                        <Button size="small" @click.stop="handleSelectModel(msgLeft,true)">编辑</Button>
+                    </div>
+                </div>
+            </div>
+            <div class="content-left">
+                <div class="setup-content">
+                    <img :src="msgLeft.list[0].img" width="160" height="160" alt="">
+                    <div class="margin-left">{{ msgLeft.list[0].name }}</div>
+                    <div class="margin-left">{{ msgLeft.list[0].describe }}</div>
+                    <Button size="small" :style="{background:msgLeft.bgColor}" class="fz_12 view-btn">点击查看</Button>
+                    <div class="setup-box">
+                        <div>
+                            <Button size="small" @click.stop="handleSelectModel(msgLeft.list[0])">编辑</Button>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <template v-for="(item, index) in msgLeft.list" >
+                        <div  v-if="index!=0" :key="index" class="setup-content">
+                            <img :src="item.img" width="80" height="80" alt="">
+                            <div>
+                                <div>{{ item.name }}</div>
+                                <div>{{ item.describe }}</div>
+                            </div>
+                            <div class="setup-box">
+                                <div>
+                                    <Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </div>
+            </div>
+        </div>
+        <div class="recommend-right">
+            <div class="head-recommend setup-content" :style="{background:msgRight.bgColor}">
+                <span>{{ msgRight.title }}</span>
+                <span>{{ msgRight.secondTitle }}&gt;</span>
+                <div class="setup-box">
+                    <div>
+                        <Button size="small" @click.stop="handleSelectModel(msgRight,true)">编辑</Button>
+                    </div>
+                </div>
+            </div>
+            <div class="content-right">
+                <div v-for="(item, index) in msgRight.list" :key="index" class="setup-content">
+                    <div class="right-item">
+                        <div>
+                            <span :style="{background:msgRight.bgColor}">{{item.name}}</span>
+                            <span>{{item.describe}}</span>
+                        </div>
+                        <div class="right-img">
+                            <img :src="item.img" alt="">
+                        </div>
+                    </div>
+                    <div class="setup-box">
+                        <div>
+                            <Button size="small" @click.stop="handleSelectModel(item)">编辑</Button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <Modal
+            v-model="showModal"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <img class="show-image" width="160" height="160" v-if="selected.size && selected.size.indexOf('160*160')>=0" :src="selected.img" alt />
+                    <img class="show-image" width="80" height="80" v-if="selected.size && selected.size.indexOf('80*80')>=0" :src="selected.img" alt />
+                </div>
+                <div>
+                    <span>图片主标题：</span><Input v-model="selected.name" />
+                </div>
+                <div>
+                    <span>图片描述：</span><Input v-model="selected.describe" />
+                </div>
+                <div class="tips">
+                    建议尺寸：<span>{{ selected.size }}</span>
+                </div>
+                <div>
+                    图片链接：<span>{{ selected.url }}</span> <Button size="small" class="ml_10" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    <Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
+                    <Button size="small" type="primary" @click="handleSelectGoods">选择商品</Button>
+                </div>
+            </div>
+        </Modal>
+        <Modal
+            v-model="showModalTitle"
+            title="装修"
+            draggable
+            width="800"
+            :z-index="100"
+            mask-closable="false"
+            :on-ok="sureDecorate"
+            :on-cancel="cancelDecorate"
+            >
+            <div class="modal-top-advert">
+                <div>
+                    <span>主标题：</span><Input v-model="selected.title" />
+                </div>
+                <div>
+                    <span>副标题：</span><Input v-model="selected.secondTitle" />
+                </div>
+                <div>
+                    <span>副标题链接：{{selected.url}}</span><Button size="small" class="ml_10" type="primary" @click="handleSelectLink">选择链接</Button>
+                </div>
+                <div>
+                    <span>背景色：</span><Input v-model="selected.bgColor" /> <ColorPicker v-if="selected.bgColor" v-model="selected.bgColor" />
+                </div>
+            </div>
+        </Modal>
+        <!-- 选择商品。链接 -->
+        <liliDialog
+            ref="liliDialog"
+            @selectedLink="selectedLink"
+            @selectedGoodsData="selectedGoodsData"
+        ></liliDialog>
+        <!-- 选择图片 -->
+        <Modal width="1200px" v-model="picModelFlag" footer-hide>
+            <ossManage @callback="callbackSelected" ref="ossManage" />
+        </Modal>
+    </div>
+</template>
+<script>
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+    props:{
+        data:{
+            type:Object,
+            default:{}
+        }
+    },
+    components:{
+        ossManage
+    },
+    data() {
+        return {
+            msgLeft:this.data.options.contentLeft,
+            msgRight:this.data.options.contentRight,
+            showModal:false,
+            showModalTitle:false,
+            selected:{},
+            picModelFlag: false
+        }
+    },
+    methods:{
+        handleSelectModel (item,type) {
+            this.selected = item;
+            if(type){
+                this.showModalTitle = true
+            } else {
+                this.showModal = true
+            }
+            
+        },
+        handleSelectLink(item,index) { // 调起选择链接弹窗
+            this.$refs.liliDialog.open('link')
+        },
+        handleSelectGoods(item) { // 调起选择商品
+            this.$refs.liliDialog.open('goods')
+        },
+        selectedLink(val) {
+            this.selected.url = this.$options.filters.formatLinkType(val);
+        },
+        selectedGoodsData(val){
+            console.log(val)
+            let goods = val[0]
+            this.selected.img = goods.thumbnail
+            this.selected.price = goods.price
+            this.selected.name = goods.goodsName
+            this.selected.url = `/goodsDetail?skuId=${goods.id}&goodsId=${goods.goodsId}`
+        },
+        handleSelectImg(){ // 选择图片
+            this.$refs.ossManage.selectImage = true;
+            this.picModelFlag = true;
+        },
+        callbackSelected (val) {
+            this.picModelFlag = false;
+            this.selected.img = val.url;
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import './setup-box.scss';
+.recommend{
+    display: flex;
+    justify-content: space-between;
+    .recommend-left{
+        width: 595px;
+        .content-left{
+            display: flex;
+            padding-top: 10px;
+            font-size: 12px;
+            >div:nth-child(1){
+                width: 189px;
+                border-right: 1px solid #eee;
+                height: 360px;
+                img{
+                    margin: 40px 0 0 15px;
+                }
+                .margin-left{
+                    margin-left: 15px;
+                    width: 145px;
+                }
+                div:nth-of-type(1){
+                    font-weight: bold;
+                    border-top: 1px solid #eee;
+                    padding-top: 10px;
+                    padding-bottom: 10px;
+                }
+                div:nth-of-type(2){
+                    color: #999;
+                }
+                .view-btn{
+                    margin-left: 15px;
+                    margin-top: 10px;
+                    color: #fff;
+                }
+            }
+            >div:nth-child(2){
+                width: 405px;
+                display: flex;
+                flex-wrap: wrap;
+                >div{
+                    display: flex;
+                    align-items: center;
+                    width: 200px;
+                    height: 120px;
+                    img{margin: 0 10px;}
+                    >div:nth-child(2){
+                        // margin: 0 10px;
+                        :nth-child(2){
+                            color: #449dae;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .recommend-right{
+        width: 595px;
+        height: 360px;
+        .head-recommend{
+            background: #a25684;
+        }
+        .content-right{
+            display: flex;
+            flex-wrap: wrap;
+            align-items: center;
+            justify-content: center;
+            padding-top: 10px;
+            >div{
+                width: 50%;
+                text-align: center;
+                height: 180px;
+                padding-top: 10px;
+                .right-item {
+                    display: flex;
+                    margin-top: 30px;
+                    height: 180px;
+                    padding: 0 10px;
+                    font-size: 12px;
+                    >div:nth-child(1) {
+                        width: 130px;
+                        margin-top: 30px;
+                        span:nth-child(1){
+                            color: #fff;
+                            border-radius: 10px;
+                            padding: 0 5px;
+                            background-color: #a25684;
+                            display: block;
+                            width: 120px;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            margin: 0 10px 10px 0;
+                        }
+                        span:nth-child(2) {
+                            font-size: 12px;
+                            color: #666;
+                            display: block;
+                        }
+                    }
+                    .right-img {
+                        width: 100;
+                        height: 100px;
+                        text-align: center;
+                        margin: 0 auto;
+                        img{
+                            max-height: 100px;
+                            max-width: 100px;
+                        }
+                    }
+                    
+                }
+                
+            }
+            >div:nth-child(n+1){
+                border-right: 1px solid #eee;
+            }
+        }
+    }
+
+    .head-recommend{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 50px;
+        padding: 0 10px;
+        background: #449dae;
+        color: #fff;
+        span:nth-child(1){
+            font-size: 20px;
+        }
+        span:nth-child(2){
+            font-size: 12px;
+        }
+    }
+
+}
+
+.modal-top-advert {
+    align-items: start;
+    padding: 0 30px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelList/seckill.vue b/manager/src/views/lili-floor-renovation/modelList/seckill.vue
new file mode 100644
index 00000000..e12289cc
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/seckill.vue
@@ -0,0 +1,263 @@
+<template>
+    <div class="seckill">
+        <div class="aside">
+            <div class="title">{{actName}}</div>
+            <div class="hour"><span>{{currHour}}:00</span>点场 倒计时</div>
+            <div class="count-down" v-if="actStatus === 1"><span>{{hours}}</span><span>{{minutes}}</span><span>{{seconds}}</span></div>
+            <div class="act-status" v-else>{{ actStatus == 0 ?'未开始':'已结束' }}</div>
+        </div>
+        <div class="section">
+            <swiper ref="mySwiper" :options="swiperOptions">
+                <swiper-slide v-for="(item,index) in options.list[0].goodsList" :key="index" class="swiper-slide">
+                    <div class="content">
+                        <img :src="item.img" width="140" height="140" :alt="item.name">
+                        <div class="ellipsis">{{item.name}}</div>
+                        <div>
+                            <span>{{ item.price | unitPrice('￥') }}</span>
+                            <span>{{ item.originalPrice | unitPrice('￥') }}</span>
+                        </div>
+                    </div>
+                    
+                </swiper-slide>
+            </swiper>
+        </div>
+    </div>
+</template>
+<script>
+import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper'
+import 'swiper/swiper-bundle.css'
+export default {
+    components: {
+        Swiper,
+        SwiperSlide
+    },
+    directives: {
+        swiper: directive
+    },
+    props:{
+        data:{
+            type: Object,
+            default: null
+        }
+    },
+    data() {
+        return {
+            options:this.data.options,
+            actStatus:0,  // 0 未开始  1 进行中   2 已结束
+            actName:'限时秒杀',
+            currHour:'00', // 当前秒杀场
+            diffSeconds:0,
+            days:'00',
+            hours: '00',
+            minutes: '00',
+            seconds: '00',
+            interval:undefined,
+            swiperOptions:{
+                slidesPerView: 5,
+                autoplay:true,
+                loop:true
+            }
+        }
+    },
+    watch: {
+        diffSeconds(val){
+            const hours = Math.floor(val / 3600)
+            // 当前秒数 / 60，向下取整
+            // 获取到所有分钟数 3600 / 60 = 60分钟
+            // 对60取模，超过小时数的分钟数
+            const minutes = Math.floor(val / 60) % 60
+            // 当前的秒数 % 60，获取到 超过小时数、分钟数的秒数（秒数）
+            const seconds = val % 60
+            this.hours = hours < 10 ? '0' + hours : hours
+            this.minutes = minutes < 10 ? '0' + minutes : minutes
+            this.seconds = seconds < 10 ? '0' + seconds : seconds
+
+            if(val === 0){
+                clearInterval(this.interval)
+                this.hours = 0;
+                this.minutes = 0;
+                this.seconds = 0;
+                this.countDown(this.options.list)
+            }
+        }
+    },
+    mounted(){
+        this.countDown(this.options.list)
+    },
+    beforeDestroy(){
+        clearInterval(this.interval)
+    },
+    methods: {
+        // 倒计时
+        countDown(list){
+            /**
+             * 默认倒计时两小时
+             * 如果没有开始，则显示未开始
+             * 进行中显示倒计时
+             * 今天的秒杀结束则显示已结束
+             */
+            let nowHour = new Date().getHours();
+            if(nowHour < Number(list[0].time)){ // 活动未开始
+                this.currHour = list[0].time
+                this.actStatus = 0;
+            } else if(nowHour >= Number(list[list.length-1].time + 2)) { // 活动已结束
+                this.actStatus = 2;
+                this.currHour = list[list.length-1].time
+            } else { // 活动进行中
+                this.actStatus = 1;
+                for(let i = 0; i < list.length; i++) {
+                    if(nowHour == Number(list[i].time)) {
+                        this.currHour = list[i].time;
+                    }
+                    if( nowHour > Number(list[i].time) && nowHour < Number(list[i].time + 2) ){
+                        this.currHour = list[i].time;
+                    }
+                }       
+                // 当前0点时间戳
+                let zeroTime = new Date(new Date().toLocaleDateString()).getTime()
+                // 活动倒计时
+                this.diffSeconds = Math.floor( ( zeroTime + 3600 * 1000 * (this.currHour+2) - new Date().getTime() ) / 1000)
+                const that = this;
+                this.interval = setInterval(() => {
+                    this.diffSeconds--
+                }, 1000);
+            }
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.seckill{
+    width: 100%;
+    height: 260px;
+    display: flex;
+    .aside{
+        overflow: hidden;
+        width: 190px;
+        height: 100%;
+        color: #fff;
+        background-image: url('../../../assets/seckillBg.png');
+
+        .title{
+            width: 100%;
+            text-align: center;
+            font-size: 28px;
+            margin-top: 31px;
+        }
+
+        .hour{
+            margin-top: 90px;
+            text-align: center;
+            span{
+                font-size: 18px;
+            }
+        }
+
+        .count-down{
+            margin: 10px 0 0 30px;
+            >span{
+                position: relative;
+                float: left;
+                width: 30px;
+                height: 30px;
+                text-align: center;
+                background-color: #2f3430;
+                margin-right: 20px;
+                color: white;
+                font-size: 20px;
+                &::after{
+                    content: ":";
+                    display: block;
+                    position: absolute;
+                    right: -20px;
+                    font-weight: bolder;
+                    font-size: 18px;
+                    width: 20px;
+                    height: 100%;
+                    top: 0;
+                }
+            }
+            >span:last-child::after{
+                content: '';
+            }
+        }
+
+        .act-status{
+            margin: 10px 0 0 65px;
+            font-size: 20px;
+        }
+    }
+
+    .section{
+        width: 1000px;
+        // background: #efefef;
+        .swiper-slide{
+            height: 260px;
+            .content{
+                width: 200px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                flex-direction: column;
+                position: relative;
+                &::after{
+                    content: "";
+                    display: block;
+                    position: absolute;
+                    top: 50%;
+                    right: 0;
+                    width: 1px;
+                    height: 200px;
+                    transform: translateY(-50%);
+                    background: linear-gradient(180deg,white,#eeeeee,white);
+                }
+                img{
+                    margin-top: 30px;
+                }
+                >div{
+                    width: 160px;
+                    margin-top: 10px;
+                    font-size: 12px;
+                    position: relative;
+                    
+                }
+                >div:nth-of-type(1):hover{
+                    color: $theme_color;
+                    cursor: pointer;
+                }
+                >div:nth-of-type(2){
+                    border: 1px solid $theme_color;
+                    line-height: 24px;
+                    display: flex;
+                    text-align: center;
+
+                    span:nth-child(1){
+                        color: #fff;
+                        font-size: 16px;
+                        width: 92px;
+                        background-color: $theme_color;
+                        position: relative;
+                        &::before{
+                            content: " ";
+                            width: 0;
+                            height: 0;
+                            border-color: transparent white transparent transparent;
+                            border-style: solid;
+                            border-width: 24px 8px 0 0;
+                            position: absolute;
+                            top: 0;
+                            left: 84px;
+                        }
+                    }
+
+                    span:nth-child(2){
+                        color: #999;
+                        width: 66px;
+                        text-decoration: line-through;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/modelList/setup-box.scss b/manager/src/views/lili-floor-renovation/modelList/setup-box.scss
new file mode 100644
index 00000000..088778ca
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/modelList/setup-box.scss
@@ -0,0 +1,62 @@
+.setup-content{
+    position: relative;
+    &:hover{
+        .setup-box{
+            display: block;
+        }
+    }
+}
+
+.setup-box{
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: rgba(0, 0, 0, .2);
+    z-index: 99;
+    width: 100%;
+    height: 100%;
+    .ivu-btn{
+        float: right;
+        margin-right: 5px;
+        margin-top: 5px;
+    }
+}
+
+.modal-tab-bar{
+    margin-left: 20px;
+    table{
+        margin-top: 10px;
+        display:inline-block;
+        border: 1px solid #ddd;
+        border-radius: 5px;
+        max-height: 400px !important;
+        overflow: hidden auto;
+    }
+    thead{
+        background-color: #eee;
+        th{
+            padding: 5px 0;
+        }
+    }
+    td{
+       padding: 10px;
+       text-align: center;
+    }
+    tbody>tr:hover{
+        background-color: aliceblue;
+    }
+}
+
+.modal-top-advert{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    >*{
+        margin-bottom: 10px;
+    }
+    .ivu-input-wrapper{
+        width: 200px;
+    }
+}
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/readme.md b/manager/src/views/lili-floor-renovation/readme.md
new file mode 100644
index 00000000..1261bb78
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/readme.md
@@ -0,0 +1,20 @@
+### 楼层装修页面
+
+#### floorList.vue  楼层列表
+
+#### renovation.vue 楼层装修主页面
+
+#### singleConfig.vue  右侧配置项
+
+#### modelForm.vue  中间展示所选模块
+
+#### modelFormItem.vue  单个模块样式
+
+#### modelConfig.js 模块数据
+
+#### modelList文件夹为添加的模块
+
+### wap文件夹为移动端楼层装修
+
+
+### draggable中文文档 (http://www.itxst.com/vue-draggable/tutorial.html)
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue
new file mode 100644
index 00000000..f0343571
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/renovation.vue
@@ -0,0 +1,172 @@
+<template>
+    <div class="renovation">
+        <!-- 左侧模块列表 -->
+        <div class="model-list">
+            <div class="classification-title">基础模块</div>
+            <draggable tag="ul" :list="modelData" 
+              v-bind="{group:{ name:'model', pull:'clone',put:false},sort:false, ghostClass: 'ghost'}"
+              @end="handleMoveEnd"
+              @start="handleMoveStart"
+              :move="handleMove"
+            >
+                <li v-for="(model, index) in modelData" :key="index" class="model-item">
+                    <Icon :type="model.icon" />
+                    <span>{{model.name}}</span>
+                </li>
+            </draggable>
+        </div>
+        <!-- 中间展示模块 -->
+        <div class="show-content">
+            <model-form  ref="modelForm" :data="modelForm"></model-form>
+        </div>
+        <!-- 保存按钮 -->
+        <div class="btn-bar"><Button type="primary" @click="saveTemplate">保存模板</Button> <Button @click="resetTemplate">还原模板</Button></div>
+    </div>
+</template>
+<script>
+import { modelData } from './modelConfig';
+import Draggable from "vuedraggable";
+import ModelForm from './modelForm.vue';
+import * as API_floor from '@/api/other.js';
+export default {
+    components:{
+        Draggable, ModelForm
+    },
+    mounted(){
+        this.getTemplateItem(this.$route.query.id)
+    },
+    data() {
+        return {
+            modelData, // 可选模块数据
+            modelForm:{list:[]} // 模板数据
+        }
+    },
+    methods:{
+        saveTemplate(){ // 保存模板
+            this.modelForm.list.unshift(this.$refs.modelForm.navList)
+            this.modelForm.list.unshift(this.$refs.modelForm.topAdvert)
+            const modelForm = JSON.stringify(this.modelForm)
+            const data = {
+                id:this.$route.query.id,
+                pageData:modelForm,
+            }
+            API_floor.updateHome(this.$route.query.id, data).then(res=> {
+                if(res.code === 200) {
+                    this.$Message.success('保存模板成功');
+                } else {
+                    this.$Message.error(res.message)
+                }
+            })
+        },
+        resetTemplate(){ // 还原模板
+            this.getTemplateItem(this.$route.query.id)
+        },
+        getTemplateItem(id){ // 获取模板数据
+            API_floor.getHomeData(id).then(res => {
+                if (res.code === 200) {
+                    let pageData = res.result.pageData;
+                    if(pageData) {
+                        pageData = JSON.parse(pageData);
+                        if (pageData.list[0].type === 'topAdvert') { // topAdvert 为顶部广告 navList为导航栏
+                            this.$refs.modelForm.topAdvert = pageData.list[0];
+                            this.$refs.modelForm.navList = pageData.list[1];
+                            pageData.list.splice(0,2)
+                            this.modelForm = pageData;
+                        } else {
+                            this.modelForm = {list:[]}
+                        }
+                        
+                    } else {
+                        this.modelForm = {list:[]}
+                    }
+                }
+                
+                // this.$refs.modelForm.topAdvert = {};
+                // this.$refs.modelForm.navList = {}
+            })
+        }
+        
+    },
+    watch: {
+        modelForm: {
+            deep: true,
+            handler: function (val) {
+                console.log(val)
+            }
+        } 
+    }
+}
+</script>
+<style lang="scss" scoped>
+.renovation{
+    position: relative;
+    display: flex;
+}
+.model-list{
+    width: 120px;
+    height:auto;
+    padding: 10px;
+    background: #fff;
+    margin-top: 60px;
+    position: fixed;
+    z-index: 100;
+    box-shadow: 1px 1px 10px #999;
+    .classification-title{
+        width: 100%;
+        height: 30px;
+        line-height: 30px;
+    }
+    .model-item{
+        width: 100px;
+        height: 30px;
+        background: #eee;
+        margin-top: 10px;
+        line-height: 30px;
+        text-align: center;
+        color: #999;
+        &:hover{
+            border: 1px dashed #409EFF;
+            color: #409EFF;
+            cursor: move;
+        }
+    }
+    .ghost::after{
+        border:none;
+        height: 0;
+        content: '';
+    }
+}
+.show-content{
+    margin-left: 150px;
+    margin-top: 60px;
+}
+.ghost{
+    background: #fff;
+    height: 30px;
+    position: relative;
+    &::after{
+        content: '松开鼠标添加模块';
+        position: absolute;
+        background: #fff;
+        border: 1px dashed #409EFF;
+        color: #409EFF;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 50px;
+        text-align: center;
+        line-height: 50px;
+    }
+}
+.btn-bar{
+    position: fixed;
+    width: 100%;
+    background:#fff;
+    height: 50px;
+    padding: 10px;
+    box-shadow: 1px 1px 10px #999;
+    z-index: 99;
+    top: 100px;
+}
+
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/advertising.vue b/manager/src/views/lili-floor-renovation/wap/advertising.vue
new file mode 100644
index 00000000..dfd185d9
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/advertising.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="model-view">
+    <div class="model-view-content">
+      <div class="content">
+        <div class="wap-title">首页</div>
+        <div class="draggable">
+          <!-- 全屏 -->
+          <div class="full-shadow" v-if="type == 'full'">
+            <img :src="advertising[0].img" alt="" />
+          </div>
+         
+        </div>
+      </div>
+    </div>
+    <div class="model-config">
+      <div class="decorate">
+        <div class="decorate-title">全屏广告</div>
+
+       
+
+        <div class="decorate-list">
+          <div
+            class="decorate-item"
+            v-for="(item, index) in advertising"
+            :key="index"
+          >
+            <div class="decorate-item-title">
+              <div>设置</div>
+            </div>
+            <div class="decorate-item-box">
+              <!-- 选择照片 -->
+              <div class="decorate-view">
+                <div class="decorate-view-title">选择图片</div>
+                <div>
+                  <img class="show-image" :src="item.img" alt />
+                  <input
+                    type="file"
+                    class="hidden-input"
+                    @change="changeFile(item, index)"
+                    ref="files"
+                    :id="'files' + index"
+                  />
+                  <div class="tips">
+                    建议尺寸
+                    <span>{{ item.size }}</span>
+                  </div>
+                </div>
+                <div class="selectBtn">
+                  <Button
+                    size="small"
+                    @click="handleClickFile(item, index)"
+                    ghost
+                    type="primary"
+                    >选择照片</Button
+                  >
+                </div>
+              </div>
+
+              <!-- 选择连接 -->
+              <div class="decorate-view">
+                <div class="decorate-view-title">选择图片</div>
+                <div>
+                  <Button
+                    ghost
+                    type="primary"
+                    size="small"
+                    @click="clickLink(item)"
+                    >选择链接</Button
+                  >
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- <Button type="primary" @click="addDecorate()" ghost>添加</Button> -->
+        <liliDialog ref="liliDialog" :types="linkType"></liliDialog>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { btnWay } from "./btn.js";
+export default {
+  data() {
+    return {
+      btnWay,
+      type: "full",
+
+      //全屏广告
+      advertising: [
+         {
+          img:
+            "https://st-gdx.dancf.com/gaodingx/0/uxms/design/20200903-182035-5e87.png?x-oss-process=image/resize,w_932/interlace,1,image/format,webp",
+          size: "750*1624",
+        },
+      ],
+
+      linkType: "",
+    };
+  },
+  methods: {},
+  mounted() {
+    console.log(this.btnWay);
+  },
+  methods: {
+  
+    // 点击链接
+    clickLink(item) {
+      this.$refs.liliDialog.open('link')
+    },
+
+    // 关闭
+    closeDecorate(index) {
+      this.$nextTick(() => {
+        this.btnWay.splice(index, 1);
+      });
+    },
+    //点击图片解析成base64
+    changeFile(item, index) {
+      const file = document.getElementById("files" + index).files[0];
+      if (file == void 0) return false;
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      this.$nextTick((res) => {
+        reader.onload = (e) => {
+          item.img = e.target.result;
+        };
+      });
+    },
+    // 点击选择照片
+    handleClickFile(item, index) {
+      document.getElementById("files" + index).click();
+      // console.log(let files = files)
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+@import "./decorate.scss";
+.decorate-radio {
+  margin: 10px 0;
+}
+.window-shadow,
+.full-shadow {
+  display: flex;
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.2);
+  left: 0;
+  align-items: center;
+  justify-content: center;
+}
+.window-shadow {
+  > img {
+    width: 306px;
+    height: 418px;
+  }
+}
+.full-shadow {
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.draggable {
+  position: relative;
+}
+
+.btn-item {
+  > img {
+    margin: 4px 0;
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue b/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
new file mode 100644
index 00000000..4ac0a573
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/alertAdvertising.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="model-view">
+    <div class="model-view-content">
+      <div class="content">
+        <div class="wap-title">首页</div>
+        <div class="draggable">
+          <!-- 弹窗广告 -->
+          <div class="window-shadow">
+            <img :src="advertising[0].img" alt="" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="model-config">
+      <div class="decorate">
+        <div class="decorate-title">弹窗广告</div>
+
+        <div class="decorate-list">
+          <div
+            class="decorate-item"
+            v-for="(item, index) in advertising"
+            :key="index"
+          >
+            <div class="decorate-item-title">
+              <div>设置</div>
+            </div>
+            <div class="decorate-item-box">
+              <!-- 选择照片 -->
+              <div class="decorate-view">
+                <div class="decorate-view-title">选择图片</div>
+                <div>
+                  <img class="show-image" :src="item.img" alt />
+                  <input
+                    type="file"
+                    class="hidden-input"
+                    @change="changeFile(item, index)"
+                    ref="files"
+                    :id="'files' + index"
+                  />
+                  <div class="tips">
+                    建议尺寸
+                    <span>{{ item.size }}</span>
+                  </div>
+                </div>
+                <div class="selectBtn">
+                  <Button
+                    size="small"
+                    @click="handleClickFile(item, index)"
+                    ghost
+                    type="primary"
+                    >选择照片</Button
+                  >
+                </div>
+              </div>
+
+              <!-- 选择连接 -->
+              <div class="decorate-view">
+                <div class="decorate-view-title">选择图片</div>
+                <div>
+                  <Button
+                    ghost
+                    type="primary"
+                    size="small"
+                    @click="clickLink(item)"
+                    >选择链接</Button
+                  >
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- <Button type="primary" @click="addDecorate()" ghost>添加</Button> -->
+        <liliDialog ref="liliDialog" :types="linkType"></liliDialog>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { btnWay } from "./btn.js";
+export default {
+  data() {
+    return {
+      btnWay,
+      type: "full",
+      //全屏广告
+      advertising: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/9136ecddcddf6607184fab689207e7e3.png",
+          size: "612*836",
+        },
+      ],
+      linkType: "",
+    };
+  },
+  methods: {},
+  mounted() {
+    console.log(this.btnWay);
+  },
+  methods: {
+    // 点击链接
+    clickLink(item) {
+      this.$refs.liliDialog.open('link')
+    },
+
+    // 关闭
+    closeDecorate(index) {
+      this.$nextTick(() => {
+        this.btnWay.splice(index, 1);
+      });
+    },
+    //点击图片解析成base64
+    changeFile(item, index) {
+      const file = document.getElementById("files" + index).files[0];
+      if (file == void 0) return false;
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      this.$nextTick((res) => {
+        reader.onload = (e) => {
+          item.img = e.target.result;
+        };
+      });
+    },
+    // 点击选择照片
+    handleClickFile(item, index) {
+      document.getElementById("files" + index).click();
+      // console.log(let files = files)
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+@import "./decorate.scss";
+.decorate-radio {
+  margin: 10px 0;
+}
+.window-shadow,
+.full-shadow {
+  display: flex;
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.2);
+  left: 0;
+  align-items: center;
+  justify-content: center;
+}
+.window-shadow {
+  > img {
+    width: 306px;
+    height: 418px;
+  }
+}
+.full-shadow {
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.draggable {
+  position: relative;
+}
+
+.btn-item {
+  > img {
+    margin: 4px 0;
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/btn.js b/manager/src/views/lili-floor-renovation/wap/btn.js
new file mode 100644
index 00000000..ed203ace
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/btn.js
@@ -0,0 +1,21 @@
+/**
+ * btnWay 设置悬浮按钮功能
+ */
+
+export const btnWay = [
+  {
+    img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/8153f1d85f462b277d024baf812814a6.png",
+    title: "",
+    size:"80*80"
+  },
+  {
+    img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/c72f2c4f452d72e4ad82f38c72911ce4.png",
+    title: "",
+    size:"80*80"
+  },
+  {
+    img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/875dd6d2b1980dbccbec0895f757cdff.png",
+    title: "",
+    size:"80*80"
+  },
+];
diff --git a/manager/src/views/lili-floor-renovation/wap/btn.vue b/manager/src/views/lili-floor-renovation/wap/btn.vue
new file mode 100644
index 00000000..bd032c76
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/btn.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="model-view">
+    <div class="model-view-content">
+      <div class="content">
+        <div class="wap-title">首页</div>
+        <div class="draggable">
+          <div class="position">
+            <div class="btn-item">
+              <img
+                src="https://shopro-1253949872.file.myqcloud.com/uploads/20200704/f6b9c9d20d21df541ac52e9548486e1a.png"
+                alt=""
+              />
+            </div>
+            <div class="btn-item" v-for="(item, index) in btnWay" :key="index">
+              <img :src="item.img" alt="" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="model-config">
+      <div class="decorate">
+        <div class="decorate-title">悬浮按钮</div>
+
+        <div class="decorate-list">
+          <div
+            class="decorate-item"
+            v-for="(item, index) in btnWay"
+            :key="index"
+          >
+            <div class="decorate-item-title">
+              <div>图标{{ index + 1 }}</div>
+              <Icon
+                @click="closeDecorate(index)"
+                size="20"
+                color="#e1251b"
+                type="md-close-circle"
+              />
+            </div>
+            <div class="decorate-item-box">
+              <!-- 选择照片 -->
+              <div class="decorate-view">
+                <div class="decorate-view-title">选择图标</div>
+                <div>
+                  <img class="show-image" :src="item.img" alt />
+                  <input
+                    type="file"
+                    class="hidden-input"
+                    @change="changeFile(item, index)"
+                    ref="files"
+                    :id="'files' + index"
+                  />
+                  <div class="tips">
+                    建议尺寸
+                    <span>{{ item.size }}</span>
+                  </div>
+                </div>
+                <div class="selectBtn">
+                  <Button
+                    size="small"
+                    @click="handleClickFile(item, index)"
+                    ghost
+                    type="primary"
+                    >选择照片</Button
+                  >
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <Button type="primary" @click="addDecorate()" ghost>添加</Button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { btnWay } from "./btn.js";
+export default {
+  data() {
+    return {
+      btnWay,
+    };
+  },
+  methods: {},
+  mounted() {
+    console.log(this.btnWay);
+  },
+  methods: {
+    //添加设置
+    addDecorate() {
+      let way = {
+        img: "https://picsum.photos/id/264/200/200",
+        title: "标题",
+        size: this.btnWay[0].size,
+      };
+      this.btnWay.push(way);
+    },
+
+    // 关闭
+    closeDecorate(index) {
+      this.$nextTick(() => {
+        this.btnWay.splice(index, 1);
+      });
+    },
+    //点击图片解析成base64
+    changeFile(item, index) {
+      const file = document.getElementById("files" + index).files[0];
+      if (file == void 0) return false;
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      this.$nextTick((res) => {
+        reader.onload = (e) => {
+          item.img = e.target.result;
+        };
+      });
+    },
+    // 点击选择照片
+    handleClickFile(item, index) {
+      document.getElementById("files" + index).click();
+      // console.log(let files = files)
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+@import "./decorate.scss";
+.draggable {
+  position: relative;
+}
+.position {
+  position: absolute;
+  right: 30px;
+  bottom: 50px;
+  display: flex;
+  flex-direction: column-reverse;
+}
+.btn-item {
+  > img {
+    margin: 4px 0;
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js
new file mode 100644
index 00000000..bef9cba1
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/config.js
@@ -0,0 +1,636 @@
+
+import * as API_Other from '@/api/other'
+
+// 获取楼层装修信息
+export function initData(id){
+  API_Other.getHomeData(id).then(res=>{
+
+    homeData = res
+
+  })
+}
+
+
+export let homeData ={}
+
+
+/**
+ * drawer:true   广告右侧打开抽屉中显示
+ * ad_drawer:true 活动魔方右侧显示
+ * notAdd: true 没有添加按钮
+ * notLink: true 没有连接功能
+ * notImg: true 没有选择图片功能
+ * close:true 右侧关闭按钮
+ */
+export const modelData = [
+  {
+    type: "carousel",
+    name: "图片轮播",
+    img: "md-image",
+    notTitle: false,
+    close: true,
+    options: {
+      list: [
+
+        {
+          img: "https://i.loli.net/2020/12/05/fKH4CwImpbuD5Xj.png",
+          url: "",
+          link: "",
+          size: "750*350"
+        },
+        {
+          img: "https://i.loli.net/2020/12/05/12kleCgrSLfKoQs.png",
+          url: "",
+          link: "",
+          size: "750*350"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/343e226d0d2e2d2efcf21f31a678ba46.png",
+          url: "",
+          link: "",
+          size: "750*350"
+        },
+      ]
+    }
+  },
+  {
+    type: "leftOneRightTwo",
+    name: "左一右二",
+    notAdd: true,
+    drawer: true,
+    view: "tpl_ad_list",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*335"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/cddb5d90a4241f6235d16368534bc730.png",
+          url: "",
+          link: "",
+          size: "335*177"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/e047d312fb5930de972ae288b9b3bae7.png",
+          url: "",
+          link: "",
+          size: "335*177"
+        }
+      ]
+    }
+  },
+  {
+    type: "title",
+    name: "标题栏",
+    img: "md-image",
+    notAdd: true,
+    notLink: true,
+    notImg: true,
+    options: {
+      list: [
+        {
+          title: "标题",
+          color: "#000000"
+        }
+      ]
+    }
+  },
+  {
+    type: "leftTwoRightOne",
+    name: "左二右一",
+    notAdd: true,
+    drawer: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/cddb5d90a4241f6235d16368534bc730.png",
+          url: "",
+          link: "",
+          size: "335*177"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/e047d312fb5930de972ae288b9b3bae7.png",
+          url: "",
+          link: "",
+          size: "335*177"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*335"
+        }
+      ]
+    }
+  },
+  {
+    type: "flexThree",
+    name: "三列单行",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"226*226 (1:1)"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"226*226 (1:1)"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"226*226 (1:1)"
+        }
+      ]
+    }
+  },
+  {
+    type: "flexOne",
+    name: "一张大图",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://i.loli.net/2020/12/05/8wSNWbnqujDh6HL.png",
+          url: "",
+          link: "",
+          size:"750*280"
+        }
+      ]
+    }
+  },
+  {
+    type: "flexTwo",
+    name: "两张横图",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*220"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*220"
+        }
+      ]
+    }
+  },
+  {
+    type: "topOneBottomTwo",
+    name: "上一下二",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "710*170"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*170"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*170"
+        }
+      ]
+    }
+  },
+  {
+    type: "topTwoBottomOne",
+    name: "上二下一",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+
+          size: "335*170"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "335*170"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size: "710*170"
+        }
+      ]
+    }
+  },
+  {
+    type: "flexFive",
+    name: "五列单行",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img: "https://picsum.photos/id/127/200/200",
+          url: "",
+          link: "",
+          size:"75*75（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"75*75（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"75*75（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"75*75（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"75*75（1:1）"
+        }
+      ]
+    }
+  },
+  {
+    type: "flexFour",
+    name: "四列单行",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          size:"88*88（1:1）"
+        }
+      ]
+    }
+  },
+  {
+    type: "textPicture",
+    name: "文字图片",
+    drawer: true,
+    notAdd: true,
+
+    img: "md-image",
+    options: {
+      list: [
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          title: "88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          title: "88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          title: "88*88（1:1）"
+        },
+        {
+          img:
+            "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png",
+          url: "",
+          link: "",
+          title: "88*88（1:1）"
+        }
+      ]
+    }
+  },
+
+  {
+    type: "tpl_ad_list",
+    name: "广告魔方",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          bg_img: "",
+          name: "",
+          url: ""
+        }
+      ]
+    }
+  },
+  {
+    type: "menu",
+    name: "宫格导航",
+    img: "md-image",
+    close: true,
+    options: {
+      list: [
+        {
+          img:
+            "https://i.loli.net/2020/12/05/SoGAv7gYybuWzED.png",
+          url: "",
+          link: "",
+          title: "标题",
+          size: "88*88 (1:1)"
+        },
+        {
+          img:
+            "https://i.loli.net/2020/12/05/JXR5K3sbIeENjqH.png",
+          url: "",
+          link: "",
+          title: "标题",
+          size: "88*88 (1:1)"
+        },
+        {
+          img:
+            "https://i.loli.net/2020/12/05/KlZfnCFIdEV231Y.png",
+          url: "",
+          link: "",
+          title: "标题",
+          size: "88*88 (1:1)"
+        },
+        {
+          img:
+            "https://i.loli.net/2020/12/05/GfmMyN2wrUVIlci.png",
+          url: "",
+          link: "",
+          title: "标题",
+          size: "88*88 (1:1)"
+        },
+        {
+          img:
+            "https://i.loli.net/2020/12/05/eznDa3iNby5FkYL.png",
+          url: "",
+          link: "",
+          title: "标题",
+          size: "88*88 (1:1)"
+        }
+      ]
+    }
+  },
+  {
+    type: "search",
+    name: "搜索",
+    img: "md-image",
+    notAdd: true,
+    notLink: true,
+    notImg: true,
+    options: {
+      list: [
+        {
+          title: "搜索"
+        }
+      ]
+    }
+  },
+  {
+    type: "goods",
+    name: "商品分类",
+    img: "md-image",
+    notAdd: true,
+    notLink: true,
+    notImg: true,
+    options: {
+      list: [
+        {
+          titleWay: [
+            {
+              title: "精选",
+              desc: "电子推荐"
+            },
+            {
+              title: "实惠",
+              desc: "便宜好货"
+            },
+            {
+              title: "进口",
+              desc: "国际自营"
+            },
+            {
+              title: "推荐",
+              desc: "喂奶推荐"
+            }
+          ],
+          listWay: [
+            {
+              img:
+                "https://api.7wpp.com/uploads/20200930/78d480fa1025394b9be24ef5eef17489.png",
+              price: "120",
+              title:
+                " 微软 (Microsoft) Xbox 无线控制器/手柄 湛蓝色 | 3.5mm耳机接口蓝牙连接 Xbox主机电脑平板通用",
+              type: "精选"
+            },
+            {
+              img:
+                "https://i.loli.net/2020/12/05/c9mptI5Pg8qJ6ny.png",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "190",
+              type: "精选"
+            },
+            {
+              img:
+                "https://i.loli.net/2020/12/05/QsSYIPF743Hgf8q.png",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "10",
+              type: "精选"
+            },
+            {
+              img:
+                "https://i.loli.net/2020/12/05/VTwDYcLWnukGxat.png",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "190",
+              type: "精选"
+            },
+            {
+              img:
+                "https://i.loli.net/2020/12/05/SIFwaVpE4YJAuQf.png",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "10",
+              type: "精选"
+            },
+            {
+              img:
+                "https://api.7wpp.com/uploads/20201110/86d4dedc0d88ce4b1329b02a4b87fe7d.jpg",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "190",
+              type: "精选"
+            },
+            {
+              img:
+                "https://api.7wpp.com/uploads/20200930/0d9102613d7b7e738c83504f80194cd4.jpg",
+              title:
+                "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米",
+              price: "10",
+              type: "精选"
+            },
+          ]
+        }
+      ]
+    }
+  },
+  {
+    notAdd: true,
+    notImg: true,
+    type: "joinGroup",
+    name: "拼团活动",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          title: "测试拼团"
+        }
+      ]
+    }
+  },
+  {
+    notAdd: true,
+    notImg: true,
+    type: "integral",
+    name: "积分活动",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          title: "测试积分"
+        }
+      ]
+    }
+  },
+  {
+    notAdd: true,
+    notImg: true,
+    type: "spike",
+    name: "秒杀活动",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          title: "测试秒杀"
+        }
+      ]
+    }
+  },
+  {
+    notAdd: true,
+    notImg: true,
+    type: "group",
+    name: "团购活动",
+    img: "md-image",
+    options: {
+      list: [
+        {
+          title: "测试团购"
+        }
+      ]
+    }
+  }
+];
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.scss b/manager/src/views/lili-floor-renovation/wap/decorate.scss
new file mode 100644
index 00000000..968e51f6
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.scss
@@ -0,0 +1,117 @@
+
+/deep/ .ivu-modal-mask,.ivu-modal-wrap{
+  z-index: 800;
+}
+.decorate-view-link{
+    font-size: 12px;
+    margin: 0 4px;
+    color: #999;
+}
+.decorate-view-style {
+    border: 1px solid #ededed;
+    background: #f7f7fa;
+    text-align: center;
+    width: 100%;
+    padding: 30px 0 0 0;
+    margin-bottom: 20px;
+    cursor: pointer;
+    > .select-style {
+      background: #ededed;
+      padding: 15px 0;
+      font-size: 15px;
+    }
+  }
+  .decorate-border {
+    border: 1px solid #ededed;
+    margin: 10px 0;
+    padding: 0 10px;
+  }
+  .drawer {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    > .drawer-item {
+      cursor: pointer;
+      border: 1px solid #ededed;
+      background: #f9f0ff;
+      width: 170px;
+      margin-right: 14px;
+      color: #9254de;
+      margin-bottom: 14px;
+      border-radius: 0.8em;
+      height: 60px;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+    }
+  }
+  .hidden-input {
+    display: none;
+  }
+  .decorate {
+    padding: 0 20px;
+    height: calc(100vh - 120px);
+    overflow-y: auto;
+    padding-bottom: 120px;
+  }
+  .decorate-title {
+    height: 50px;
+    line-height: 50px;
+    font-weight: bold;
+  }
+  .decorate-list {
+    overflow: hidden;
+  }
+  .decorate-view {
+    display: flex;
+    margin: 20px 0;
+    align-items: center;
+  }
+  .decorate-item-box {
+    background: #fff;
+    padding: 10px;
+    border: 1px solid #ededed;
+  }
+  .decorate-item-title {
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    line-height: 40px;
+    padding: 0 10px;
+  }
+  .decorate-view-title {
+    margin-right: 10px;
+  }
+  .decorate-item {
+    background: #ededed;
+    border-top-left-radius: 0.4em;
+    margin-bottom: 20px;
+    border-top-right-radius: 0.4em;
+  }
+  .show-image {
+    max-width: 50px;
+  }
+  .tips {
+    font-size: 12px;
+    color: #999;
+    > span {
+      color: $theme_color;
+    }
+  }
+  .selectBtn {
+    margin-left: 10px;
+  }
+  .bing-goods-list {
+    display: flex;
+    > .bing-goods-item {
+      width: 50px;
+      height: 50px;
+      > img {
+        width: 100%;
+        height: 100%;
+        display: block;
+      }
+    }
+  }
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
new file mode 100644
index 00000000..7995882c
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="decorate">
+    <div class="decorate-title">
+      {{ res.name }}
+      <Button style="margin-left: 20px" size="small" ghost v-if="
+          res.type == 'tpl_ad_list' ||
+          res.type == 'tpl_activity_list' ||
+          res.drawer
+        " type="primary" @click="selectStyle()">选择风格</Button>
+    </div>
+
+    <!-- 右侧显示抽屉 -->
+    <Drawer title="选择风格" :closable="false" width="400" v-model="styleFlag">
+      <div class="drawer">
+        <div class="drawer-item" @click="clickDrawer(item, index)" v-for="(item, index) in modelData" :key="index" v-if="item.drawer">
+          <img src alt />
+          <span>{{ item.name }}</span>
+        </div>
+      </div>
+    </Drawer>
+
+    <!-- 卡片集合 -->
+    <div class="decorate-list" v-if="
+        (res.type != 'tpl_ad_list' && res.type != 'tpl_activity_list') ||
+        res.drawer
+      ">
+      <div class="decorate-item" v-for="(item, index) in res.options.list" :key="index">
+        <div class="decorate-item-title">
+          <div>卡片</div>
+          <Icon @click="closeDecorate(index)" v-if="res.close" size="20" color="#e1251b" type="md-close-circle" />
+        </div>
+
+        <div class="decorate-item-box">
+          <div class="decorate-border" v-if="item.titleWay" v-for="(title_item, title_index) in item.titleWay" :key="title_index">
+            <div class="decorate-view">
+              <div class="decorate-view-title">标题{{ title_index + 1 }}</div>
+              <div>
+                <Input v-model="title_item.title" />
+              </div>
+            </div>
+            <div class="decorate-view">
+              <div class="decorate-view-title">描述</div>
+              <div>
+                <Input v-model="title_item.desc" />
+              </div>
+            </div>
+            <div class="decorate-view">
+              <div class="decorate-view-title">绑定商品</div>
+              <div class="decorate-view-link" v-if="res.options.list[0].listWay.length != 0">
+
+                <!-- 绑定商品选择器回调已选择的商品 -->
+                <div v-if="title_item.title == bindGoods.type" v-for="(bindGoods,bindGoodsIndex) in res.options.list[0].listWay" :key="bindGoodsIndex">
+                  {{bindGoods.title}},
+                </div>
+
+              </div>
+              <div>
+                <Button @click="bindGoodsId(title_item)" size="small" ghost type="primary">选择商品</Button>
+              </div>
+            </div>
+
+          </div>
+          <!-- 选择照片 -->
+          <div class="decorate-view" v-if="!res.notImg">
+            <div class="decorate-view-title">选择照片</div>
+            <div>
+              <img class="show-image" :src="item.img" alt />
+
+              <div class="tips">
+                建议尺寸
+                <span>{{ item.size }}</span>
+              </div>
+            </div>
+            <div class="selectBtn">
+              <Button size="small" @click="handleClickFile(item, index)" ghost type="primary">选择照片</Button>
+            </div>
+          </div>
+          <!-- 填写标题 -->
+          <div class="decorate-view" v-if="item.title != void 0 && !res.notTitle">
+            <div class="decorate-view-title">菜单标题</div>
+            <div>
+              <Input v-model="item.title" style="width: 200px" />
+            </div>
+          </div>
+          <!-- 填写链接 -->
+
+          <div class="decorate-view" v-if="!res.notLink">
+            <div class="decorate-view-title">选择链接</div>
+            <div v-if="item.url.length != 0" class="decorate-view-link">
+              已选链接：
+
+              <span>
+                {{ ways.find((e)=>{return item.url.___type == e.name}).title }}
+                -
+                <!-- 当选择完链接之后的商品名称 -->
+                <span v-if="item.url.___type == 'goods'"> {{item.url.goodsName}}</span>
+                <!-- 当选择完链接之后的分类回调 -->
+                <span v-if="item.url.___type == 'category'"> {{item.url.name}}</span>
+                <!-- 当选择完链接之后的店铺回调 -->
+                <span v-if="item.url.___type == 'shops'"> {{item.url.memberName}}</span>
+                <!-- 当选择完链接之后的其他回调 -->
+                <span v-if="item.url.___type == 'other'"> {{item.url.title}}</span>
+                <!-- 当选择完活动之后的其他回调 -->
+                <span v-if="item.url.___type == 'marketing'">
+                  <span v-if="item.url.___promotion =='SECKILL'">
+                    秒杀
+                  </span>
+                  <span v-if="item.url.___promotion =='FULL_DISCOUNT'">
+                    满减
+                  </span>
+                  <span v-if="item.url.___promotion =='PINTUAN'">
+                    拼团
+                  </span>
+                  {{item.url.title || item.url.goodsName}}
+                </span>
+                <!-- 当选择完活动之后的其他回调 -->
+                <span v-if="item.url.___type == 'pages'"> {{item.url.title}}</span>
+
+              </span>
+
+            </div>
+            <div>
+              <Button ghost size="small" type="primary" @click="clickLink(item,index)">选择链接</Button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <Button v-if="
+        res.type != 'tpl_ad_list' &&
+        res.type != 'tpl_activity_list' &&
+        !res.notAdd
+      " type="primary" @click="addDecorate()" ghost>添加</Button>
+
+    <liliDialog ref="liliDialog" @selectedLink="selectedLink" @selectedGoodsData="selectedGoodsData"></liliDialog>
+
+    <Modal width="1200px" v-model="picModelFlag">
+      <ossManage @callback="callbackSelected" ref="ossManage" />
+    </Modal>
+  </div>
+</template>
+<script>
+import ossManage from "@/views/sys/oss-manage/ossManage";
+import { modelData } from "./config";
+import ways from "@/views/lili-dialog/wap.js"; // 选择链接的类型
+export default {
+  components: {
+    ossManage
+  },
+  data() {
+    return {
+      ways,
+      picModelFlag: false, //图片选择器
+      linkType: "goods", // dialog弹窗口类型
+      styleFlag: false, //广告魔方开关
+      selectedLinkIndex: "", //选择链接的索引
+      modelData,
+      selectedGoods: "",
+      selectedLinks: "",
+      modelList: "",
+    };
+  },
+  watch: {
+    res: {
+      handler: (val) => {},
+      deep: true,
+    },
+  },
+  props: ["res"],
+  mounted() {},
+  methods: {
+    // 选择风格
+    selectStyle() {
+      this.styleFlag = !this.styleFlag;
+    },
+
+    // 回调选择的链接
+    selectedLink(val) {
+      this.selectedLinks.url = val;
+
+      console.log(this.selectedLinks);
+    },
+
+    // 回调的商品信息
+    selectedGoodsData(val) {
+      if (!val) return false;
+      val.forEach((item) => {
+        delete item.selected;
+        item.img = item.thumbnail;
+        item.title = item.goodsName;
+        item.type = this.selectedGoods.title;
+      });
+      this.res.options.list[0].listWay = this.res.options.list[0].listWay.concat(
+        val
+      );
+
+      this.linkType = "";
+    },
+
+    // 绑定商品
+    bindGoodsId(val) {
+      this.selectedGoods = val;
+      this.liliDialogFlag(true);
+    },
+    // 点击抽屉
+    clickDrawer(item, index) {
+      this.$emit("handleDrawer", item);
+      this.styleFlag = false;
+    },
+
+    liliDialogFlag(flag) {
+      this.$refs.liliDialog.goodsFlag = flag;
+      this.$refs.liliDialog.flag = true;
+    },
+
+    // 点击链接赋值一个唯一值，并将当前选择的模块赋值
+    clickLink(val, index) {
+      // this.selectedLinkIndex = index
+      // val.___only = new Date().getTime(), //赋值当前时间戳 唯一
+      this.selectedLinks = val;
+
+      console.log(this.selectedLinks);
+      this.liliDialogFlag(false);
+    },
+
+    //点击图片解析成base64
+    changeFile(item, index) {
+      const file = document.getElementById("files" + index).files[0];
+      if (file == void 0) return false;
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      this.$nextTick((res) => {
+        reader.onload = (e) => {
+          item.img = e.target.result;
+        };
+      });
+    },
+    //添加设置
+    addDecorate() {
+      let way = {
+        img: "https://picsum.photos/id/264/200/200",
+        title: "标题",
+        link: "",
+        url: "",
+        size: this.res.options.list[0].size,
+      };
+      this.res.options.list.push(way);
+    },
+
+    callbackSelected(val) {
+      this.picModelFlag = false;
+      this.selectedGoods.img = val.url;
+    },
+
+    // 点击选择照片
+    handleClickFile(item, index) {
+      this.$refs.ossManage.selectImage = true;
+      this.selectedGoods = item;
+      this.picModelFlag = true;
+
+      // console.log(let files = files)
+    },
+
+    // 关闭
+    closeDecorate(index) {
+      this.$nextTick(() => {
+        this.res.options.list.splice(index, 1);
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./decorate.scss";
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/index.js b/manager/src/views/lili-floor-renovation/wap/index.js
new file mode 100644
index 00000000..c7aa1a99
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/index.js
@@ -0,0 +1,17 @@
+import index from './index.vue' //首页
+import btn from './btn.vue' //按钮
+import advertising from './advertising.vue' //全屏活动
+import alertAdvertising from './alertAdvertising.vue' //弹窗活动
+
+
+
+const templates = {
+	index,
+	btn,
+	advertising,
+	alertAdvertising
+}
+
+
+
+export default  templates
diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue
new file mode 100644
index 00000000..a588245a
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/index.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="wrapper">
+    <!-- 拖拽栏 ，展示栏  -->
+    <div class="model-view">
+      <div class="model-view-menu">
+        <draggable
+          class="model-view-menu-item"
+          :list="modelData"
+          :move="handleMove"
+          v-bind="{
+            group: { name: 'model', pull: 'clone', put: false, animation: 150 },
+            sort: false,
+            ghostClass: 'ghost',
+          }"
+        >
+          <li
+            v-for="(model, index) in modelData"
+            v-if="!model.drawer"
+            :key="index"
+            class="model-item"
+          >
+            <img src alt />
+            <span>{{ model.name }}</span>
+          </li>
+        </draggable>
+      </div>
+
+      <div class="model-view-content">
+        <div class="content">
+          <div class="wap-title">首页</div>
+          <draggable
+            class="draggable"
+            group="model"
+            ghostClass="ghost"
+            @add="handleContentlAdd"
+            @end="handleContentlEnd"
+            v-model="contentData.list"
+          >
+            <div
+              class="list"
+              v-for="(element, index) in contentData.list"
+              :key="element.key"
+            >
+              <component
+                class="component"
+                :class="{ active: selected == index }"
+                @click.native="handleComponent(element, index)"
+                :is="templates[element.type]"
+                :res="element.options"
+              ></component>
+              <Icon
+                v-if="selected == index"
+                @click="closeComponent(index)"
+                color="#e1251b"
+                size="25"
+                class="close"
+                type="ios-close-circle"
+              />
+            </div>
+          </draggable>
+        </div>
+      </div>
+
+      <!-- 右侧栏 -->
+      <div class="model-config">
+        <decorate
+          @handleDrawer="handleDrawer"
+          v-if="decorateData"
+          :res="decorateData"
+        ></decorate>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import templates from "./template/index";
+import Draggable from "vuedraggable";
+import { modelData } from "./config";
+import decorate from "./decorate";
+import * as API_Other from '@/api/other'
+export default {
+  components: {
+    Draggable,
+    decorate,
+  },
+  data() {
+    return {
+      templates,
+      modelData,
+      qrcode: "",
+      selected: 0,
+      contentData: {
+        list: [],
+      },
+      decorateData: "",
+    };
+  },
+  watch: {
+    contentData: {
+      handler(val) {
+        this.$store.state.styleStore = val;
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+
+  methods: {
+    init() {
+      if (!this.$route.query.id) return false;
+      API_Other.getHomeData(this.$route.query.id).then(res=>{
+        this.contentData = JSON.parse(res.result.pageData)
+
+
+         this.handleComponent( this.contentData.list[0], 0)
+      })
+    },
+    handleSpinShow() {
+      this.$Spin.show();
+      setTimeout(() => {
+        this.$Spin.hide();
+      }, 3000);
+    },
+
+    // 中间组件拖动，右侧数据绑定不变
+    handleContentlEnd(evt) {
+      const { newIndex } = evt;
+      this.handleComponent(this.contentData.list[newIndex], newIndex);
+    },
+
+    // 关闭楼层装修
+    closeComponent(index) {
+      this.$nextTick(() => {
+        this.decorateData = "";
+
+        console.log(this.contentData.list.length);
+        // 如果当前楼层不为一
+        if (this.contentData.list.length > 1) {
+          // 如果当前最底层 给下一层赋值
+
+          if (index - 1 == -1) {
+            this.handleComponent(this.contentData.list[index], index);
+          } else {
+            // 如果不是最底层给上一层赋值
+            this.handleComponent(this.contentData.list[index - 1], index - 1);
+          }
+          this.contentData.list.splice(index, 1);
+        } else {
+          this.contentData.list.splice(index, 1);
+        }
+      });
+    },
+
+    // 点击楼层装修
+    handleComponent(val, index) {
+      console.warn(val)
+      this.selected = index;
+      this.$set(this, "decorateData", val);
+    },
+
+    handleDrawer(val) {
+      let newIndex = this.selected;
+
+      this.decorateData = "";
+
+      this.$set(this.contentData.list, newIndex, {
+        ...val,
+        options: {
+          ...val.options,
+        },
+
+        // 绑定键值
+        model: val.type,
+      });
+      this.contentData.list = JSON.parse(JSON.stringify(this.contentData.list));
+
+      this.$set(this, "decorateData", this.contentData.list[newIndex]);
+    },
+
+    // 封装拖拽参数
+    package(val, newIndex) {
+      this.contentData.list[newIndex] = "";
+      val = JSON.parse(JSON.stringify(val));
+      this.$set(this.contentData.list, newIndex, {
+        ...val,
+        options: {
+          ...val.options,
+        },
+
+        // 绑定键值
+        model: val.type,
+      });
+    },
+    // 拖动
+    handleContentlAdd(evt) {
+      const { newIndex } = evt;
+
+      this.package(this.contentData.list[newIndex], newIndex);
+      this.handleComponent(this.contentData.list[newIndex], newIndex);
+    },
+    handleMove() {
+      return true;
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/main.vue b/manager/src/views/lili-floor-renovation/wap/main.vue
new file mode 100644
index 00000000..6de75ab8
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/main.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="box">
+    <!-- 顶部栏 -->
+    <navbar @selected="selected" />
+
+    <component :is="layout[name]"></component>
+  </div>
+</template>
+<script>
+import layout from "./index";
+import navbar from "./navbar";
+export default {
+  components: {
+    navbar,
+  },
+  data() {
+    return {
+      layout,
+      name: "index",
+    };
+  },
+  mounted() {
+
+  },
+  methods: {
+    selected(val) {
+      this.name = val;
+    },
+
+
+  },
+};
+</script>
+<style scoped lang="scss">
+.box {
+  height: calc(100vh - 120px);
+  width: 98%;
+  margin: 0 auto;
+  padding: 0 20px;
+  background: #fff;
+  border-radius: 0.4em;
+  overflow: hidden;
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue
new file mode 100644
index 00000000..0293dd38
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -0,0 +1,231 @@
+<template>
+  <!-- 预览保存 -->
+  <div class="model-title">
+    <div>店铺装修</div>
+    <div class="btns">
+      <Button
+        @click="clickBtn(item)"
+        size="small"
+        v-for="(item, index) in way"
+        :key="index"
+        :type="item.selected ? 'primary' : ''"
+      >
+        {{ item.title }}
+      </Button>
+    </div>
+    <div class="model-title-view-btn">
+      <Poptip placement="bottom" width="100">
+        <Button size="default" @click="creatQrCode">预览模板</Button>
+        <div slot="content" class="default-view-content">
+          <div>临时预览</div>
+          <div ref="qrCodeUrl"></div>
+        </div>
+      </Poptip>
+      <Button size="default" type="primary" @click="handleSpinShow"
+        >保存模板</Button
+      >
+
+      <Modal
+        title="保存中"
+        v-model="saveDialog"
+        :closable="true"
+        :mask-closable="false"
+        :footer-hide="true"
+      >
+        <div v-if="progress">
+          <div class="model-item">
+            模板名称 <Input style="width: 200px" v-model="submitWay.name" />
+          </div>
+          <div class="model-item">
+            是否立即发布
+            <i-switch v-model="submitWay.pageShow">
+              <span slot="open">开</span>
+              <span slot="close">关</span>
+            </i-switch>
+          </div>
+
+          <Button type="primary" @click="save()">保存</Button>
+        </div>
+        <Progress v-else :percent="num" status="active" />
+      </Modal>
+    </div>
+  </div>
+</template>
+<script>
+import * as API_Other from "@/api/other.js";
+
+import QRCode from "qrcodejs2";
+export default {
+  data() {
+    return {
+      progress: true,
+      num: 20,
+      saveDialog: false,
+      way: [
+        {
+          title: "首页",
+          name: "index",
+          selected: true,
+        },
+        {
+          title: "悬浮按钮",
+          name: "btn",
+          selected: false,
+        },
+        {
+          title: "全屏广告",
+          name: "advertising",
+          selected: false,
+        },
+        {
+          title: "弹窗广告",
+          name: "alertAdvertising",
+          selected: false,
+        },
+      ],
+      qrcode: "",
+      submitWay: {
+        pageShow: this.$route.query.type || false,
+        name: this.$route.query.name || "模板名称",
+        pageClientType: "H5",
+      },
+    };
+  },
+  watch: {},
+  mounted() {},
+  methods: {
+    clickBtn(val) {
+      this.way.forEach((item, index) => {
+        item.selected = false;
+      });
+      val.selected = true;
+      this.$emit("selected", val.name);
+    },
+
+    /**
+     * 加载，并保存模板
+     */
+    handleSpinShow() {
+      this.saveDialog = true;
+    },
+
+    // 填写是否发布，模板名称之后保存
+    save() {
+      if (this.$store.state.styleStore == void 0) {
+        this.$Message.error("请装修楼层");
+        return false;
+      }
+
+      this.submitWay.pageShow
+        ? (this.submitWay.pageShow = "OPEN")
+        : (this.submitWay.pageShow = "CLOSE");
+
+      this.submitWay.pageData = JSON.stringify(this.$store.state.styleStore);
+      this.submitWay.pageType = "INDEX";
+
+      this.$route.query.id ? this.update() : this.submit(this.submitWay);
+    },
+
+    // 更新
+    update() {
+         this.progress = false;
+      API_Other.updateHome(this.$route.query.id, {
+        pageData: JSON.stringify(this.$store.state.styleStore),
+        name: this.submitWay.name,
+        pageShow: this.submitWay.pageShow,
+      })
+        .then((res) => {
+          this.num = 50;
+          if (res.code == 200) {
+            this.num = 80;
+            /**制作保存成功动画¸ */
+            setTimeout(() => {
+              this.saveDialog = false;
+              this.$Message.success("修改成功");
+              this.goback();
+            }, 1000);
+          } else {
+            this.saveDialog = false;
+            this.$Message.error("修改失败，请稍后重试");
+          }
+          console.log(res);
+        })
+        .catch((error) => {});
+    },
+
+    // 返回查询数据页面
+    goback() {
+      this.$router.push({
+        path: "/wapList",
+      });
+    },
+
+    // 保存
+    submit(submitWay) {
+      this.progress = false;
+      API_Other.setHomeSetup(submitWay)
+        .then((res) => {
+          this.num = 50;
+          if (res.code == 200) {
+            this.num = 80;
+            /**制作保存成功动画¸ */
+            setTimeout(() => {
+              this.saveDialog = false;
+              this.$Message.success("保存成功");
+              this.goback();
+            }, 1000);
+          } else {
+             this.progress = true;
+            this.saveDialog = false;
+            this.$Message.error("保存失败，请稍后重试");
+          }
+          console.log(res);
+        })
+        .catch((error) => {});
+    },
+
+    creatQrCode() {
+      if (this.qrcode) {
+        return false;
+      }
+      // this.qrcode = new QRCode(this.$refs.qrCodeUrl, {
+      //   text: "https://www.baidu.com", // 需要转换为二维码的内容
+      //   width: 100,
+      //   height: 100,
+      //   colorDark: "#000000",
+      //   colorLight: "#ffffff",
+      //   correctLevel: QRCode.CorrectLevel.H,
+      // });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.model-item {
+  width: 100%;
+  padding: 10px 0;
+  display: flex;
+  align-items: center;
+  > * {
+    margin: 0 8px;
+  }
+}
+.model-title {
+  height: 70px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #333;
+  font-size: 14px;
+  > .model-title-view-btn {
+    > * {
+      margin: 0 10px;
+    }
+  }
+}
+.btns {
+  * {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/style.scss b/manager/src/views/lili-floor-renovation/wap/style.scss
new file mode 100644
index 00000000..aa3f6cb8
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/style.scss
@@ -0,0 +1,101 @@
+
+.model-view {
+    display: flex;
+    .model-view-menu {
+        flex: 1.5;
+
+        > .model-view-menu-item {
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+        }
+    }
+    .model-config{
+        flex: 2.5;
+    }
+    .model-view-content {
+        flex: 6;
+    }
+    .model-item {
+        line-height: 1.75;
+        font-size: 13px;
+        margin: 0 5px 10px 5px;
+        border: 1px solid #ededed;
+        background: #f6f6f9;
+        width: 70px;
+        height: 70px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+    }
+}
+.model-view-content{
+
+    background: #f6f6f9;
+    border-radius: .8em;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    flex-direction: column;
+}
+.wap-title{
+    line-height: 44px;
+    text-align: center;
+    height: 44px;
+    border-bottom: 1px solid #ededed;
+}
+.content{
+    margin: 20px 0;
+    padding: 50px 13px;
+    width: 360px;
+    background: url('../../../assets/iPhoneX_model.png') no-repeat;
+    height: 780px;
+    background-size: 360px;
+    overflow: hidden;
+    >.component,.draggable{
+        height: 590px;
+        overflow-y: auto;
+        background: #ebebeb;
+    }
+    >.draggable{
+
+        padding-bottom: 100px;
+    }
+}
+.list{
+    position: relative;
+}
+.close{
+    position: absolute;
+    right: 5px;
+    top: 10px;
+    z-index: 99;
+}
+
+
+.model-btn{
+    >*{
+      margin: 0 4px;
+    }
+  }
+  .qrCode {
+    width: 100px;
+    height: 100px;
+  }
+  .default-view-content {
+    text-align: center;
+    font-weight: bold;
+    line-height: 2;
+    /deep/ img {
+      margin: 0 auto;
+    }
+  }
+  .model-config {
+    overflow-y: auto;
+  }
+
+  .active {
+    box-sizing: border-box;
+    border: 1px solid $theme_color;
+  }
diff --git a/manager/src/views/lili-floor-renovation/wap/template/advertising.scss b/manager/src/views/lili-floor-renovation/wap/template/advertising.scss
new file mode 100644
index 00000000..be5228c9
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/advertising.scss
@@ -0,0 +1,57 @@
+.position-box{
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+.join-box {
+    display: flex;
+  }
+  .item-price {
+    > span {
+      font-size: 15px;
+      font-weight: 500;
+      color: #e1212b;
+    }
+  }
+  .join-item {
+    flex: 1;
+  }
+  .item-img {
+    width: 75px;
+    height: 75px;
+    margin: 0 auto;
+    display: block;
+  }
+  .item-img-box {
+    position: relative;
+  }
+  .item-line-through {
+    > span {
+      font-size: 10px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #999;
+    }
+  }
+  .item-position-tips {
+    position: absolute;
+    right: 0;
+    color: #fff;
+    font-size: 12px;
+    bottom: 0;
+  }
+  .join-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #fff;
+    height: 50px;
+    > div:nth-of-type(1) {
+      font-size: 16px;
+      font-weight: bold;
+    }
+    > div:nth-of-type(2) {
+      font-size: 12px;
+      color: #999;
+    }
+  }
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/index.js b/manager/src/views/lili-floor-renovation/wap/template/index.js
new file mode 100644
index 00000000..5f4bca34
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/index.js
@@ -0,0 +1,44 @@
+import tpl_banner from "./tpl_banner";
+import tpl_title from "./tpl_title";
+import tpl_left_one_right_two from "./tpl_left_one_right_two";
+import tpl_left_two_right_one from "./tpl_left_two_right_one";
+import tpl_top_one_bottom_two from "./tpl_top_one_bottom_two";
+import tpl_top_two_bottom_one from "./tpl_top_two_bottom_one";
+import tpl_flex_one from "./tpl_flex_one";
+import tpl_flex_two from "./tpl_flex_two";
+import tpl_flex_three from "./tpl_flex_three";
+import tpl_flex_five from "./tpl_flex_five";
+import tpl_flex_four from "./tpl_flex_four";
+import tpl_text_picture from "./tpl_text_picture";
+import tpl_menu from "./tpl_menu";
+import tpl_search from "./tpl_search";
+import tpl_join_group from "./tpl_join_group";
+import tpl_integral from "./tpl_integral";
+import tpl_spike from "./tpl_spike";
+import tpl_group from "./tpl_group";
+import tpl_ad_list from "./tpl_view_list";
+import tpl_activity_list from './tpl_view_list'
+import tpl_goods from "./tpl_goods";
+export default {
+  carousel: tpl_banner,
+  title: tpl_title,
+  leftOneRightTwo: tpl_left_one_right_two,
+  leftTwoRightOne: tpl_left_two_right_one,
+  topOneBottomTwo:tpl_top_one_bottom_two,
+  topTwoBottomOne:tpl_top_two_bottom_one,
+  flexThree: tpl_flex_three,
+  flexFive: tpl_flex_five,
+  flexFour: tpl_flex_four,
+  flexTwo: tpl_flex_two,
+  textPicture: tpl_text_picture,
+  menu: tpl_menu,
+  search: tpl_search,
+  joinGroup: tpl_join_group,
+  flexOne: tpl_flex_one,
+  goods: tpl_goods,
+  integral:tpl_integral,
+  spike:tpl_spike,
+  group:tpl_group,
+  tpl_ad_list,
+  tpl_activity_list
+};
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl.scss b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
new file mode 100644
index 00000000..b8e63cf7
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
@@ -0,0 +1,31 @@
+.image-mode {
+    max-width: 100%;
+    height: auto;
+    display: block;
+    padding: 1px;
+}
+.layout {
+    padding: 8px;
+    margin: 4px 0;
+    background: #fff;
+}
+.layout,
+.view-height-75,
+.view-height-150 {
+    overflow: hidden;
+}
+.view-width-100{
+    width: 100%;
+}
+.view-height-75 {
+    height: 75px;
+}
+.view-height-150 {
+    height: 150px;
+    flex: 1;
+}
+
+.view-height-85 {
+    height: 85px;
+    flex: 1;
+}
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue
new file mode 100644
index 00000000..25cbc218
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_banner.vue
@@ -0,0 +1,35 @@
+<template>
+  <div class="layout">
+    <Carousel class="carousel" v-if="res"  autoplay autoplay-speed="5000">
+      <CarouselItem v-for="(item, index) in res.list" :key="index">
+        <div>
+          <img class="image-mode" :src="item.img" />
+        </div>
+      </CarouselItem>
+    </Carousel>
+  </div>
+</template>
+<script>
+export default {
+  title: "导航栏",
+  props: ["res"],
+  watch: {
+    res: {
+      handler(newValue, oldValue) {
+          this.$set(this,'res',newValue);
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.carousel,
+.image-mode {
+  height: 150px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
new file mode 100644
index 00000000..8abfba18
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
@@ -0,0 +1,33 @@
+
+<template>
+  <div class="layout">
+      <img class="image-mode" :src="res.list[0].img" alt="">
+      <img class="image-mode" :src="res.list[1].img" alt="">
+      <img class="image-mode" :src="res.list[2].img" alt="">
+      <img class="image-mode" :src="res.list[3].img" alt="">
+      <img class="image-mode" :src="res.list[4].img" alt="">
+  </div>
+</template>
+
+<script>
+export default {
+  title: "五列单行图片模块",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+ 
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+}
+img{
+  width: 67px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
new file mode 100644
index 00000000..4ef37368
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
@@ -0,0 +1,32 @@
+
+<template>
+  <div class="layout">
+      <img class="image-mode" :src="res.list[0].img" alt="">
+      <img class="image-mode" :src="res.list[1].img" alt="">
+      <img class="image-mode" :src="res.list[2].img" alt="">
+      <img class="image-mode" :src="res.list[3].img" alt="">
+  </div>
+</template>
+
+<script>
+export default {
+  title: "四列单行图片模块",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  height: 84px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+}
+img{
+  width: 84px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_one.vue
new file mode 100644
index 00000000..87a23274
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_one.vue
@@ -0,0 +1,25 @@
+<template>
+    <div class="layout">
+        <div class="flex-one">
+            <img :src="res.list[0].img" alt="">
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: ['res']
+}
+</script>
+<style lang="scss" scoped>
+@import './tpl.scss';
+.flex-one{
+    width: 100%;
+    display: block;
+    height: 110px;
+    overflow: hidden;
+    >img{
+        width: 100%;
+        height: 100%;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
new file mode 100644
index 00000000..262313ce
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
@@ -0,0 +1,31 @@
+
+<template>
+  <div class="layout">
+      <img class="image-mode" :src="res.list[0].img" alt="">
+      <img class="image-mode" :src="res.list[1].img" alt="">
+      <img class="image-mode" :src="res.list[2].img" alt="">
+  </div>
+</template>
+
+<script>
+export default {
+  title: "三列单行图片模块",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  height: 110px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+}
+img{
+   width: 111px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
new file mode 100644
index 00000000..dd9266b8
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_two.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="layout">
+    <div class="flex-two">
+      <div class="flex-item">
+        <img :src="res.list[0].img" alt />
+      </div>
+      <div class="flex-item">
+        <img :src="res.list[1].img" alt />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  title: "两张横图",
+  props: ["res"],
+  mounted () {
+
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.flex-two {
+  width: 100%;
+  display: flex;
+  height: 110px;
+  overflow: hidden;
+
+}
+.flex-item {
+    width: 50%;
+  > img {
+    display: block;
+     max-width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue
new file mode 100644
index 00000000..8ea36520
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="layout">
+    <div class="goods-cell-title">
+      <div
+        class="goods-item-title"
+        :class="{ selected: selected.index == index }"
+        @click="handleClickTitle(title, index)"
+        v-for="(title, index) in res.list[0].titleWay"
+        :key="index"
+      >
+        <h4>{{ title.title }}</h4>
+        <div>{{ title.desc }}</div>
+      </div>
+    </div>
+    <div class="goods-list">
+      <div
+        v-if="selected.val == item.type"
+        class="goods-item"
+        v-for="(item, item_index) in res.list[0].listWay"
+        :key="item_index"
+      >
+        <div class="goods-img">
+          <Icon
+            size="20"
+            color="#e1251b"
+            @click="closeGoods(item, item_index)"
+            class="goods-icon"
+            type="ios-close-circle"
+          />
+          <img :src="item.img" alt />
+        </div>
+        <div class="goods-desc">
+          <div class="goods-title">
+            {{ item.title }}
+          </div>
+          <div class="goods-bottom">
+            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      selected: {
+        index: 0,
+        val: "精选",
+      },
+    };
+  },
+  props: ["res"],
+  mounted() {},
+  methods: {
+    closeGoods(val, index) {
+      this.res.list[0].listWay.splice(index,1)
+    },
+    handleClickTitle(val, index) {
+      this.selected.index = index;
+      this.selected.val = val.title;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.layout {
+  padding: 8px 0;
+  background: #e8e8e8;
+}
+.selected {
+  > h4 {
+    color: #000 !important;
+  }
+  > div {
+    font-weight: bold;
+    color: #e4393c !important;
+  }
+}
+.goods-cell-title {
+  padding: 10px;
+  transition: 0.35s;
+  display: flex;
+  cursor: pointer;
+  > .goods-item-title {
+    flex: 1;
+    text-align: center;
+    > h4 {
+      font-size: 16px;
+      color: #666;
+    }
+    > div {
+      color: #999;
+      font-size: 12px;
+    }
+  }
+}
+.goods-list {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+}
+.goods-item {
+  width: 50%;
+  margin-bottom: 10px;
+  border-radius: 0.4em;
+  overflow: hidden;
+}
+.goods-img {
+  position: relative;
+  margin: 0 auto;
+  width: 158px;
+  height: 150px;
+  border-top-left-radius: 0.4em;
+  border-top-right-radius: 0.4em;
+  overflow: hidden;
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.goods-desc {
+  border-bottom-left-radius: 0.4em;
+  border-bottom-right-radius: 0.4em;
+  width: 158px;
+  background: #fff;
+  padding: 4px;
+  margin: 0 auto;
+  > .goods-title {
+    font-size: 12px;
+    height: 38px;
+    display: -webkit-box;
+    font-weight: 500;
+    -webkit-box-orient: vertical;
+
+    -webkit-line-clamp: 2;
+
+    overflow: hidden;
+  }
+  > .goods-bottom {
+    display: flex;
+    > .goods-price {
+      line-height: 2;
+      color: #e4393c;
+    }
+  }
+}
+.goods-icon {
+  right: 5px;
+  top: 5px;
+  position: absolute;
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue
new file mode 100644
index 00000000..d927369e
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_group.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="layout">
+    <div class="join-list">
+      <div class="join-title">
+        <div>{{ res.list[0].title }}</div>
+
+        <div>更多</div>
+      </div>
+      <div class="join-box">
+        <div class="join-item" v-for="item in 4" :key="item">
+          <div class="item-img-box">
+           
+            <img
+              class="item-img"
+              src="https://picsum.photos/id/268/200/200"
+              alt
+            />
+          </div>
+          <div class="item-price">
+            <span>￥120.00</span>
+          </div>
+          <div class="item-line-through">
+            <span>￥190.00</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+@import './advertising.scss';
+
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue
new file mode 100644
index 00000000..f8833d81
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_integral.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="layout">
+    <div class="join-list">
+      <div class="join-title">
+        <div>{{ res.list[0].title }}</div>
+
+        <div>更多</div>
+      </div>
+      <div class="join-box">
+        <div class="join-item" v-for="item in 4" :key="item">
+          <div class="item-img-box">
+            <img
+              class="item-img"
+              src="https://picsum.photos/id/268/200/200"
+              alt
+            />
+           
+          </div>
+          <div class="item-price">
+            <span>20积分</span>
+          </div>
+          <div class="item-line-through">
+            <span>30积分</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.join-box {
+  display: flex;
+}
+.item-price {
+  > span {
+    font-size: 15px;
+    font-weight: 500;
+    color: #e1212b;
+  }
+}
+.join-item {
+  flex: 1;
+}
+.item-img {
+  width: 75px;
+  height: 75px;
+  margin: 0 auto;
+  display: block;
+}
+.item-img-box {
+  position: relative;
+}
+.item-line-through {
+  > span {
+    font-size: 10px;
+    font-weight: 400;
+    text-decoration: line-through;
+    color: #999;
+  }
+}
+.item-position-tips {
+  position: absolute;
+  right: 0;
+  color: #fff;
+  font-size: 12px;
+  bottom: 0;
+}
+.join-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #fff;
+  height: 50px;
+  > div:nth-of-type(1) {
+    font-size: 16px;
+    font-weight: bold;
+  }
+  > div:nth-of-type(2) {
+    font-size: 12px;
+    color: #999;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue
new file mode 100644
index 00000000..b9095fc4
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_join_group.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="layout">
+    <div class="join-list">
+      <div class="join-title">
+        <div>{{ res.list[0].title }}</div>
+
+        <div>更多</div>
+      </div>
+      <div class="join-box">
+        <div class="join-item" v-for="item in 4" :key="item">
+          <div class="item-img-box">
+            <img
+              class="item-img"
+              src="https://picsum.photos/id/268/200/200"
+              alt
+            />
+            <div class="item-position-tips">2人团</div>
+          </div>
+          <div class="item-price">
+            <span>￥120.00</span>
+          </div>
+          <div class="item-line-through">
+            <span>￥120.00</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.join-box {
+  display: flex;
+}
+.item-price {
+  > span {
+    font-size: 15px;
+    font-weight: 500;
+    color: #e1212b;
+  }
+}
+.join-item {
+  flex: 1;
+}
+.item-img {
+  width: 75px;
+  height: 75px;
+  margin: 0 auto;
+  display: block;
+}
+.item-img-box {
+  position: relative;
+}
+.item-line-through {
+  > span {
+    font-size: 10px;
+    font-weight: 400;
+    text-decoration: line-through;
+    color: #999;
+  }
+}
+.item-position-tips {
+  position: absolute;
+  right: 0;
+  color: #fff;
+  font-size: 12px;
+  bottom: 0;
+}
+.join-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #fff;
+  height: 50px;
+  > div:nth-of-type(1) {
+    font-size: 16px;
+    font-weight: bold;
+  }
+  > div:nth-of-type(2) {
+    font-size: 12px;
+    color: #999;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
new file mode 100644
index 00000000..378b07a3
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
@@ -0,0 +1,37 @@
+
+<template>
+  <div class="layout">
+    <div class="view-height-150">
+      <img class="image-mode" :src="res.list[0].img" />
+    </div>
+    <div class="view-height-150">
+      <div class="view-height-75">
+        <img class="image-mode" :src="res.list[1].img" alt />
+      </div>
+      <div class="view-height-75">
+        <img class="image-mode" :src="res.list[2].img" alt />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "左一右二",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background-size: cover;
+}
+
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
new file mode 100644
index 00000000..884c01a3
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
@@ -0,0 +1,38 @@
+
+<template>
+  <div class="layout ">
+    <div class="view-height-150">
+      <div class="view-height-75">
+        <img class="image-mode" :src="res.list[0].img" alt />
+      </div>
+      <div class="view-height-75">
+        <img class="image-mode" :src="res.list[1].img" alt />
+      </div>
+    </div>
+    <div class="view-height-150">
+      <img class="image-mode" :src="res.list[2].img" />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "左二右一",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  height: 167px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background-size: cover;
+}
+
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue
new file mode 100644
index 00000000..9b959c69
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue
@@ -0,0 +1,38 @@
+<template>
+    <div class="layout">
+        <div class="menu-list">
+            <div class="menu-item" v-for="(item,index) in res.list" :key="index">
+                <div>
+                    <img class="menu-img" :src="item.img" alt="">
+                </div>
+                <div class="menu-title">{{item.title}}</div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props:['res']
+}
+</script>
+<style lang="scss" scoped>
+   @import "./tpl.scss";
+   .menu-list{
+       display: flex;
+       align-items: center;
+       flex-wrap: wrap;
+      
+       >.menu-item{
+           text-align: center;
+           width: 63px;
+           margin:10px 0;
+       }
+   }
+   .menu-img{
+       width: 44px;
+       height: 44px;
+   }
+   .menu-title{
+       font-size: 12px;
+   }
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_search.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_search.vue
new file mode 100644
index 00000000..f190bf6a
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_search.vue
@@ -0,0 +1,26 @@
+<template>
+    <div class="layout">
+        <div class="search">
+            <Icon type="ios-search" />{{res.list[0].title}}
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: ['res']
+}
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.search{
+    height: 32px;
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #ededed;
+}
+.layout{
+    background: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue
new file mode 100644
index 00000000..d927369e
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_spike.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="layout">
+    <div class="join-list">
+      <div class="join-title">
+        <div>{{ res.list[0].title }}</div>
+
+        <div>更多</div>
+      </div>
+      <div class="join-box">
+        <div class="join-item" v-for="item in 4" :key="item">
+          <div class="item-img-box">
+           
+            <img
+              class="item-img"
+              src="https://picsum.photos/id/268/200/200"
+              alt
+            />
+          </div>
+          <div class="item-price">
+            <span>￥120.00</span>
+          </div>
+          <div class="item-line-through">
+            <span>￥190.00</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+@import './advertising.scss';
+
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue
new file mode 100644
index 00000000..d4970d37
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_text_picture.vue
@@ -0,0 +1,94 @@
+
+<template>
+  <div class="layout">
+    <div class="view-list">
+      <div class="view-item">
+        <div class="-item-tilte">{{res.list[0].title}}</div>
+        <div class="-item-image">
+          <img :src="res.list[0].img" alt />
+        </div>
+      </div>
+      <div class="view-item">
+        <div class="-item-tilte">{{res.list[1].title}}</div>
+        <div class="-item-image">
+          <img :src="res.list[1].img" alt />
+        </div>
+      </div>
+    </div>
+    <div class="view-list">
+      <div class="view-item">
+        <div class="-item-tilte">{{res.list[2].title}}</div>
+        <div class="-item-image">
+          <img :src="res.list[2].img" alt />
+        </div>
+      </div>
+      <div class="view-item">
+        <div class="-item-tilte">{{res.list[3].title}}</div>
+        <div class="-item-image">
+          <img :src="res.list[3].img" alt />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "文字图片模板",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  display: flex;
+  background: #e8e8e8;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+  padding: 0;
+}
+.-item-image{
+
+     padding: 10px ;
+     >img{
+
+         width: 100%;
+     }
+}
+.-item-tilte {
+  background: #ff9f28;
+  height: 30px;
+  color: #fff;
+  font-size: 14px;
+  text-align: center;
+  line-height: 30px;
+}
+
+.view-list {
+  width: 48%;
+  margin: 0 auto;
+  display: flex;
+  background: #fff;
+   border-top-left-radius: 0.8em;
+    border-top-right-radius: 0.8em;
+    border: 1px solid #ededed;
+
+  > .view-item {
+    width: 50%;
+  }
+  > .view-item:nth-of-type(1) {
+    > .-item-tilte {
+      border-top-left-radius: 0.8em;
+    }
+  }
+  > .view-item:nth-of-type(2) {
+    > .-item-tilte {
+      border-top-right-radius: 0.8em;
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue
new file mode 100644
index 00000000..c835fbdc
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_title.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="layout">
+    <div class="background">
+      <div class="title" :style="{ color: res.list[0].color }">
+        {{ res.list[0].title }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "标题栏",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.background {
+  background: url("../../../../assets/title.png") no-repeat;
+  position: absolute;
+  z-index: 2;
+  width: 100%;
+
+  height: 42px;
+  background-size: cover;
+}
+.layout {
+  text-align: center;
+  position: relative;
+  height: 42px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background: #ffffff;
+}
+.title {
+  line-height: 42px;
+  font-size: 15px;
+  font-weight: bold;
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue
new file mode 100644
index 00000000..e6841ddd
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_one_bottom_two.vue
@@ -0,0 +1,50 @@
+
+<template>
+  <div class="layout">
+    <div class="view-width-100">
+      <img class="image-mode" :src="res.list[0].img" />
+    </div>
+    <div class="view-width-100">
+      <div class="view-height-85">
+        <img class="image-mode" :src="res.list[1].img" alt />
+      </div>
+      <div class="view-height-85">
+        <img class="image-mode" :src="res.list[2].img" alt />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "上一下二",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+  height: 170px;
+  flex-direction: column;
+}
+img {
+  width: 100% !important;
+  height: 85px !important;
+}
+.view-width-100 {
+  padding: 1px 0;
+  display: flex;
+  height: 85px;
+}
+.view-height-85 {
+  padding: 0 1px;
+  width: 50%;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue
new file mode 100644
index 00000000..796016a1
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_top_two_bottom_one.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="layout">
+    <div class="view-width-100">
+      <div class="view-height-85">
+        <img class="image-mode" :src="res.list[0].img" alt />
+      </div>
+      <div class="view-height-85">
+        <img class="image-mode" :src="res.list[1].img" alt />
+      </div>
+    </div>
+    <div class="view-width-100">
+      <img class="image-mode" :src="res.list[2].img" />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: "上二下一",
+  props: ["res"],
+  mounted() {
+    console.log(this.res);
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.layout {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-size: cover;
+  height: 170px;
+  flex-direction: column;
+}
+img {
+  width: 100% !important;
+  height: 85px !important;
+}
+.view-width-100 {
+  padding: 1px 0;
+  display: flex;
+  height: 85px;
+  width: 100%;
+}
+.view-height-85 {
+  padding: 0 1px;
+  width: 50%;
+}
+</style>
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue
new file mode 100644
index 00000000..cc529839
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_view_list.vue
@@ -0,0 +1,16 @@
+<template>
+    <div class="layout">请选择风格</div>
+</template>
+<script>
+export default {
+    destroyed(){
+       
+    }
+}
+</script>
+<style scoped lang="scss">
+@import './tpl.scss';
+.layout{
+    height: 100px;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/wapList.vue b/manager/src/views/lili-floor-renovation/wap/wapList.vue
new file mode 100644
index 00000000..3c2f5422
--- /dev/null
+++ b/manager/src/views/lili-floor-renovation/wap/wapList.vue
@@ -0,0 +1,223 @@
+<template>
+  <div class="wrapper">
+    <Card class="category">
+      <div :class="{active:i == selectedIndex}" class="category-item" v-for="(typeItem,i) in pageTypes" :key="typeItem.type">
+        <div @click="clickType(typeItem.type,i)">{{typeItem.title}}</div>
+      </div>
+    </Card>
+    <Card class="content">
+      <Button type="primary" @click="handleAdd()">添加页面</Button>
+      <div class="list">
+        <Spin size="large" fix v-if="loading"></Spin>
+        <div class="item item-title" >
+          <div>页面名称</div>
+          <div class="item-config">
+            <div>状态</div>
+            <div>操作</div>
+          </div>
+        </div>
+
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div>{{ item.name || "暂无模板昵称" }}</div>
+          <div class="item-config">
+            <i-switch v-model="item.pageShow" @on-change="changeSwitch(item)">
+              <span slot="open">开</span>
+              <span slot="close">关</span>
+            </i-switch>
+            <Button type="info" placement="right" @click="handleEdit(item)" size="small">修改</Button>
+            <Poptip confirm title="删除此模板？" @on-ok="handleDel(item)" @on-cancel="cancel">
+              <Button type="error" size="small">删除</Button>
+            </Poptip>
+          </div>
+        </div>
+        <div class="no-more" v-if="list.length ==0">暂无更多模板</div>
+      </div>
+      <Page :total="total" size="small" @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" />
+
+    </Card>
+
+  </div>
+
+</template>
+<script>
+import * as API_Other from "@/api/other.js";
+// import region from '@/views/lili-components/multiple-region'
+// import marketing from '@/views/lili-dialog/template/marketing'
+// import Region from '@/views/lili-components/multiple-region'
+export default {
+  // components: {region},
+  data() {
+    return {
+      selectedIndex: 0,
+      columns: [
+        {
+          title: "页面名称",
+          key: "name",
+        },
+        {
+          title: "状态",
+        },
+        {
+          title: "操作",
+          key: "action",
+        },
+      ],
+
+      loading: false,
+      pageTypes: [
+        {
+          type: "INDEX",
+          title: "首页",
+        },
+        {
+          type: "SPECIAL",
+          title: "专题",
+        },
+      ],
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        sort: "",
+        order: "asc",
+        pageType: "INDEX",
+        pageClientType: "H5",
+      },
+      total: "",
+      list: [],
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        // this.pageNumber++;
+        this.init();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    clickType(val,index) {
+      this.params.pageNumber = 1
+      this.selectedIndex = index
+      this.params.pageType = val;
+    },
+    changeSwitch(item) {
+      this.loading = true;
+      API_Other.releasePageHome(item.id).then((res) => {
+        if (res.result) {
+          this.loading = false;
+          this.$Message.success("发布成功");
+          this.init();
+        }
+
+        this.init();
+
+        this.loading = false;
+      });
+    },
+    init() {
+      this.loading = true;
+      API_Other.getHomeList(this.params).then((res) => {
+        if (!res.result) return false;
+        this.loading = false;
+        res.result.records.forEach((item) => {
+          if (item.pageShow == "OPEN") {
+            item.pageShow = true;
+          } else {
+            item.pageShow = false;
+          }
+        });
+        this.list = res.result.records;
+        console.log(this.list);
+        this.total = res.result.total;
+      });
+    },
+
+    handleEdit(val) {
+      this.$router.push({
+        path: "/floorList/main",
+        query: { id: val.id, name: val.name, type: val.pageShow },
+      });
+    },
+
+    handleAdd() {
+      this.$router.push({
+        path: "/floorList/main",
+      });
+    },
+
+    handleDel(val) {
+      this.loading = true;
+      API_Other.removePageHome(val.id).then((res) => {
+        if (res.result) {
+          this.loading = false;
+          this.init();
+          this.$Message.success("删除成功");
+        }
+
+        this.loading = false;
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.category-item {
+  cursor: pointer;
+  padding: 4px;
+}
+.active {
+  background: #ededed;
+}
+.item-title {
+  background: #f5f7fa;
+  height: 54px;
+}
+.no-more {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.wrapper {
+  background: #fff;
+  padding: 20px;
+  display: flex;
+}
+.category {
+  flex: 2;
+}
+.content {
+  flex: 8;
+}
+* {
+  margin: 5px;
+}
+.list {
+  min-height: 600px;
+  position: relative;
+}
+.item:nth-of-type(2) {
+  margin: 0 5px;
+}
+.item {
+  width: 100% !important;
+  padding: 0 4px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  > .item-config {
+    width: 180px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+  }
+}
+.item:nth-of-type(3n) {
+  background: #f5f7fa;
+}
+</style>
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
new file mode 100644
index 00000000..265bde3c
--- /dev/null
+++ b/manager/src/views/login.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="login">
+    <Row @keydown.enter.native="submitLogin" class="flex">
+      <Col style="width: 368px">
+      <Header />
+      <Row style="flex-direction: column;">
+
+        <Form ref="usernameLoginForm" :model="form" :rules="rules" class="form">
+          <FormItem prop="username">
+            <Input v-model="form.username" prefix="ios-contact" size="large" clearable placeholder="请输入用户名" autocomplete="off" />
+          </FormItem>
+          <FormItem prop="password">
+            <Input type="password" v-model="form.password" prefix="ios-lock" size="large" password placeholder="请输入密码" autocomplete="off" />
+          </FormItem>
+        </Form>
+
+        <Row>
+          <Button class="login-btn" type="primary" size="large" :loading="loading" @click="submitLogin" long>
+            <span v-if="!loading">{{ $t("login") }}</span>
+            <span v-else>{{ $t("logining") }}</span>
+          </Button>
+        </Row>
+
+      </Row>
+      <div v-if="socialLogining">
+        <RectLoading />
+      </div>
+      <Footer />
+      </Col>
+      <LangSwitch />
+    </Row>
+  </div>
+</template>
+
+<script>
+import { login, userInfo } from "@/api/index";
+import Cookies from "js-cookie";
+import Header from "@/views/main-components/header";
+import Footer from "@/views/main-components/footer";
+import LangSwitch from "@/views/main-components/lang-switch";
+import RectLoading from "@/views/my-components/lili/rect-loading";
+import CountDownButton from "@/views/my-components/lili/count-down-button";
+import util from "@/libs/util.js";
+
+export default {
+  components: {
+    CountDownButton,
+    RectLoading,
+    LangSwitch,
+    Header,
+    Footer,
+  },
+  data() {
+    return {
+      error: false,
+      loading: false,
+      sending: false,
+      form: {
+        username: "",
+        password: "",
+        mobile: "",
+        code: "",
+      },
+      rules: {
+        username: [
+          {
+            required: true,
+            message: "账号不能为空",
+            trigger: "blur",
+          },
+        ],
+        password: [
+          {
+            required: true,
+            message: "密码不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    mounted() {},
+    afterLogin(res) {
+      let accessToken = res.result.accessToken;
+      let refreshToken = res.result.refreshToken;
+      this.setStore("accessToken", accessToken);
+      this.setStore("refreshToken", refreshToken);
+      // 获取用户信息
+      userInfo().then((res) => {
+        if (res.success) {
+          // 加载菜单
+          this.setStore("userInfo", res.result);
+          Cookies.set("userInfo", JSON.stringify(res.result));
+          this.$store.commit("setAvatarPath", res.result.avatar);
+          util.initRouter(this);
+          this.$router.push({
+            name: "home_index",
+          });
+        } else {
+          this.loading = false;
+        }
+      });
+    },
+    submitLogin() {
+      this.$refs.usernameLoginForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          login({
+            username: this.form.username,
+            password: this.md5(this.form.password),
+          }).then((res) => {
+            if (res && res.success) {
+              this.afterLogin(res);
+            } else {
+              this.loading = false;
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.login {
+  height: 100%;
+  background: url("../assets/background.png") no-repeat;
+  background-color: #f0f2f5;
+  display: flex;
+  background-size: cover;
+  align-items: center;
+  justify-content: center;
+
+  .ivu-tabs-nav-container {
+    line-height: 2;
+    font-size: 17px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    overflow: hidden;
+    position: relative;
+    zoom: 1;
+  }
+
+  .form {
+    padding-top: 1vh;
+
+    .input-verify {
+      width: 67%;
+    }
+  }
+
+  .forget-pass,
+  .other-way {
+    font-size: 14px;
+  }
+
+  .login-btn,
+  .other-login {
+    margin-top: 3vh;
+  }
+
+  .icons {
+    display: flex;
+    align-items: center;
+  }
+
+  .other-icon {
+    cursor: pointer;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+    color: rgba(0, 0, 0, 0.2);
+
+    :hover {
+      color: #2d8cf0;
+    }
+  }
+}
+.flex {
+  justify-content: center;
+}
+
+</style>
diff --git a/manager/src/views/logistics/index.vue b/manager/src/views/logistics/index.vue
new file mode 100644
index 00000000..e2033c34
--- /dev/null
+++ b/manager/src/views/logistics/index.vue
@@ -0,0 +1,364 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch"></Row>
+          <Row class="operation padding-row">
+            <Button @click="add" type="primary">添加</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+              <!-- 页面展示 -->
+              <template slot="disableSlot" slot-scope="scope">
+                <i-switch size="large" v-model="scope.row.disabled == 'OPEN'?true:false" @on-change="changeSwitch(scope.row)">
+                  <span slot="open">展示</span>
+                  <span slot="close">隐藏</span>
+                </i-switch>
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="120" :rules="formValidate">
+        <FormItem label="物流公司名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="物流公司代码" prop="code">
+          <Input v-model="form.code" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="支持电子面单">
+          <i-switch v-model="form.standBy" size="large">
+            <span slot="open">开</span>
+            <span slot="close">关</span>
+          </i-switch>
+        </FormItem>
+        <FormItem label="电子面单表单">
+          <Input v-model="form.formItems" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="禁用状态" prop="disabled">
+          <i-switch v-model="form.disabled" size="large">
+            <span slot="open">开启</span>
+            <span slot="close">禁用</span>
+          </i-switch>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getLogisticsPage,
+    updateLogistics,
+    getLogisticsDetail,
+    addLogistics,
+    delLogistics,
+  } from "@/api/logistics";
+
+  export default {
+    name: "bill",
+    components: {},
+    data() {
+      return {
+        openSearch: true, // 显示搜索
+        openTip: true, // 显示提示
+        loading: true, // 表单加载状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        drop: false,
+        dropDownContent: "展开",
+        dropDownIcon: "ios-arrow-down",
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          name: "",
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          name: "",
+        },
+        // 表单验证规则
+        formValidate: {
+          name: [
+            {
+              required: true,
+              message: "请输入物流公司名称",
+              trigger: "blur",
+            },
+          ],
+        },
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            type: "selection",
+            width: 60,
+            align: "center",
+          },
+          {
+            title: "物流公司名称",
+            key: "name",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "物流公司编码",
+            key: "code",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "状态",
+            key: "disabled",
+            width: 150,
+            slot: "disableSlot",
+            /*render(h, params) {
+              return h("Badge", {
+                props: {
+                  status: params.row.disabled == 'OPEN' ? "success" : "error",
+                  text: params.row.disabled == 'OPEN' ? "开启" : "禁用",
+                },
+              });
+            },*/
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            width: 180,
+            sortable: false,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 150,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.remove(params.row);
+                      },
+                    },
+                  },
+                  "删除"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        // 重新加载数据
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+
+      getDataList() {
+        this.loading = true;
+
+        getLogisticsPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            this.form.disabled = this.form.disabled == true ? "OPEN" : "CLOSE"
+            if (this.modalType == 0) {
+              // 添加 避免编辑后传入id等数据 记得删除
+              delete this.form.id;
+
+              this.form.disabled
+                ? (this.form.disabled = "OPEN")
+                : (this.form.disabled = "CLOSE");
+              addLogistics(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            } else {
+              // 编辑
+              updateLogistics(this.id, this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      add() {
+        this.modalType = 0;
+        this.modalTitle = "添加";
+        this.form = {};
+        this.$refs.form.resetFields();
+
+        this.modalVisible = true;
+      },
+      detail(v) {
+        this.modalType = 1;
+        this.id = v.id;
+        this.modalTitle = "修改";
+        this.modalVisible = true;
+
+        this.form.name = v.name;
+        this.form.code = v.code;
+        this.form.standBy = v.standBy;
+        this.form.formItems = v.formItems;
+        this.form.disabled = v.disabled;
+        this.form.disabled == "OPEN"
+          ? (this.form.disabled = true)
+          : (this.form.disabled = false);
+      },
+      remove(v) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "您确认要删除 " + v.name + " ?",
+          loading: true,
+          onOk: () => {
+            // 删除
+            delLogistics(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/main-components/breadcrumb-nav.vue b/manager/src/views/main-components/breadcrumb-nav.vue
new file mode 100644
index 00000000..bdc5ca19
--- /dev/null
+++ b/manager/src/views/main-components/breadcrumb-nav.vue
@@ -0,0 +1,28 @@
+<template>
+    <Breadcrumb>
+        <BreadcrumbItem 
+            v-for="item in currentPath" 
+            :to="item.path" 
+            :key="item.name"
+        >{{ itemTitle(item) }}</BreadcrumbItem>
+    </Breadcrumb>
+</template>
+
+<script>
+export default {
+    name: 'breadcrumbNav',
+    props: {
+        currentPath: Array
+    },
+    methods: {
+        itemTitle (item) {
+            if (typeof item.title == 'object') {
+                return this.$t(item.title.i18n);
+            } else {
+                return item.title;
+            }
+        }
+    }
+};
+</script>
+
diff --git a/manager/src/views/main-components/footer.vue b/manager/src/views/main-components/footer.vue
new file mode 100644
index 00000000..666ae443
--- /dev/null
+++ b/manager/src/views/main-components/footer.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="foot">
+    <Row type="flex" justify="space-around" class="help">
+      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('help') }}</a>
+      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('privacy') }}</a>
+      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('terms') }}</a>
+    </Row>
+    <Row type="flex" justify="center" class="copyright">
+      Copyright © 2020 - Present
+      <a
+        href="http://lili.cn"
+        target="_blank"
+        style="margin:0 5px;"
+      >lili-shop</a> {{ $t('rights') }}
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "footer"
+};
+</script>
+
+<style lang="scss" scoped>
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/main-components/fullscreen.vue b/manager/src/views/main-components/fullscreen.vue
new file mode 100644
index 00000000..63c3a1dd
--- /dev/null
+++ b/manager/src/views/main-components/fullscreen.vue
@@ -0,0 +1,80 @@
+<template>
+    <div @click="handleChange" v-if="showFullScreenBtn" class="full-screen-btn-con">
+        <Tooltip :content="value ? '退出全屏' : '全屏'" placement="bottom">
+            <Icon :type="value ? 'ios-contract' : 'ios-expand'" :size="24"></Icon>
+        </Tooltip>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "fullScreen",
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    showFullScreenBtn() {
+      return window.navigator.userAgent.indexOf("MSIE") < 0;
+    }
+  },
+  methods: {
+    handleFullscreen() {
+      let main = document.body;
+      if (this.value) {
+        if (document.exitFullscreen) {
+          document.exitFullscreen();
+        } else if (document.mozCancelFullScreen) {
+          document.mozCancelFullScreen();
+        } else if (document.webkitCancelFullScreen) {
+          document.webkitCancelFullScreen();
+        } else if (document.msExitFullscreen) {
+          document.msExitFullscreen();
+        }
+      } else {
+        if (main.requestFullscreen) {
+          main.requestFullscreen();
+        } else if (main.mozRequestFullScreen) {
+          main.mozRequestFullScreen();
+        } else if (main.webkitRequestFullScreen) {
+          main.webkitRequestFullScreen();
+        } else if (main.msRequestFullscreen) {
+          main.msRequestFullscreen();
+        }
+      }
+    },
+    handleChange() {
+      this.handleFullscreen();
+    }
+  },
+  created() {
+    let isFullscreen =
+      document.fullscreenElement ||
+      document.mozFullScreenElement ||
+      document.webkitFullscreenElement ||
+      document.fullScreen ||
+      document.mozFullScreen ||
+      document.webkitIsFullScreen;
+    isFullscreen = !!isFullscreen;
+    document.addEventListener("fullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("mozfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("webkitfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("msfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    this.$emit("input", isFullscreen);
+  }
+};
+</script>
diff --git a/manager/src/views/main-components/header.vue b/manager/src/views/main-components/header.vue
new file mode 100644
index 00000000..dcfef0bd
--- /dev/null
+++ b/manager/src/views/main-components/header.vue
@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <Row class="header">
+      <img src="../../assets/logo.png" class="logo" width="220px">
+      <!-- <div class="description">{{ $t('LILISHOP-ADMIN') }}</div> -->
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "header",
+};
+</script>
+
+<style lang="scss" scoped>
+.header {
+
+  margin-bottom: 6vh;
+  text-align: center;
+  display: flex;
+  justify-content: center !important;
+}
+.logo {
+  transform: scale(2);
+}
+</style>
diff --git a/manager/src/views/main-components/lang-switch.vue b/manager/src/views/main-components/lang-switch.vue
new file mode 100644
index 00000000..edbe5cfa
--- /dev/null
+++ b/manager/src/views/main-components/lang-switch.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="lang-icon">
+    <Dropdown @on-click="langChange">
+      <Icon type="md-globe" size="26"/>
+      <DropdownMenu slot="list">
+        <DropdownItem name="zh-CN">简体中文</DropdownItem>
+        <DropdownItem name="en-US">English</DropdownItem>
+      </DropdownMenu>
+    </Dropdown>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "langSwitch",
+  methods: {
+    langChange(v) {
+      this.$i18n.locale = v;
+      this.$store.commit("switchLang", v);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.lang-icon {
+  position: fixed;
+  top: 2vh;
+  right: 1.5vw;
+  cursor: pointer;
+}
+</style>
diff --git a/manager/src/views/main-components/message-tip.vue b/manager/src/views/main-components/message-tip.vue
new file mode 100644
index 00000000..3b50ba26
--- /dev/null
+++ b/manager/src/views/main-components/message-tip.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="message-con">
+    <Dropdown trigger="click">
+
+      <a href="javascript:void(0)">
+        {{ value > 0 ? "有" + value + "条未读消息" : "无未读消息" }}
+        <Icon v-if="value!=0" type="ios-arrow-down"></Icon>
+      </a>
+      <DropdownMenu v-if="value!=0" slot="list">
+        <DropdownItem v-if="res.balanceCash" @click.native="navigateTo('deposit')">
+          <Badge :count="res.balanceCash">待处理预存款提现申请 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.complain" @click.native="navigateTo('orderComplaint')">
+          <Badge :count="res.complain">待处理投诉审核 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.distributionCash" @click.native="navigateTo('distribution')">
+          <Badge :count="res.distributionCash">待处理分销商提现申请 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.goods" @click.native="navigateTo('applyGoods')">
+          <Badge :count="res.goods">待处理商品审核 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.refund" @click.native="navigateTo('afterSaleOrder')">
+          <Badge :count="res.refund">待处理售后申请 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.store" @click.native="navigateTo('shopAuth')">
+          <Badge :count="res.store">待处理店铺入驻审核 </Badge>
+        </DropdownItem>
+        <DropdownItem v-if="res.waitPayBill" @click.native="navigateTo('accountStatementBill')">
+          <Badge :count="res.waitPayBill">待与商家对账</Badge>
+        </DropdownItem>
+
+        <div></div>
+      </DropdownMenu>
+    </Dropdown>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "messageTip",
+  data() {
+    return {
+      value: 0,
+      empty: false,
+    };
+  },
+  props: {
+    res: {
+      type: null,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    navigateTo(name) {
+      this.$router.push({
+        name,
+      });
+    },
+    init() {
+      Object.keys(this.res).forEach((item) => {
+        this.value = parseInt(this.value) + parseInt(this.res[item]);
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+/deep/ .ivu-select-dropdown {
+  text-align: left;
+}
+.message-con {
+  margin-right: 10px;
+}
+/deep/ .ivu-dropdown-item{
+  padding: 7px 20px  !important;
+}
+/deep/ .ivu-badge-count{
+  right: -10px !important;
+}
+</style>
diff --git a/manager/src/views/main-components/shrinkable-menu/components/sidebarMenu.vue b/manager/src/views/main-components/shrinkable-menu/components/sidebarMenu.vue
new file mode 100644
index 00000000..922f09b0
--- /dev/null
+++ b/manager/src/views/main-components/shrinkable-menu/components/sidebarMenu.vue
@@ -0,0 +1,44 @@
+
+<template>
+  <Menu
+    ref="sideMenu"
+    :active-name="$route.name"
+    :open-names="singleOpenName"
+    theme="light"
+    width="110px"
+    @on-select="changeMenu"
+  >
+    <template v-for="item in menuList">
+      <MenuItem :name="item.name" :key="item.name">
+        {{item.title}}
+      </MenuItem>
+    </template>
+  </Menu>
+</template>
+
+<script>
+export default {
+  name: "sidebarMenu",
+  data() {
+    return {
+      singleOpenName: []
+    };
+  },
+  props: {
+    menuList: {
+      type:Array,
+      default:[]
+    },
+    openNames: {
+      type: Array
+    }
+  },
+  methods: {
+
+  },
+
+};
+</script>
+<style lang="scss" scoped>
+@import "../styles/menu.scss";
+</style>
diff --git a/manager/src/views/main-components/shrinkable-menu/components/sidebarMenuShrink.vue b/manager/src/views/main-components/shrinkable-menu/components/sidebarMenuShrink.vue
new file mode 100644
index 00000000..26fbc46b
--- /dev/null
+++ b/manager/src/views/main-components/shrinkable-menu/components/sidebarMenuShrink.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <template v-for="(item, index) in menuList">
+      <div style="text-align: center;" :key="index">
+        <Dropdown
+          transfer
+          v-if="item.children.length !== 1"
+          placement="right-start"
+          :key="index"
+          @on-click="changeMenu"
+        >
+          <Button style="width: 70px;height: 42px;margin-left: -5px;padding:10px 0;" type="text">
+            <Icon :size="20" :color="iconColor" :type="item.icon"></Icon>
+          </Button>
+          <DropdownMenu style="width: 200px;" slot="list">
+            <template v-for="(child, i) in item.children">
+              <DropdownItem :name="child.name" :key="i">
+                <Icon :type="child.icon"></Icon>
+                <span style="padding-left:10px;">{{ itemTitle(child) }}</span>
+              </DropdownItem>
+            </template>
+          </DropdownMenu>
+        </Dropdown>
+        <Dropdown transfer v-else placement="right-start" :key="index" @on-click="changeMenu">
+          <Button
+            @click="changeMenu(item.children[0].name)"
+            style="width: 70px;height: 42px;margin-left: -5px;padding:10px 0;"
+            type="text"
+          >
+            <Icon :size="20" :color="iconColor" :type="item.children[0].icon || item.icon"></Icon>
+          </Button>
+          <DropdownMenu style="width: 200px;" slot="list">
+            <DropdownItem :name="item.children[0].name" :key="'d' + index">
+              <Icon :type="item.children[0].icon || item.icon"></Icon>
+              <span style="padding-left:10px;">{{ itemTitle(item.children[0]) }}</span>
+            </DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "sidebarMenuShrink",
+  props: {
+    menuList: {
+      type: Array
+    },
+    iconColor: {
+      type: String,
+      default: "white"
+    },
+    menuTheme: {
+      type: String,
+      default: "dark"
+    }
+  },
+  methods: {
+    changeMenu(active) {
+      this.$emit("on-change", active);
+    },
+    itemTitle(item) {
+      if (typeof item.title == "object") {
+        return this.$t(item.title.i18n);
+      } else {
+        return item.title;
+      }
+    }
+  }
+};
+</script>
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
new file mode 100644
index 00000000..725fbe13
--- /dev/null
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -0,0 +1,81 @@
+
+
+<template>
+  <div class="ivu-shrinkable-menu">
+    <!-- 一级菜单 -->
+    <Menu ref="sideMenu" width="110px" theme="dark"  :active-name="currNav" @on-select="selectNav">
+      <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
+        {{item.title}}
+      </MenuItem>
+    </Menu>
+    <!-- 二级菜单 -->
+    <Menu
+      ref="childrenMenu"
+      :active-name="$route.name"
+      width="130px"
+      @on-select="changeMenu"
+    >
+      <template v-for="item in menuList">
+        <MenuGroup :title="item.title" :key="item.id" style="padding-left:0;">
+          <MenuItem :name="menu.name" v-for="menu in item.children" :key="menu.name">
+            {{menu.title}}
+          </MenuItem>
+        </MenuGroup>
+
+      </template>
+    </Menu>
+  </div>
+</template>
+
+<script>
+import util from "@/libs/util.js";
+export default {
+  name: "shrinkableMenu",
+  data () {
+    return {
+    }
+  },
+  computed: {
+    menuList() {
+      return this.$store.state.app.menuList;
+    },
+    navList() {
+      return this.$store.state.app.navList;
+    },
+  },
+  watch: {
+    // 监听路由变化
+    $route: {
+      handler: function (val, oldVal) {
+        console.log(val);
+      }
+    },
+    menuList: {
+      handler: function (val, oldVal) {
+      }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    changeMenu(name) { //二级路由点击
+      this.$router.push({
+        name: name
+      });
+    },
+    selectNav(name) {
+      this.$store.commit("setCurrNav", name);
+      this.setStore("currNav", name);
+      // if (this.$route.name != "home_index") {
+      //   this.$router.push({
+      //     name: "home_index"
+      //   });
+      // }
+      util.initRouter(this);
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "./styles/menu.scss";
+</style>
diff --git a/manager/src/views/main-components/shrinkable-menu/styles/menu.scss b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
new file mode 100644
index 00000000..63cf3b63
--- /dev/null
+++ b/manager/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -0,0 +1,23 @@
+.ivu-shrinkable-menu{
+    height: calc(100% - 60px);
+    width: 240px;
+    display: flex;
+}
+.ivu-menu-vertical .ivu-menu-item-group-title {
+    padding-left: 5px;
+}
+.ivu-btn-text:hover {
+    background-color: rgba(255,255,255,.2) !important;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+    background-color: #fff;
+    &:hover{
+        background-color: #fff;
+    }
+}
+.ivu-menu-vertical{
+  overflow-y: auto;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+    color: #ed3f14;
+}
diff --git a/manager/src/views/main-components/tags-page-opened.vue b/manager/src/views/main-components/tags-page-opened.vue
new file mode 100644
index 00000000..149680f5
--- /dev/null
+++ b/manager/src/views/main-components/tags-page-opened.vue
@@ -0,0 +1,265 @@
+
+
+<template>
+
+  <div
+    ref="scrollCon"
+    @DOMMouseScroll="handlescroll"
+    @mousewheel="handlescroll"
+    class="tags-outer-scroll-con"
+  >
+    <!-- <div class="close-all-tag-con">
+      <Dropdown transfer @on-click="handleTagsOption">
+        <Button size="small" type="primary">
+          <Icon type="md-arrow-dropdown"></Icon>
+        </Button>
+        <DropdownMenu slot="list">
+          <DropdownItem name="clearAll">{{ $t('closeAll') }}</DropdownItem>
+          <DropdownItem name="clearOthers">{{ $t('closeOthers') }}</DropdownItem>
+        </DropdownMenu>
+      </Dropdown>
+    </div> -->
+
+    <ul v-show="visible" :style="{left: contextMenuLeft + 'px', top: contextMenuTop + 'px'}" class="contextmenu">
+      <li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
+    </ul>
+    <div ref="scrollBody" class="tags-inner-scroll-body" :style="{left: tagBodyLeft + 'px'}">
+      <transition-group name="taglist-moving-animation">
+        <Tag
+          type="dot"
+          v-for="item in pageTagsList"
+          ref="tagsPageOpened"
+          :key="item.name"
+          :name="item.name"
+          @on-close="closePage"
+          @click.native="linkTo(item)"
+          :closable="item.name=='home_index'?false:true"
+          :color="item.children?(item.children[0].name==currentPageName?'primary':'default'):(item.name==currentPageName?'primary':'default')"
+           @contextmenu.prevent.native="contextMenu(item, $event)"
+        >{{ itemTitle(item) }}</Tag>
+      </transition-group>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "tagsPageOpened",
+  data() {
+    return {
+      currentPageName: this.$route.name,
+      tagBodyLeft: 0,
+      visible: false,
+      contextMenuLeft: 0,
+      contextMenuTop: 0,
+      menuList: {
+        others: '关闭其他',
+        clearAll: '关闭所有'
+      },
+      refsTag: [],
+      tagsCount: 1
+    };
+  },
+  props: {
+    pageTagsList: Array,
+    beforePush: {
+      type: Function,
+      default: item => {
+        return true;
+      }
+    }
+  },
+  computed: {
+    title() {
+      return this.$store.state.app.currentTitle;
+    },
+    tagsList() {
+      return this.$store.state.app.pageOpenedList;
+    }
+  },
+  methods: {
+    itemTitle(item) {
+      if (typeof item.title == "object") {
+        return this.$t(item.title.i18n);
+      } else {
+        return item.title;
+      }
+    },
+    closePage(event, name) {
+      let pageOpenedList = this.$store.state.app.pageOpenedList;
+      let lastPageObj = pageOpenedList[0];
+      if (this.currentPageName == name) {
+        let len = pageOpenedList.length;
+        for (let i = 1; i < len; i++) {
+          if (pageOpenedList[i].name == name) {
+            if (i < len - 1) {
+              lastPageObj = pageOpenedList[i + 1];
+            } else {
+              lastPageObj = pageOpenedList[i - 1];
+            }
+            break;
+          }
+        }
+      } else {
+        let tagWidth = event.target.parentNode.offsetWidth;
+        this.tagBodyLeft = Math.min(this.tagBodyLeft + tagWidth, 0);
+      }
+      this.$store.commit("removeTag", name);
+      this.$store.commit("closePage", name);
+      pageOpenedList = this.$store.state.app.pageOpenedList;
+      localStorage.pageOpenedList = JSON.stringify(pageOpenedList);
+      if (this.currentPageName == name) {
+        this.linkTo(lastPageObj);
+      }
+    },
+    linkTo(item) {
+      if (this.$route.name == item.name) {
+        return;
+      }
+      let routerObj = {};
+      routerObj.name = item.name;
+      if (item.argu) {
+        routerObj.params = item.argu;
+      }
+      if (item.query) {
+        routerObj.query = item.query;
+      }
+      if (this.beforePush(item)) {
+        this.$router.push(routerObj);
+      }
+    },
+    handlescroll(e) {
+      var type = e.type;
+      let delta = 0;
+      if (type == "DOMMouseScroll" || type == "mousewheel") {
+        delta = e.wheelDelta ? e.wheelDelta : -(e.detail || 0) * 40;
+      }
+      let left = 0;
+      if (delta > 0) {
+        left = Math.min(0, this.tagBodyLeft + delta);
+      } else {
+        if ( this.$refs.scrollCon.offsetWidth - 100 < this.$refs.scrollBody.offsetWidth ) {
+          if ( this.tagBodyLeft <  -( this.$refs.scrollBody.offsetWidth - this.$refs.scrollCon.offsetWidth + 100 ) ) {
+            left = this.tagBodyLeft;
+          } else {
+            left = Math.max(
+              this.tagBodyLeft + delta,
+              this.$refs.scrollCon.offsetWidth -
+                this.$refs.scrollBody.offsetWidth -
+                100
+            );
+          }
+        } else {
+          this.tagBodyLeft = 0;
+        }
+      }
+      this.tagBodyLeft = left;
+    },
+    handleTagsOption(type) {
+      if (type == "clearAll") {
+        this.$store.commit("clearAllTags");
+        this.$router.push({
+          name: "home_index"
+        });
+      } else {
+        this.$store.commit("clearOtherTags", this);
+      }
+      this.tagBodyLeft = 0;
+    },
+    moveToView(tag) {
+      if (tag.offsetLeft < -this.tagBodyLeft) {
+        // 标签在可视区域左侧
+        this.tagBodyLeft = -tag.offsetLeft + 10;
+      } else if (
+        tag.offsetLeft + 10 > -this.tagBodyLeft &&
+        tag.offsetLeft + tag.offsetWidth <
+          -this.tagBodyLeft + this.$refs.scrollCon.offsetWidth - 100
+      ) {
+        // 标签在可视区域
+        this.tagBodyLeft = Math.min(
+          0,
+          this.$refs.scrollCon.offsetWidth -
+            100 -
+            tag.offsetWidth -
+            tag.offsetLeft -
+            20
+        );
+      } else {
+        // 标签在可视区域右侧
+        this.tagBodyLeft = -(
+          tag.offsetLeft -
+          (this.$refs.scrollCon.offsetWidth - 100 - tag.offsetWidth) +
+          20
+        );
+      }
+    },
+    contextMenu (item, e) {
+      this.visible = true
+      const offsetLeft = this.$el.getBoundingClientRect().left
+      this.contextMenuLeft = e.clientX - offsetLeft + 10
+      this.contextMenuTop = e.clientY - 64
+    },
+    closeMenu () {
+      this.visible = false
+    }
+  },
+  mounted() {
+    this.refsTag = this.$refs.tagsPageOpened;
+    setTimeout(() => {
+      this.refsTag.forEach((item, index) => {
+        if (this.$route.name == item.name) {
+          let tag = this.refsTag[index].$el;
+          this.moveToView(tag);
+        }
+      });
+    }, 1); // 这里不设定时器就会有偏移bug
+    this.tagsCount = this.tagsList.length;
+  },
+  watch: {
+    $route(to) {
+      this.currentPageName = to.name;
+      this.$nextTick(() => {
+        this.refsTag.forEach((item, index) => {
+          if (to.name == item.name) {
+            let tag = this.refsTag[index].$el;
+            this.moveToView(tag);
+          }
+        });
+      });
+      this.tagsCount = this.tagsList.length;
+    },
+    visible (value) {
+      if (value) {
+        document.body.addEventListener('click', this.closeMenu)
+      } else {
+        document.body.removeEventListener('click', this.closeMenu)
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+@import "@/views/main.scss";
+.contextmenu {
+  position: absolute;
+  margin: 0;
+  padding: 5px 0;
+  background: #fff;
+  z-index: 11000;
+  list-style-type: none;
+  border-radius: 4px;
+  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .1);
+  li {
+    margin: 0;
+    padding: 5px 15px;
+    cursor: pointer;
+    &:hover {
+      background: #eee;
+    }
+  }
+}
+.ivu-tag-primary, .ivu-tag-primary.ivu-tag-dot .ivu-tag-dot-inner{
+  background: red;
+}
+</style>
diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss
new file mode 100644
index 00000000..01f0d0b1
--- /dev/null
+++ b/manager/src/views/main.scss
@@ -0,0 +1,333 @@
+.lock-screen-back {
+  border-radius: 50%;
+  z-index: -1;
+  box-shadow: 0 0 0 0 #667aa6 inset;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  transition: all 3s;
+}
+
+.main {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+
+  .unlock-con {
+    width: 0px;
+    height: 0px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    z-index: 11000;
+  }
+
+  .sidebar-menu-con {
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 21;
+    transition: width 0.3s; // background: rgb(73, 80, 96)
+    background: #fff;
+    box-shadow: rgba(0, 21, 41, 0.35) 2px 0px 6px;
+  }
+
+  .layout-text {
+    display: inline-block;
+    white-space: nowrap;
+    position: absolute;
+  }
+
+  .main-hide-text .layout-text {
+    display: none;
+  }
+
+  &-content-container {
+    position: relative;
+  }
+
+  &-header-con {
+    box-sizing: border-box;
+    position: fixed;
+    display: block;
+    padding-left: 200px;
+    width: 100%;
+    height: 100px;
+    z-index: 20;
+    box-shadow: 0 2px 1px 1px rgba(100, 100, 100, 0.1);
+    transition: padding 0.3s;
+  }
+
+  &-breadcrumb {
+    padding: 8px 15px 0;
+  }
+
+  &-nav {
+    padding: 8px 15px 0;
+    color: #515a6e;
+    font-size: 14px;
+
+    :hover {
+      color: #2d8cf0;
+      transition: color 0.2s ease-in-out;
+    }
+  }
+
+  &-menu-left {
+    background: #464c5b;
+    height: 100%;
+  }
+
+  .tags-con {
+    height: 40px;
+    z-index: -1;
+    background: #f0f0f0;
+
+    .tags-outer-scroll-con {
+      position: relative;
+      box-sizing: border-box;
+      padding-right: 120px;
+      width: 100%;
+      height: 100%;
+
+      .tags-inner-scroll-body {
+        position: absolute;
+        padding: 2px 10px;
+        overflow: visible;
+        white-space: nowrap;
+        transition: left 0.3s ease;
+      }
+
+      .close-all-tag-con {
+        position: absolute;
+        right: 0px;
+        top: 0;
+        box-sizing: border-box;
+        padding-top: 8px;
+        text-align: center;
+        height: 100%;
+        background: white;
+        box-shadow: -3px 0 15px 3px rgba(0, 0, 0, 0.1);
+        z-index: 10;
+      }
+    }
+  }
+
+  &-header {
+    min-width: 740px;
+    height: 60px;
+    background: #fff;
+    box-shadow: 0 2px 1px 1px rgba(100, 100, 100, 0.1);
+    position: relative;
+    z-index: 11;
+
+    .navicon-con {
+      margin: 6px;
+      display: inline-block;
+    }
+
+    .header-middle-con {
+      position: absolute;
+      left: 0px;
+      top: 0;
+      // right: 340px;
+      bottom: 0;
+      padding: 10px;
+      // overflow: hidden;
+    }
+
+    .nav4 {
+      width: 300px !important;
+    }
+
+    .header-avator-con {
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+      top: 0;
+      height: 100%;
+      width: 260px;
+
+      .options {
+        .ivu-select-dropdown {
+          transform-origin: center top 0px;
+          position: absolute;
+          top: 45px !important;
+          left: -2px;
+          will-change: top, left;
+        }
+      }
+
+      .language {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+        vertical-align: middle;
+      }
+
+      .switch-theme-con {
+        display: inline-block;
+        width: 40px;
+        height: 100%;
+      }
+
+      .message-con {
+        display: inline-block;
+
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+
+      .change-skin {
+        font-size: 14px;
+        font-weight: 500;
+        padding-right: 5px;
+      }
+
+      .switch-theme {
+        height: 100%;
+      }
+      .dropList {
+        display: flex;
+        align-items: center;
+      }
+
+      .user-dropdown {
+        &-menu-con {
+          position: absolute;
+          right: 0;
+          top: 0;
+          height: 100%;
+          .main-user-name {
+            font-size: 14px;
+            display: inline-block;
+            cursor: pointer;
+            margin-right: 5px;
+
+            vertical-align: middle;
+            overflow: hidden;
+
+            text-align: right;
+          }
+        }
+
+        &-innercon {
+          height: 100%;
+          padding-right: 14px;
+        }
+      }
+
+      .full-screen-btn-con {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+
+      .lock-screen-btn-con {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+
+  .single-page-con {
+    min-width: 740px;
+    position: relative;
+    left: 240px;
+    top: 100px;
+    right: 0;
+    bottom: 0;
+    height: calc(100% - 110px);
+    width: calc(100% - 240px);
+    overflow: auto;
+    background-color: #f0f0f0;
+    z-index: 1;
+    transition: left 0.3s;
+
+    .single-page {
+      position: relative;
+      margin: 10px;
+    }
+  }
+
+  &-copy {
+    text-align: center;
+    padding: 10px 0 20px;
+    color: #9ea7b4;
+  }
+}
+
+.taglist-moving-animation-move {
+  transition: transform 0.3s;
+}
+
+.logo-con {
+  width: 100%;
+  height: 60px;
+  padding: 8px;
+  text-align: center;
+  border-bottom: 1px solid #eee;
+  img {
+    height: 44px;
+    width: auto;
+  }
+}
+
+.menu-bar {
+  overflow: auto;
+  overflow-x: hidden;
+}
+
+.menu-bar::-webkit-scrollbar {
+  // width: 6px;
+  // height: 6px;
+  display: none;
+}
+
+.menu-bar::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: #c3c3c3;
+}
+
+.menu-bar::-webkit-scrollbar-track {
+  background: #fff;
+}
+
+.nav-item {
+  font-size: 14px;
+}
+
+.main-nav-menu {
+  bottom: 10px;
+  position: relative;
+}
+
+.loading-position {
+  position: absolute;
+  right: 4px;
+  z-index: 100;
+  top: 1px;
+}
diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue
new file mode 100644
index 00000000..b4b01cbd
--- /dev/null
+++ b/manager/src/views/member/advance/recharge.vue
@@ -0,0 +1,248 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="充值单号" prop="rechargeSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.rechargeSn"
+                  placeholder="请输入充值单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="支付时间">
+              <DatePicker
+                v-model="selectDate"
+                type="datetimerange"
+                format="yyyy-MM-dd HH:mm:ss"
+                clearable
+                @on-change="selectDateRange"
+                placeholder="选择起始时间"
+                style="width: 200px"
+              ></DatePicker>
+            </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import {
+    getUserRecharge,
+  } from "@/api/member";
+  export default {
+    name: "recharge",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        drop: false,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          memberName:""
+        },
+        selectDate: null,
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "订单号",
+            key: "rechargeSn",
+            minWidth: 180,
+            tooltip: true
+          },
+          {
+            title: "充值金额",
+            key: "rechargeMoney",
+            width: 160,
+            sortable: true,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.rechargeMoney, "￥")
+              );
+            },
+          },
+          {
+            title: "充值方式",
+            key: "rechargeWay",
+            width: 120,
+          },
+          {
+            title: "支付状态",
+            key: "payStatus",
+            align: "left",
+            width: 120,
+            sortable: false,
+            render: (h, params) => {
+              if (params.row.payStatus == "PAID") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "已付款",
+                    },
+                  }),
+                ]);
+              } else if (params.row.payStatus == "UNPAID") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "未付款",
+                    },
+                  }),
+                ]);
+              }
+            },
+          },
+          {
+            title: "支付时间",
+            key: "payTime",
+            align: "left",
+            width: 190,
+            sortable: false,
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.selectDate = null;
+        this.searchForm.startDate = "";
+        this.searchForm.endDate = "";
+        this.searchForm.memberName = "";
+        // 重新加载数据
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getUserRecharge(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/member/advance/walletLog.vue b/manager/src/views/member/advance/walletLog.vue
new file mode 100644
index 00000000..8a615608
--- /dev/null
+++ b/manager/src/views/member/advance/walletLog.vue
@@ -0,0 +1,201 @@
+
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="会员名称" prop="memberName">
+              <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="支付时间">
+              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import { getUserWallet } from "@/api/member";
+export default {
+  name: "walletLog",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      drop: false,
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        memberName: "",
+      },
+      selectDate: null,
+      // 表单验证规则
+      formValidate: {},
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 100,
+        },
+        {
+          title: "变动金额",
+          key: "money",
+          width: 150,
+          render: (h, params) => {
+            if (params.row.money > 0) {
+              return h("div", [
+                h(
+                  "span",
+                  {
+                    style: {
+                      color: "green",
+                    },
+                  },
+                  this.$options.filters.unitPrice(params.row.money, "￥")
+                ),
+              ]);
+            } else if (params.row.money < 0) {
+              return h("div", [
+                h(
+                  "span",
+                  {
+                    style: {
+                      color: "red",
+                    },
+                  },
+                  this.$options.filters.unitPrice(params.row.money, "￥")
+                ),
+              ]);
+            }
+          },
+        },
+
+        {
+          title: "变更时间",
+          key: "createTime",
+          width: 200,
+        },
+        {
+          title: "业务类型",
+          key: "serviceType",
+          width: 200,
+          render: (h, params) => {
+            if (params.row.serviceType == "WALLET_WITHDRAWAL") {
+              return h("div", [h("span", {}, "余额提现")]);
+            } else if (params.row.serviceType == "WALLET_PAY") {
+              return h("div", [h("span", {}, "余额支付")]);
+            } else if (params.row.serviceType == "WALLET_REFUND") {
+              return h("div", [h("span", {}, "余额退款")]);
+            } else if (params.row.serviceType == "WALLET_RECHARGE") {
+              return h("div", [h("span", {}, "余额充值")]);
+            } else {
+              return h("div", [h("span", {}, "佣金提成")]);
+            }
+          },
+        },
+        {
+          title: "详细",
+          key: "detail",
+          minWidth: 300,
+          tooltip: true,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      this.searchForm.memberName = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getUserWallet(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss"  scoped>
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
new file mode 100644
index 00000000..25e0e9bc
--- /dev/null
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -0,0 +1,417 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="审核状态" prop="applyStatus">
+                <Select
+                  v-model="searchForm.memberName"
+                  clearable
+                  style="width: 200px"
+                >
+                  <Option value="APPLY">申请中</Option>
+                  <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
+                  <Option value="FAIL_AUDITING">审核拒绝</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item style="margin-left: -35px" class="br">
+                <Button @click="handleSearch" type="primary" icon="ios-search"
+                >搜索
+                </Button
+                >
+              </Form-item>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="roleModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        :label-width="80"
+      >
+        <FormItem label="申请编号">
+          <span>{{showList.sn}}</span>
+        </FormItem>
+        <FormItem label="用户名称">
+          <span>{{showList.memberName}}</span>
+        </FormItem>
+        <FormItem label="申请金额">
+          <span>{{showList.applyMoney}}</span>
+        </FormItem>
+        <FormItem label="提现状态">
+          <span>{{showList.applyStatus | paramTypeFilter}}</span>
+        </FormItem>
+        <FormItem label="申请时间">
+          <span>{{showList.createTime}}</span>
+        </FormItem>
+        <FormItem label="审核备注">
+          <Input v-model="audit"/>
+        </FormItem>
+
+      </Form>
+      <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
+        <Button type="text" @click="submitRole(false)">拒绝</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
+        >通过
+        </Button
+        >
+      </div>
+    </Modal>
+
+    <Modal
+      :title="modalTitle"
+      v-model="queryModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        :label-width="80"
+      >
+        <FormItem label="申请编号">
+          <span>{{showList.sn}}</span>
+        </FormItem>
+        <FormItem label="用户名称">
+          <span>{{showList.memberName}}</span>
+        </FormItem>
+        <FormItem label="申请金额">
+          <span>{{showList.applyMoney}}</span>
+        </FormItem>
+        <FormItem label="提现状态">
+          <span>{{showList.applyStatus | paramTypeFilter}}</span>
+        </FormItem>
+        <FormItem label="申请时间">
+          <span>{{showList.createTime}}</span>
+        </FormItem>
+        <FormItem label="审核时间">
+          <span>{{showList.inspectTime}}</span>
+        </FormItem>
+
+
+      </Form>
+      <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
+        <Button type="text" @click="submitRole(false)">拒绝</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
+        >通过
+        </Button
+        >
+      </div>
+      <div slot="footer" v-else>
+        <Button type="text"  @click="queryModalVisible = false">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getUserWithdrawApply,
+    withdrawApply
+  } from "@/api/member";
+
+  export default {
+    name: "withdrawApply",
+    components: {},
+    data() {
+      return {
+        modalTitle: "", //弹出框标题
+        openSearch: true, // 显示搜索
+        openTip: true, // 显示提示
+        loading: true, // 表单加载状态
+        drop: false,
+        audit: '', // 审核备注
+        roleModalVisible: false,
+        queryModalVisible: false,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          memberName: "",
+          applyStatus: ""
+        },
+        selectDate: null,
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        showList: {},
+        columns: [
+          {
+            title: "申请编号",
+            key: "sn",
+            align: "left",
+            tooltip: true
+          },
+          {
+            title: "用户名称",
+            key: "memberName",
+            align: "left",
+            tooltip: true
+          },
+          {
+            title: "申请金额",
+            key: "applyMoney",
+            align: "left",
+            width: 120,
+          },
+          {
+            title: "提现状态",
+            align: "left",
+            key: "applyStatus",
+            width: 120,
+            render: (h, params) => {
+              if (params.row.applyStatus == "APPLY") {
+                return h('div', [
+                  h('span', {}, '申请中'),
+                ]);
+              } else if (params.row.applyStatus == "VIA_AUDITING") {
+                return h('div', [
+                  h('span', {}, '审核通过'),
+                ]);
+              } else if (params.row.applyStatus == "SUCCESS") {
+                return h('div', [
+                  h('span', {}, '提现成功'),
+                ]);
+              } else {
+                return h('div', [
+                  h('span', {}, '审核拒绝'),
+                ]);
+              }
+            },
+          },
+          {
+            title: "申请时间",
+            key: "createTime",
+            align: "left",
+            width: 170
+          },
+          {
+            title: "审核时间",
+            key: "inspectTime",
+            align: "left",
+            width: 170
+          }, {
+            title: "操作",
+            key: "action",
+            width: 120,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              if (params.row.applyStatus == 'APPLY') {
+                return h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.showList = {}
+                        this.roleModalVisible = true;
+                        this.showList = params.row
+                      }
+                    }
+                  },
+                  "审核"
+                );
+              } else {
+                return h(
+                  "Button",
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.showList = {}
+                        this.queryModalVisible = true;
+                        this.showList = params.row
+                        this.modalTitle = "查看"
+                      }
+                    }
+                  },
+                  "查看"
+                );
+              }
+            }
+          }
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    filters: {
+      paramTypeFilter(val) {
+        if (val === 'APPLY') {
+          return '申请中'
+        } else if (val === 'VIA_AUDITING') {
+          return '审核通过(提现成功)'
+        } else if (val === 'FAIL_AUDITING') {
+          return '审核拒绝'
+        } else {
+          return '未知状态'
+        }
+      }
+    },
+    methods: {
+      submitRole(res) {
+        const params = {}
+        params.apply_id = this.showList.id
+        params.result = res
+        params.remark = this.audit
+        if (res === false && params.remark === '') {
+          this.$Message.error("审核备注不能为空");
+          return
+        }
+        withdrawApply(params).then((res) => {
+          this.loading = false;
+          if (res == true) {
+            this.$Message.success("操作成功");
+            this.roleModalVisible = false;
+            this.getDataList();
+          }
+        });
+      },
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.selectDate = null;
+        this.searchForm.startDate = "";
+        this.searchForm.endDate = "";
+        this.searchForm.memberName = "";
+        // 重新加载数据
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getUserWithdrawApply(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
new file mode 100644
index 00000000..b621f0b2
--- /dev/null
+++ b/manager/src/views/member/list/index.vue
@@ -0,0 +1,493 @@
+<template>
+  <div class="search">
+    <Row>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="会员名称" prop="username">
+              <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
+            </Form-item>
+
+            <Form-item label="会员昵称" prop="nickName">
+              <Input type="text" v-model="searchForm.nickName" placeholder="请输入会员昵称" clearable style="width: 200px" />
+            </Form-item>
+
+            <Form-item label="联系方式" prop="mobile">
+              <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
+            </Form-item>
+            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="operation padding-row">
+          <Button @click="addMember" type="primary">添加会员</Button>
+        </Row>
+
+        <Row>
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+          </Table>
+
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+    </Row>
+
+    <!-- 添加用户模态框 -->
+    <Modal v-model="addFlag" title="添加用户">
+      <Form ref="addMemberForm" :model="addMemberForm" :rules="addRule" :label-width="100">
+        <FormItem label="手机号码" prop="mobile" style="width: 90%;">
+          <Input v-model="addMemberForm.mobile" maxlength="11" placeholder="请输入手机号码" />
+        </FormItem>
+        <FormItem label="会员名称" prop="username" style="width: 90%">
+          <Input v-model="addMemberForm.username" maxlength="15" placeholder="请输入会员名称" />
+        </FormItem>
+
+        <FormItem label="会员密码" prop="password" style="width: 90%">
+          <Input type="password" password v-model="addMemberForm.password" maxlength="20" placeholder="请输入会员密码" />
+        </FormItem>
+      </Form>
+
+      <div slot="footer">
+        <Button @click="
+            () => {
+              addFlag = false;
+            }
+          ">
+          取消
+        </Button>
+        <Button type="primary" :loading="handleAddLoading" @click="addMemberSubmit">
+          确定
+        </Button>
+      </div>
+    </Modal>
+
+    <!-- 修改模态框 -->
+    <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
+      <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+        <FormItem label="头像">
+          <img :src="formValidate.face" class="face" />
+          <Button type="text" class="upload" @click="
+              () => {
+                this.picModelFlag = true;
+                this.$refs.ossManage.selectImage = true;
+              }
+            ">修改
+          </Button>
+          <input type="file" style="display: none" id="file" />
+        </FormItem>
+        <FormItem label="用户名" prop="name">
+          <Input v-model="formValidate.username" style="width: 200px" disabled />
+        </FormItem>
+        <FormItem label="用户昵称" prop="name">
+          <Input v-model="formValidate.nickName" style="width: 200px" />
+        </FormItem>
+        <FormItem label="性别" prop="sex">
+          <RadioGroup v-model="formValidate.sex">
+            <Radio :label="1">
+              <span>男</span>
+            </Radio>
+            <Radio :label="0">
+              <span>女</span>
+            </Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="修改密码" prop="password">
+          <Input type="password" style="width: 220px" password v-model="formValidate.newPassword" />
+        </FormItem>
+        <FormItem label="生日" prop="birthday">
+          <DatePicker type="date" format="yyyy-MM-dd" v-model="formValidate.birthday" style="width: 220px"></DatePicker>
+        </FormItem>
+        <FormItem label="所在地" prop="mail">
+          <div class="form-item" v-if="!updateRegion">
+            <Input disabled style="width: 250px" :value="formValidate.region" />
+            <Button type="text" @click="
+                () => {
+                  this.updateRegion = !this.updateRegion;
+                }
+              ">修改
+            </Button>
+          </div>
+          <div class="form-item" v-else>
+            <region style="width: 250px" @selected="selectedRegion" />
+          </div>
+        </FormItem>
+      </Form>
+    </Modal>
+    <Modal width="1200px" v-model="picModelFlag">
+      <ossManage @callback="callbackSelected" ref="ossManage" />
+    </Modal>
+  </div>
+</template>
+
+<script>
+import region from "@/views/lili-components/region";
+import * as API_Member from "@/api/member.js";
+import ossManage from "@/views/sys/oss-manage/ossManage";
+import * as RegExp from "@/libs/RegExp.js";
+
+export default {
+  name: "member",
+  components: {
+    region,
+    ossManage,
+  },
+  data() {
+    return {
+      selectedMember: false, //是否是其他组件调用
+      descTitle: "",
+      descFlag: false, //编辑查看框
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      addFlag: false,
+      updateRegion: false,
+      addMemberForm: {
+        mobile: "",
+        username: "",
+        password: "",
+      },
+      searchForm: {
+        pageNumber: 1,
+        pageSize: 10,
+        order: "desc",
+        username: "",
+        mobile: "",
+        disabled: "OPEN",
+      },
+      picModelFlag: false,
+      // 表单验证规则
+      formValidate: {},
+      addRule: {
+        mobile: [
+          { required: true, message: "请输入手机号码" },
+          {
+            pattern: RegExp.mobile,
+            message: "请输入正确的手机号",
+          },
+        ],
+        username: [{ required: true, message: "请输入会员名称" }],
+        password: [{ required: true, message: "请输入密码" }],
+      },
+      ruleValidate: {}, //修改验证
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "会员名称",
+          key: "username",
+          tooltip: true,
+        },
+        {
+          title: "会员昵称",
+          key: "nickName",
+          tooltip: true,
+        },
+        {
+          title: "联系方式",
+          width: 130,
+          key: "mobile",
+          render: (h, params) => {
+            if (params.row.mobile == null) {
+              return h("div", [h("span", {}, "")]);
+            } else {
+              return h("div", [h("span", {}, params.row.mobile)]);
+            }
+          },
+        },
+        {
+          title: "注册时间",
+          key: "createTime",
+          width: 180,
+        },
+
+        {
+          title: "积分数量",
+          align: "left",
+          width: 100,
+          render: (h, params) => {
+            return h(
+              "div",
+              {},
+              params.row.point == void 0 ? "0" : params.row.point
+            );
+          },
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          fixed: "right",
+          render: (h, params) => {
+            return h(
+              "div",
+              {
+                style: {
+                  display: "flex",
+                  justifyContent: "center",
+                },
+              },
+              [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display: this.selectedMember ? "block" : "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.callback(params.row);
+                      },
+                    },
+                  },
+                  "选择"
+                ),
+
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px", display: this.selectedMember ? "none" : "block",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                      ghost: true,
+                    },
+                    style: {
+                      marginRight: "5px", display: this.selectedMember ? "none" : "block",
+                    },
+                    on: {
+                      click: () => {
+                        this.editPerm(params.row);
+                      },
+                    },
+                  },
+                  "编辑"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                      type: "error",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display: this.selectedMember ? "none" : "block",
+                    },
+                    on: {
+                      click: () => {
+                        this.disabled(params.row);
+                      },
+                    },
+                  },
+                  "禁用"
+                ),
+              ]
+            );
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    // 回调给父级
+    callback(val) {
+      this.$emit("callback", val);
+    },
+    init() {
+      this.getData();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getData();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getData();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getData();
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    //查看详情修改
+    editPerm(val) {
+      this.descTitle = `查看用户 ${val.username}`;
+      this.descFlag = true;
+      this.updateRegion = false;
+      this.getMemberInfo(val.id);
+    },
+    addMember() {
+      this.addFlag = true;
+      this.addMemberForm = {
+        mobile: "",
+        username: "",
+        password: "",
+      };
+    },
+    /**
+     * 查询查看会员详情
+     */
+    getMemberInfo(id) {
+      API_Member.getMemberInfoData(id).then((res) => {
+        if (res.result) {
+          this.$set(this, "formValidate", res.result);
+        }
+      });
+    },
+    //查询会员列表
+    getData() {
+      API_Member.getMemberListData(this.searchForm).then((res) => {
+        if (res.result.records) {
+          this.loading = false;
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    // 选中的图片
+    callbackSelected(val) {
+      this.picModelFlag = false;
+      this.formValidate.face = val.url;
+    },
+    //添加会员提交
+    addMemberSubmit() {
+      this.addMemberForm.password = this.md5(this.addMemberForm.password);
+      this.$refs.addMemberForm.validate((valid) => {
+        if (valid) {
+          API_Member.addMember(this.addMemberForm).then((res) => {
+            if (res.result) {
+              this.getData();
+              this.$Message.success("添加成功！");
+              this.addFlag = false;
+            }
+          });
+        }
+      });
+    },
+
+    // 选中的地址
+    selectedRegion(val) {
+      this.region = val[1];
+      this.regionId = val[0];
+    },
+    //查看会员
+    detail(row) {
+      this.$router.push({ name: "member-detail", query: { id: row.id } });
+    },
+
+    //禁用会员
+    disabled(v) {
+      let params = {
+        memberIds: [v.id],
+        disabled: false,
+      };
+      this.$Modal.confirm({
+        title: "提示",
+        content: "<p>确认禁用此会员？</p>",
+        onOk: () => {
+          API_Member.updateMemberStatus(params).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success("禁用成功");
+              this.getData();
+            } else {
+              this.$Message.error(res.message);
+            }
+          });
+        },
+      });
+    },
+
+    // 提交修改数据
+    handleSubmitModal() {
+      const { nickName, sex, username, face, newPassword } = this.formValidate;
+      let time = new Date(this.formValidate.birthday);
+      let birthday =
+        time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
+      let submit = {
+        regionId: this.formValidate.regionId,
+        region: this.formValidate.region,
+        nickName,
+        username,
+        sex,
+        birthday,
+        face,
+      };
+      if (this.region != "undefined") {
+        submit.regionId = this.regionId;
+        submit.region = this.region;
+      }
+      if (newPassword) {
+        submit.password = this.md5(newPassword);
+      }
+      API_Member.updateMember(submit).then((res) => {
+        if (res.result) {
+          this.$Message.success("修改成功！");
+          this.init();
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+/deep/ .ivu-table-wrapper {
+  width: 100%;
+}
+/deep/ .ivu-card{
+  width: 100%;
+}
+.face {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+}
+</style>
diff --git a/manager/src/views/member/list/memberDetail.scss b/manager/src/views/member/list/memberDetail.scss
new file mode 100644
index 00000000..151a6599
--- /dev/null
+++ b/manager/src/views/member/list/memberDetail.scss
@@ -0,0 +1,124 @@
+.head-title {
+  font-size: 18px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 400;
+}
+.detail-body{
+  margin-top: 17px;
+}
+
+
+.head-info {
+  display: flex;
+  height: 100px;
+  background: #f56c1d;
+  padding: 12px;
+  border-radius: 4px;
+  align-items: center;
+}
+
+.ant-layout, .ant-layout * {
+  box-sizing: border-box;
+}
+
+.base-info {
+  background-color: #fff;
+  padding: 20px;
+  margin-bottom: 12px;
+  height: 250px;
+}
+
+.ant-col-md-6 {
+  display: block;
+  box-sizing: border-box;
+  width: 25%;
+  float: left;
+}
+.info-2{
+  float: left;
+}
+
+.ant-row {
+  position: relative;
+  height: auto;
+  margin-right: 0;
+  margin-left: 0;
+  zoom: 1;
+  display: block;
+  box-sizing: border-box;
+}
+.bottom-info {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 12px;
+  margin-top: 6px;
+  height: 36px;
+  background: #f5f5f5;
+  border-radius: 4px;
+}
+
+.ant-layout * {
+  box-sizing: border-box;
+}
+.name{
+  margin-left: 10px;
+  color: #fff;
+  font-size: 18px;
+}
+.phone{
+  margin-left: 20px;
+  font-size: 14px;
+  color: #fff;
+}
+.item {
+  display: flex;
+  align-items: flex-start;
+  line-height: 20px;
+  margin-bottom: 2px;
+}
+
+.label {
+  flex-basis: 130px;
+  text-align: right;
+  color: rgba(0, 0, 0, 0.4);
+  flex-shrink: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.info {
+  font-weight: 500;
+  padding-left: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
+
+.pointsTitle {
+  background-color: #fafafa;
+  padding: 15px 20px;
+  display: flex;
+  font-size: 16px;
+  line-height: 1.8;
+  flex-direction: row;
+  justify-content: space-around;
+  color: #333;
+  text-align: center;
+  margin-bottom: 16px;
+  .points-top-title{
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 0.4);
+    line-height: 14px;
+    margin-bottom: 8px;
+  }
+  .points-top-text {
+    font-size: 16px;
+    font-weight: 500;
+    color: #F56C1D;
+    line-height: 16px;
+  }
+}
+.point-data{
+
+}
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
new file mode 100644
index 00000000..8b8b78da
--- /dev/null
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -0,0 +1,1154 @@
+<template>
+  <div>
+    <Card style="height: 240px;padding: 12px 12px 0px">
+      <div class="head-title">基本信息</div>
+      <div class="detail-body">
+        <div class="ant-col-md-6">
+          <div class="info">
+            <div class="head-info">
+              <Avatar size="large" :src="memberInfo.face"/>
+              <div>
+                <div class="name" v-if="memberInfo.username && memberInfo.username.length > 15">
+                  {{memberInfo.username.slice(0,15)}}...
+                </div>
+                <div class="name" v-else>
+                  {{memberInfo.username}}
+                </div>
+                <div class="phone">
+                  {{memberInfo.mobile}}
+                </div>
+              </div>
+            </div>
+            <div class="bottom-info">
+              <p>上次登录 {{memberInfo.lastLoginDate}}&nbsp;
+              <p>
+                <i-switch size="large" v-model="memberInfo.disabled" :true-value="true" :false-value="false"
+                          @on-change="memberStatusChange">
+                  <span slot="open">启用</span>
+                  <span slot="close">禁用</span>
+                </i-switch>
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="ant-col-md-6">
+          <p class="item">
+            <span class="label">昵称：</span>
+            <span class="info">{{memberInfo.nickName}}</span>
+          </p>
+          <p class="item">
+            <span class="label">会员名称：</span>
+            <span class="info">{{memberInfo.username}}</span>
+          </p>
+          <p class="item">
+            <span class="label">性别：</span>
+            <span v-if="memberInfo.sex==1" class="info">男</span>
+            <span v-else class="info">女</span>
+          </p>
+          <p class="item">
+            <span class="label">生日：</span>
+            <span v-if="memberInfo.birthday == null || memberInfo.birthday == 'undefined'">暂未完善</span>
+            <span v-else class="info">{{memberInfo.birthday}}</span>
+          </p>
+          <p class="item">
+            <span class="label">地区：</span>
+            <span v-if="memberInfo.region == null || memberInfo.region =='' || memberInfo.region === 'undefined'"
+                  class="info">暂未完善</span>
+            <span v-else class="info">{{memberInfo.region}}</span>
+          </p>
+          <p class="item">
+            <span class="label">注册时间：</span>
+            <span class="info">{{memberInfo.createTime}}</span>
+          </p>
+        </div>
+      </div>
+    </Card>
+
+    <Card>
+      <Tabs type="point" @on-click="memberInfoChange">
+        <TabPane label="TA的积分" name="point">
+          <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
+            <div style="width: 120px;">
+              <div class="points-top-title">
+                积分余额
+              </div>
+              <div class="points-top-text">
+                {{memberInfo.point?memberInfo.point:0}}
+              </div>
+            </div>
+          </div>
+          <div class="point-data" style="margin-top: -5px">
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="pointsColumns"
+                :data="pointData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="pointChangeSort"
+              >
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+              <Page
+                :current="pointSearchForm.pageNumber"
+                :total="pointTotal"
+                :page-size="pointSearchForm.pageSize"
+                @on-change="pointChangePage"
+                @on-page-size-change="pointChangePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </div>
+        </TabPane>
+        <TabPane label="TA的订单" name="order" style="min-height: 200px">
+          <Row>
+            <Form ref="searchForm" :model="orderSearchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="orderSearchForm.orderSn"
+                  placeholder="请输入订单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单状态" prop="orderStatus">
+                <Select v-model="orderSearchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                  <Option value="UNDELIVERED">待发货</Option>
+                  <Option value="DELIVERED">已发货</Option>
+                  <Option value="COMPLETED">已完成</Option>
+                  <Option value="TAKE">待核验</Option>
+                  <Option value="CANCELLED">已取消</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="支付状态" prop="payStatus">
+                <Select v-model="orderSearchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="订单类型" prop="orderType">
+                <Select v-model="orderSearchForm.orderType" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="NORMAL">普通订单</Option>
+                  <Option value="FICTITIOUS">虚拟订单</Option>
+                  <Option value="GIFT">赠品订单</Option>
+                  <Option value="PINTUAN">拼团订单</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="订单来源" prop="clientType">
+                <Select v-model="orderSearchForm.clientType" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="H5">移动端</Option>
+                  <Option value="PC">PC端</Option>
+                  <Option value="WECHAT_MP">小程序</Option>
+                  <Option value="APP">移动应用端</Option>
+                  <Option value="UNKNOWN">未知</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="下单时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="getOrderData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <div style="min-height: 180px">
+            <Row class="padding-row">
+              <Table
+                :loading="loading"
+                border
+                :columns="orderColumns"
+                :data="orderData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="orderChangeSort"
+              >
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+              <Page
+                :current="orderSearchForm.pageNumber"
+                :total="orderTotal"
+                :page-size="orderSearchForm.pageSize"
+                @on-change="orderChangePage"
+                @on-page-size-change="orderChangePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </div>
+        </TabPane>
+        <TabPane label="TA收货地址" name="address">
+          <Row class="operation padding-row">
+            <Button @click="addMemberAddress" type="primary">新增</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="addressColumns"
+              :data="addressData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="addressChangeSort"
+            >
+            </Table>
+          </Row>
+
+          <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+            <Page
+              :current="addressSearchForm.pageNumber"
+              :total="addressTotal"
+              :page-size="addressSearchForm.pageSize"
+              @on-change="addressChangePage"
+              @on-page-size-change="addressChangePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="TA的余额" name="wallet">
+          <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
+            <div style="width: 120px;">
+              <div class="points-top-title">
+                余额
+              </div>
+
+              <div class="points-top-text">
+                {{memberWalletInfo.memberDeposit?memberWalletInfo.memberDeposit:0 | unitPrice('￥')}}
+              </div>
+            </div>
+            <div style="width: 120px;">
+              <div class="points-top-title">
+                冻结余额
+              </div>
+              <div class="points-top-text">
+                {{memberWalletInfo.frozenDeposit?memberWalletInfo.frozenDeposit:0 | unitPrice('￥')}}
+              </div>
+            </div>
+          </div>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="walletColumns"
+              :data="walletData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="walletChangeSort"
+            >
+            </Table>
+          </Row>
+
+          <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+            <Page
+              :current="walletSearchForm.pageNumber"
+              :total="walletTotal"
+              :page-size="walletSearchForm.pageSize"
+              @on-change="walletChangePage"
+              @on-page-size-change="walletChangePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+        <TabPane label="TA的发票" name="receipt">
+          <Row>
+            <Form ref="searchForm" :model="receiptRecordSearchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="receiptRecordSearchForm.orderSn"
+                  placeholder="请输入订单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Button @click="getReceiptRecordData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="receiptRecordColumns"
+              :data="receiptRecordData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="walletChangeSort"
+            >
+              <template slot="orderSnSlot" slot-scope="scope">
+
+                <a @click="orderDetail(scope.row.orderSn)">{{scope.row.orderSn}}</a>
+
+              </template>
+            </Table>
+          </Row>
+
+          <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+            <Page
+              :current="receiptRecordSearchForm.pageNumber"
+              :total="receiptRecordTotal"
+              :page-size="receiptRecordSearchForm.pageSize"
+              @on-change="walletChangePage"
+              @on-page-size-change="walletChangePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </TabPane>
+      </Tabs>
+    </Card>
+    <Modal
+      :title="addressModalTitle"
+      v-model="addressModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="addressForm" :model="addressForm" :label-width="100" :rules="addressFormValidate">
+        <FormItem label="收货人姓名" prop="name">
+          <Input v-model="addressForm.name" maxlength="8" clearable style="width: 80%"/>
+        </FormItem>
+        <FormItem label="收货人手机" prop="mobile">
+          <Input v-model="addressForm.mobile" clearable style="width: 80%" maxlength="11"/>
+        </FormItem>
+        <FormItem label="收货人地址" prop="consigneeAddressPath">
+          <Input v-model="addressForm.consigneeAddressPath" @on-focus="$refs.liliMap.showMap = true" clearable
+                 style="width: 80%"/>
+        </FormItem>
+        <FormItem label="详细地址" prop="detail">
+          <Input v-model="addressForm.detail" maxlength="35" clearable style="width: 80%"/>
+        </FormItem>
+        <FormItem label="地址别名" prop="alias">
+          <Input v-model="addressForm.alias" clearable style="width: 80%" maxlength="8"/>
+        </FormItem>
+        <FormItem label="默认" prop="isDefault">
+          <RadioGroup v-model="addressForm.isDefault">
+            <Radio :label=true>是</Radio>
+            <Radio :label=false>否</Radio>
+          </RadioGroup>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="addressModalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="addressSubmit">保存</Button>
+      </div>
+    </Modal>
+    <liliMap ref="liliMap" @getAddress="getAddress"></liliMap>
+  </div>
+</template>
+
+<script>
+  import region from "@/views/lili-components/region";
+  import * as API_Member from "@/api/member.js";
+  import ossManage from "@/views/sys/oss-manage/ossManage";
+  import liliMap from "@/views/my-components/map/index";
+  import * as RegExp from '@/libs/RegExp.js';
+  import * as API_Order from "@/api/order.js";
+
+  export default {
+    name: "member",
+    components: {
+      region,
+      ossManage,
+      liliMap
+    },
+    data() {
+      return {
+        id: "",//会员id
+        loading: true, // 表单加载状态
+        memberInfo: {},//会员信息
+        memberWalletInfo: {},//会员预存款信息
+        addressModalTitle: "",//会员地址操作标题
+        addressModalVisible: false, //会员地址操作弹出框
+        addressForm: {
+          id: "",
+          isDefault: false
+
+        },//会员地址操作form
+        selectDate: null,
+        submitLoading: false, // 添加或编辑提交状态
+        addressFormValidate: {
+          name: [{required: true, message: "收货人姓名不能为空"}],
+          mobile: [
+            {required: true, message: '请输入收货人手机号码'},
+            {
+              pattern: RegExp.mobile,
+              message: '请输入正确的手机号'
+            }
+          ],
+          consigneeAddressPath: [{required: true, message: "收货人地址不能为空"}],
+          detail: [{required: true, message: "收货人详细地址不能为空"}],
+          alias: [{required: true, message: "收货人地址别名不能为空"}],
+        },//会员地址操作表单校验
+        //历史积分表格
+        pointsColumns: [
+          {
+            title: "操作内容",
+            key: "content",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "操作时间",
+            key: "createTime",
+            width: 200
+          },
+          {
+            title: "之前积分",
+            key: "beforePoint",
+            width: 150,
+          },
+
+          {
+            title: "变动积分",
+            key: "point",
+            width: 150,
+            render: (h, params) => {
+              if (params.row.pointType == 1) {
+                return h('div', [
+                  h('span', {
+                    style: {
+                      color: 'green'
+                    }
+                  }, "+" + params.row.point),
+                ]);
+              } else {
+                return h('div', [
+                  h('span', {
+                    style: {
+                      color: 'red'
+                    }
+                  }, "-" + params.row.point),
+                ]);
+              }
+
+            }
+          },
+          {
+            title: "当前积分",
+            key: "point",
+            width: 150,
+          },
+
+        ],
+        pointData: [],//历史积分数据
+        pointTotal: 0,//历史积分总条数
+        //历史积分数据查询form
+        pointSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        orderColumns: [
+          {
+            title: "订单编号",
+            key: "sn",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            title: "订单金额",
+            key: "flowPrice",
+            width: 130,
+            render: (h, params) => {
+              return h("div", this.$options.filters.unitPrice(params.row.flowPrice, '￥'));
+            }
+          },
+          {
+            title: "订单类型",
+            key: "orderType",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.orderType == "NORMAL") {
+                return h('div', [h('span', {}, '普通订单'),]);
+              } else if (params.row.orderType == "FICTITIOUS") {
+                return h('div', [h('span', {}, '虚拟订单'),]);
+              } else if (params.row.orderType == "GIFT") {
+                return h('div', [h('span', {}, '赠品订单'),]);
+              } else if (params.row.orderType == "PINTUAN") {
+                return h('div', [h('span', {}, '拼团订单'),]);
+              }
+
+            }
+          },
+          {
+            title: "来源",
+            key: "clientType",
+            width: 80,
+          },
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', {}, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', {}, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', {}, '待发货'),]);
+              } else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', {}, '已发货'),]);
+              } else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', {}, '已完成'),]);
+              } else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', {}, '待核验'),]);
+              } else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', {}, '已取消'),]);
+              }
+            }
+          },
+          {
+            title: "支付状态",
+            key: "payStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.payStatus == "UNPAID") {
+                return h('div', [h('span', {}, '未付款'),]);
+              } else if (params.row.payStatus == "PAID") {
+                return h('div', [h('span', {}, '已付款'),]);
+              }
+            }
+          },
+
+          {
+            title: "售后状态",
+            key: "groupAfterSaleStatus",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.groupAfterSaleStatus == "NEW") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "NOT_APPLIED") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "ALREADY_APPLIED") {
+                return h('div', [h('span', {}, '已申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "EXPIRED") {
+                return h('div', [h('span', {}, '已失效'),]);
+              }
+            }
+          },
+          {
+            title: "投诉状态",
+            key: "groupComplainStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.groupComplainStatus == "NEW") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupComplainStatus == "NO_APPLY") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupComplainStatus == "APPLYING") {
+                return h('div', [h('span', {}, '申请中'),]);
+              } else if (params.row.groupComplainStatus == "COMPLETE") {
+                return h('div', [h('span', {}, '已完成'),]);
+              } else if (params.row.groupComplainStatus == "EXPIRED") {
+                return h('div', [h('span', {}, '已失效'),]);
+              } else if (params.row.groupComplainStatus == "CANCEL") {
+                return h('div', [h('span', {}, '取消投诉'),]);
+              }
+            }
+          },
+          {
+            title: "购买店铺",
+            key: "storeName",
+            width: 120,
+            tooltip: true
+          },
+          {
+            title: "下单时间",
+            key: "createTime",
+            width: 170,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 100,
+            fixed: "right",
+            render: (h, params) => {
+              return h("div", {
+                style: {
+                  display: "flex",
+                  justifyContent: "center"
+                }
+              }, [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.orderDetail(params.row.sn);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+
+        ],
+        orderData: [],//订单数据
+        orderTotal: 0,//订单总条数
+        //TA的订单form
+        orderSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          payStatus: "",
+          orderSn: "",
+          orderType: "",
+        },
+        addressColumns: [
+          {
+            title: "地址别名",
+            key: "alias",
+            minWidth: 80,
+            tooltip: true
+          },
+          {
+            title: "收货人姓名",
+            key: "name",
+            minWidth: 90,
+            tooltip: true
+          },
+          {
+            title: "收货人电话",
+            key: "mobile",
+            width: 125,
+          },
+
+          {
+            title: "地址",
+            key: "consigneeAddressPath",
+            minWidth: 160,
+            tooltip: true
+
+          },
+          {
+            title: "详细地址",
+            key: "detail",
+            minWidth: 180,
+            tooltip: true
+          },
+          {
+            title: "默认",
+            key: "isDefault",
+            width: 80,
+            render: (h, params) => {
+              if (params.row.isDefault) {
+                return h('div', [
+                  h('span', {}, "是"),
+                ]);
+              } else {
+                return h('div', [
+                  h('span', {}, "否"),
+                ]);
+              }
+
+            }
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 120,
+            fixed: "right",
+            render: (h, params) => {
+              return h("div", {
+                style: {
+                  display: "flex",
+                  justifyContent: "center"
+                }
+              }, [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.memberAddressRemove(params.row);
+                      },
+                    },
+                  },
+                  "删除"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.editAddress(params.row);
+                      },
+                    },
+                  },
+                  "编辑"
+                ),
+              ]);
+            },
+          },
+
+        ],
+        addressData: [],//历史积分数据
+        addressTotal: 0,//历史积分总条数
+        //TA的收货地址form
+        addressSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        //消费记录
+        walletColumns: [
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 120,
+          },
+          {
+            title: "业务类型",
+            key: "serviceType",
+            width: 150,
+            render: (h, params) => {
+              if (params.row.serviceType == "BALANCE_WITHDRAWAL") {
+                return h('div', [h('span', {}, '余额提现'),]);
+              } else if (params.row.serviceType == "BALANCE_PAY") {
+                return h('div', [h('span', {}, '余额支付'),]);
+              } else if (params.row.serviceType == "BALANCE_REFUND") {
+                return h('div', [h('span', {}, '余额退款'),]);
+              } else if (params.row.serviceType == "BALANCE_RECHARGE") {
+                return h('div', [h('span', {}, '余额充值'),]);
+              } else if (params.row.serviceType == "BALANCE_COMMISSION") {
+                return h('div', [h('span', {}, '佣金提成'),]);
+              }
+            }
+          },
+          {
+            title: "变动金额",
+            key: "money",
+            width: 150,
+            render: (h, params) => {
+              if (params.row.money >0) {
+                return h('div', [
+                  h('span', {
+                    style:{
+                      color: 'green'
+                    }
+                  }, this.$options.filters.unitPrice(params.row.money,'￥')),
+                ]);
+              } else if (params.row.money < 0) {
+                return h('div', [
+                  h('span', {
+                    style:{
+                      color: 'red'
+                    }
+                  }, this.$options.filters.unitPrice(params.row.money,'￥')),
+                ]);
+              }
+            },
+          },
+          {
+            title: "变动时间",
+            key: "createTime",
+            width: 170,
+          },
+          {
+            title: "变动明细",
+            key: "detail",
+            minWidth: 400,
+            tooltip: true
+          },
+        ],
+        //TA的余额消费记录
+        walletSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        walletData: [],//历史积分数据
+        walletTotal: 0,//历史积分总条数
+        //TA的发票记录
+        receiptRecordSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        receiptRecordColumns: [
+          {
+            title: "订单编号",
+            key: "orderSn",
+            width: 260,
+            slot: "orderSnSlot",
+          },
+          {
+            title: "发票抬头",
+            key: "receiptTitle",
+            minWidth: 130,
+            tooltip: true
+          },
+          {
+            title: "纳税人识别号",
+            key: "taxpayerId",
+            minWidth: 130,
+            tooltip: true
+          },
+          {
+            title: "发票金额",
+            key: "receiptPrice",
+            width: 130,
+            render: (h, params) => {
+              if(params.row.receiptPrice == null){
+                return h("div", this.$options.filters.unitPrice(0, '￥'));
+              }else{
+                return h("div", this.$options.filters.unitPrice(params.row.receiptPrice, '￥'));
+              }
+
+            }
+          },
+          {
+            title: "发票内容",
+            key: "receiptContent",
+            minWidth: 120,
+            tooltip: true
+          },
+          ],
+        receiptRecordData: [],//发票记录数据
+        receiptRecordTotal: 0,//发票记录总条数
+      };
+    },
+    methods: {
+      init() {
+        //查询会员信息
+        this.getMemberInfo();
+        //查询会员的历史积分数据
+        this.getPointData();
+      },
+      //会员信息tab改变事件
+      memberInfoChange(v) {
+        if (v == "point") {
+          this.getPointData();
+        }
+        if (v == "address") {
+          this.getAddressData();
+        }
+        if (v == "order") {
+          this.getOrderData();
+        }
+        if (v == "wallet") {
+          this.getMemberWalletData();
+          this.getDepositLogData();
+        }
+        if(v == "receipt"){
+          this.getReceiptRecordData();
+        }
+      },
+      //查询会员信息
+      getMemberInfo() {
+        API_Member.getMemberInfoData(this.id).then((res) => {
+          this.$set(this, "memberInfo", res.result);
+        });
+      },
+      //会员状态改变事件
+      memberStatusChange(v) {
+        let params = {
+          memberIds: [this.id],
+          disabled: v
+        }
+        API_Member.updateMemberStatus(params).then(res => {
+        });
+      },
+      //查询TA的余额disabled
+      getMemberWalletData() {
+        this.loading = true;
+        let params = {
+          memberId: this.id
+        }
+        API_Member.getMemberWallet(params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.memberWalletInfo = res.result;
+          }
+        });
+        this.loading = false;
+
+      },
+      //查询TA的余额消费记录
+      getDepositLogData(){
+        this.loading = true;
+        this.walletSearchForm.memberId = this.id
+        API_Member.getUserWallet(this.walletSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.walletData = res.result.records;
+            this.walletTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+
+      //查询TA的发票记录
+      getReceiptRecordData(){
+        this.loading = true;
+        this.receiptRecordSearchForm.memberId = this.id
+        API_Order.getReceiptPage(this.receiptRecordSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.receiptRecordData = res.result.records;
+            this.receiptRecordTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+
+      //查询TA的订单
+      getOrderData() {
+        this.loading = true;
+        this.orderSearchForm.memberId = this.id
+        API_Order.getOrderList(this.orderSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.orderData = res.result.records;
+            this.orderTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      //跳转到订单详情页面
+      orderDetail(v) {
+        this.$router.push({
+          name: "order-detail",
+          query: {sn: v},
+        });
+      },
+      //查询TA的历史积分数据
+      getPointData() {
+        this.loading = true;
+        this.pointSearchForm.memberId = this.id
+        API_Member.getHistoryPointData(this.pointSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.pointData = res.result.records;
+            this.pointTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      //新增TA的收货地址
+      addMemberAddress() {
+        this.addressModalTitle = "新增会员地址";
+        this.addressModalVisible = true
+        this.addressForm = {
+          id: "",
+          isDefault: false,
+        }
+
+      },
+      //修改TA的收货地址
+      editAddress(v) {
+        this.addressModalTitle = "修改会员地址";
+        this.$set(this, "addressForm", v);
+        delete this.addressForm.updateTime;
+        this.addressModalVisible = true
+      },
+      //新增或者修改表单提交
+      addressSubmit() {
+        this.addressForm.memberId = this.id
+        this.$refs.addressForm.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            if (this.addressForm.id != "") {
+              //修改地址
+              API_Member.editMemberAddress(this.addressForm).then((res) => {
+                this.submitLoading = false;
+                if (res && res.success) {
+                  this.$Message.success("修改成功");
+                  this.addressModalVisible = false
+                  this.getAddressData();
+                }
+              });
+            } else {
+              //添加地址
+              API_Member.addMemberAddress(this.addressForm).then((res) => {
+                this.submitLoading = false;
+                if (res && res.success) {
+                  this.$Message.success("添加成功");
+                  this.addressModalVisible = false
+                  this.getAddressData();
+                }
+              });
+            }
+          }
+        })
+
+      },
+      //获取地址
+      getAddress(item) {
+        this.$set(this.addressForm, 'consigneeAddressPath', item.addr)
+        this.$set(this.addressForm, 'consigneeAddressIdPath', item.addrId)
+        this.addressForm.address = item.address
+        this.addressForm.lat = item.position.lat
+        this.addressForm.lon = item.position.lng
+      },
+      //删除会员地址
+      memberAddressRemove(v) {
+        this.$Modal.confirm({
+          title: '删除',
+          content: '<p>确定要删除此收货地址？</p>',
+          onOk: () => {
+            API_Member.removeMemberAddress(v.id).then((res) => {
+              if (res.success) {
+                this.$Message.success('删除成功');
+                this.getAddressData();
+              }
+            });
+          }
+        })
+      },
+      //查询TA的收货地址
+      getAddressData() {
+        this.loading = true;
+        API_Member.getMemberAddressData(this.id, this.addressSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.addressData = res.result.records;
+            this.addressTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      }
+      ,
+      //积分记录页数变化
+      pointChangePage(v) {
+        this.pointSearchForm.pageNumber = v;
+        this.getPointData();
+      }
+      ,
+      //积分记录页数变化
+      pointChangePageSize(v) {
+        this.pointSearchForm.pageSize = v;
+        this.getPointData();
+      }
+      ,
+      //会员地址记录页数变化
+      addressChangePage(v) {
+        this.addressSearchForm.pageNumber = v;
+        this.getAddressData()
+      }
+      ,
+      //会员地址记录页数变化
+      addressChangePageSize(v) {
+        this.addressSearchForm.pageSize = v;
+        this.getPointData();
+      },
+
+      //余额记录页数变化
+      walletChangePage(v) {
+        this.walletSearchForm.pageNumber = v;
+        this.getDepositLogData();
+      }
+      ,
+      //余额记录页数变化
+      walletChangePageSize(v) {
+        this.walletSearchForm.pageSize = v;
+        this.getDepositLogData();
+      },
+
+      //订单记录页数变化
+      orderChangePage(v) {
+        this.orderSearchForm.pageNumber = v;
+        this.getOrderData()
+      }
+      ,
+      //订单记录页数变化
+      orderChangePageSize(v) {
+        this.orderSearchForm.pageSize = v;
+        this.getOrderData();
+      },
+      orderChangeSort(e) {
+        this.orderSearchForm.sort = e.key;
+        this.orderSearchForm.order = e.order;
+        this.getOrderData();
+      },
+      addressChangeSort(e) {
+        this.addressSearchForm.sort = e.key;
+        this.addressSearchForm.order = e.order;
+        this.getPointData();
+      }
+
+      ,
+      walletChangeSort(e) {
+        this.walletSearchForm.sort = e.key;
+        this.walletSearchForm.order = e.order;
+        this.getDepositLogData();
+      },
+      pointChangeSort(e) {
+        this.pointSearchForm.sort = e.key;
+        this.pointSearchForm.order = e.order;
+        this.getPointData();
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.orderSearchForm.startDate = v[0];
+          this.orderSearchForm.endDate = v[1];
+        }
+      },
+    },
+
+    mounted() {
+      this.id = this.$route.query.id;
+      this.init();
+    }
+    ,
+  };
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+  @import "memberDetail.scss";
+
+</style>
diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue
new file mode 100644
index 00000000..aade8248
--- /dev/null
+++ b/manager/src/views/member/list/memberRecycle.vue
@@ -0,0 +1,500 @@
+<template>
+  <div class="search">
+    <Row>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form
+            ref="searchForm"
+            :model="searchForm"
+            inline
+            :label-width="70"
+            class="search-form"
+          >
+            <Form-item label="会员名称" prop="username">
+              <Input
+                type="text"
+                v-model="searchForm.username"
+                placeholder="请输入会员名称"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+
+            <Form-item label="联系方式" prop="mobile">
+              <Input
+                type="text"
+                v-model="searchForm.mobile"
+                placeholder="请输入会员联系方式"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+          </Table>
+
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page
+            :current="searchForm.pageNumber"
+            :total="total"
+            :page-size="searchForm.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+            show-sizer
+          ></Page>
+        </Row>
+      </Card>
+    </Row>
+
+    <!-- 修改模态框 -->
+    <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
+      <Form
+        ref="formValidate"
+        :model="formValidate"
+        :rules="ruleValidate"
+        :label-width="80"
+      >
+        <FormItem label="头像">
+          <img :src="formValidate.face" class="face"/>
+          <Button
+            type="text"
+            class="upload"
+            @click="
+              () => {
+                this.picModelFlag = true;
+                this.$refs.ossManage.selectImage = true;
+              }
+            "
+          >修改
+          </Button
+          >
+          <input
+            type="file"
+            style="display: none"
+            id="file"
+          />
+        </FormItem>
+        <FormItem label="会员名称" prop="name">
+          <Input
+            v-model="formValidate.username"
+            style="width: 200px"
+            disabled
+          />
+        </FormItem>
+        <FormItem label="用户昵称" prop="name">
+          <Input v-model="formValidate.nickName" style="width: 200px"/>
+        </FormItem>
+        <FormItem label="性别" prop="sex">
+          <RadioGroup v-model="formValidate.sex">
+            <Radio :label="1">
+              <span>男</span>
+            </Radio>
+            <Radio :label="0">
+              <span>女</span>
+            </Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="修改密码" prop="password">
+          <Input
+            type="password"
+            style="width: 220px"
+            password
+            v-model="formValidate.newPassword"
+          />
+        </FormItem>
+        <FormItem label="生日" prop="birthday">
+          <DatePicker
+            type="date"
+            format="yyyy-MM-dd"
+            v-model="formValidate.birthday"
+            style="width: 220px"
+          ></DatePicker>
+        </FormItem>
+        <FormItem label="所在地" prop="mail">
+          <div class="form-item" v-if="!updateRegion">
+            <Input disabled style="width: 250px" :value="formValidate.region"/>
+            <Button
+              type="text"
+              @click="
+                () => {
+                  this.updateRegion = !this.updateRegion;
+                }
+              "
+            >修改
+            </Button
+            >
+          </div>
+          <div class="form-item" v-else>
+            <region style="width: 250px" @selected="selectedRegion"/>
+          </div>
+        </FormItem>
+      </Form>
+    </Modal>
+    <Modal width="1200px" v-model="picModelFlag">
+      <ossManage @callback="callbackSelected" ref="ossManage"/>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import region from "@/views/lili-components/region";
+  import * as API_Member from "@/api/member.js";
+  import ossManage from "@/views/sys/oss-manage/ossManage";
+
+
+  export default {
+    name: "memberRecycle",
+    components: {
+      region,
+      ossManage,
+    },
+    data() {
+      return {
+        selectedMember: false, //是否是其他组件调用
+        descTitle: "",
+        descFlag: false, //编辑查看框
+        openSearch: true, // 显示搜索
+        loading: true, // 表单加载状态
+        updateRegion: false,
+        searchForm: {
+          pageNumber: 1,
+          pageSize: 10,
+          order: "desc",
+          username: "",
+          mobile: "",
+          disabled: "CLOSE"
+        },
+        picModelFlag: false,
+        // 表单验证规则
+        formValidate: {},
+        ruleValidate: {}, //修改验证
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "会员名称",
+            align: "left",
+            key: "username",
+            tooltip: true
+
+          },
+          {
+
+            title: "昵称",
+            align: "left",
+            key: "nickName",
+            tooltip: true
+          },
+          {
+            title: "联系方式",
+            width: 130,
+            key: "mobile",
+            render: (h, params) => {
+              if (params.row.mobile == null) {
+                return h('div', [h('span', {}, "")]);
+              } else {
+                return h('div', [h('span', {}, params.row.mobile)]);
+              }
+
+            }
+          },
+          {
+            title: "注册时间",
+            key: "createTime",
+            width: 180
+          },
+
+          {
+            title: "积分数量",
+            align: "left",
+            width: 120,
+            render: (h, params) => {
+              return h(
+                "div",
+                {},
+                params.row.point == void 0 ? "0" : params.row.point
+              );
+            },
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            fixed: "right",
+            render: (h, params) => {
+              return h("div", {
+                style: {
+                  display: "flex",
+                  justifyContent: "center"
+                }
+              }, [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display: this.selectedMember ? "block" : "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.callback(params.row);
+                      },
+                    },
+                  },
+                  "选择"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                      type: "success"
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display: this.selectedMember ? "none" : "block",
+                    },
+                    on: {
+                      click: () => {
+                        this.enable(params.row);
+                      },
+                    },
+                  },
+                  "启用"
+                ),
+
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                      ghost:true
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.editPerm(params.row);
+                      },
+                    },
+                  },
+                  "编辑"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      // 回调给父级
+      callback(val) {
+        this.$emit("callback", val);
+      },
+      init() {
+        this.getData();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getData();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getData();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
+
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getData();
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      //查看详情修改
+      editPerm(val) {
+        this.descTitle = `查看用户 ${val.username}`;
+        this.descFlag = true;
+        this.updateRegion = false
+        this.getMemberInfo(val.id);
+      },
+      /**
+       * 查询查看会员详情
+       */
+      getMemberInfo(id) {
+        API_Member.getMemberInfoData(id).then((res) => {
+          if (res.result) {
+            this.$set(this, "formValidate", res.result);
+          }
+        });
+      },
+      //查询会员列表
+      getData() {
+        API_Member.getMemberListData(this.searchForm).then((res) => {
+          if (res.result.records) {
+            this.loading = false
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+      // 选中的图片
+      callbackSelected(val) {
+        this.picModelFlag = false;
+        this.formValidate.face = val.url;
+      },
+
+      // 选中的地址
+      selectedRegion(val) {
+        this.region = val[1];
+        this.regionId = val[0];
+      },
+
+
+      //禁用会员
+      disabled(v) {
+        let params = {
+          memberIds: [v.id],
+          disabled: "CLOSE"
+        }
+        this.$Modal.confirm({
+          title: '提示',
+          content: '<p>确认禁用此会员？</p>',
+          onOk: () => {
+            API_Member.updateMemberStatus(params).then(res => {
+              if (res.code === 200) {
+                this.$Message.success('禁用成功');
+                this.getData()
+              } else {
+                this.$Message.error(res.message);
+              }
+            });
+          }
+        });
+      },
+      //详细
+      detail(row){
+        this.$router.push({ name: "member-detail", query: { id: row.id } });
+      },
+    //启用会员
+      enable(v) {
+        let params = {
+          memberIds: [v.id],
+          disabled: true
+        }
+        this.$Modal.confirm({
+          title: '提示',
+          content: '<p>启用用此会员？</p>',
+          onOk: () => {
+            API_Member.updateMemberStatus(params).then(res => {
+              if (res.code === 200) {
+                this.$Message.success('禁用成功');
+                this.getData()
+              } else {
+                this.$Message.error(res.message);
+              }
+            });
+          }
+        });
+      },
+
+      // 提交修改数据
+      handleSubmitModal() {
+        const {nickName, sex, username, face, newPassword} = this.formValidate;
+        let time = new Date(this.formValidate.birthday);
+        let birthday =
+          time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
+        let submit = {
+          regionId: this.regionId,
+          region: this.region,
+          nickName,
+          username,
+          sex,
+          birthday,
+          face,
+        };
+        if (newPassword) {
+          submit.password = this.md5(newPassword);
+        }
+        API_Member.updateMember(submit).then((res) => {
+          if (res.result) {
+            this.$Message.success("修改成功！");
+            this.init();
+          }
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+
+  .face {
+    width: 60px;
+    height: 60px;
+    border-radius: 50%;
+  }
+</style>
diff --git a/manager/src/views/member/message-manage/addOrEditMessage.vue b/manager/src/views/member/message-manage/addOrEditMessage.vue
new file mode 100644
index 00000000..80fc0c03
--- /dev/null
+++ b/manager/src/views/member/message-manage/addOrEditMessage.vue
@@ -0,0 +1,202 @@
+<style lang="scss">
+@import "./messageManage.scss";
+</style>
+<template>
+  <div>
+    <Card>
+      <p slot="title">
+        <span v-if="type==0">发送新消息</span>
+        <span v-else>编辑消息</span>
+      </p>
+      <Row>
+        <Form
+          ref="form"
+          :model="form"
+          :label-width="90"
+          :rules="formValidate"
+          style="position:relative"
+        >
+          <FormItem label="消息类型" prop="type">
+            <Select v-model="form.type" placeholder="请选择" style="width:250px">
+              <Option
+                v-for="(item, i) in dictMessageType"
+                :key="i"
+                :value="item.value"
+              >{{item.title}}</Option>
+            </Select>
+          </FormItem>
+          <FormItem label="标题" prop="title">
+            <Input v-model="form.title" style="width:600px" />
+          </FormItem>
+          <FormItem label="内容" prop="content" class="wangEditor">
+            <editor v-model="form.content"></editor>
+          </FormItem>
+          <FormItem label="新创建账号也推送" prop="createSend">
+            <i-switch size="large" v-model="form.createSend">
+              <span slot="open">开启</span>
+              <span slot="close">关闭</span>
+            </i-switch>
+          </FormItem>
+          <div v-if="type==0">
+            <FormItem label="发送范围">
+              <RadioGroup v-model="form.range">
+                <Radio :label="0">全体用户</Radio>
+                <Radio :label="1">指定用户成员</Radio>
+              </RadioGroup>
+            </FormItem>
+            <div>
+              <FormItem label="选择用户" v-if="form.range==1">
+                <user-choose text="选择发送用户" @on-change="handleSelectUser" ref="user"></user-choose>
+              </FormItem>
+            </div>
+          </div>
+          <Form-item class="br">
+            <Button
+              type="primary"
+              :loading="submitLoading"
+              @click="handelSubmit"
+              style="width:100px"
+            >提交</Button>
+            <Button @click="handelCancel">取消</Button>
+          </Form-item>
+          <Spin size="large" fix v-if="loading"></Spin>
+        </Form>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getMessageDataById, addMessage, editMessage } from "@/api/index";
+import editor from "@/views/my-components/lili/editor";
+import userChoose from "@/views/my-components/lili/user-choose";
+export default {
+  name: "add_edit_message",
+  components: {
+    userChoose,
+    editor
+  },
+  data() {
+    return {
+      type: 0,
+      loading: false, // 表单加载状态
+      selectUsers: [],
+      userModalVisible: false,
+      modalTitle: "", // 添加或编辑标题
+      form: {
+        // 添加或编辑表单对象初始化数据
+        title: "",
+        content: "",
+        type: "",
+        range: 0
+      },
+      formValidate: {
+        // 表单验证规则
+       /* type: [
+          { required: true, message: "消息类型不能为空", trigger: "blur" }
+        ],*/
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }]
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      dictMessageType: this.$store.state.dict.messageType,
+      backRoute: ""
+    };
+  },
+  methods: {
+    init() {
+      this.type = this.$route.query.type;
+      this.backRoute = this.$route.query.backRoute;
+      if (this.type == 1) {
+        this.form.id = this.$route.query.id;
+        this.getData();
+      }
+    },
+    getData() {
+      this.loading = true;
+      getMessageDataById(this.form.id).then(res => {
+        this.loading = false;
+        if (res.success) {
+          // 转换null为""
+          let v = res.result;
+          for (let attr in v) {
+            if (v[attr] == null) {
+              v[attr] = "";
+            }
+          }
+          let str = JSON.stringify(v);
+          let data = JSON.parse(str);
+          this.form = data;
+        }
+      });
+    },
+    handelSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.type == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            // 用户id数据
+            let ids = [];
+            this.selectUsers.forEach(e => {
+              ids += e.id + ",";
+            });
+            if (ids.length > 0) {
+              ids = ids.substring(0, ids.length - 1);
+            }
+            this.form.userIds = ids;
+            addMessage(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else if (this.type == 1) {
+            // 编辑
+            editMessage(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    handleSelectUser(v) {
+      this.selectUsers = v;
+    },
+    handelCancel() {
+      this.closeCurrentPage();
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add_edit_message");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.push({
+        name: this.backRoute
+      });
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    // 监听路由变化
+    $route(to, from) {
+      if (to.name == "add_edit_message") {
+        this.type = this.$route.query.type;
+        if (this.type == 1) {
+          this.form.id = this.$route.query.id;
+          this.getData();
+        }
+      }
+    }
+  }
+};
+</script>
diff --git a/manager/src/views/member/message-manage/memberMessageManager.vue b/manager/src/views/member/message-manage/memberMessageManager.vue
new file mode 100644
index 00000000..b4184766
--- /dev/null
+++ b/manager/src/views/member/message-manage/memberMessageManager.vue
@@ -0,0 +1,730 @@
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+<template>
+  <div>
+    <!--短信-->
+    <Modal v-model="smsModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>短信设置</span>
+      </p>
+      <div>
+        <Form ref="smsFormData" :model="smsFormData" label-position="left" :label-width="100" :rules="smsFormValidate">
+          <FormItem label="模板名称" prop="templateName">
+            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
+          </FormItem>
+          <FormItem label="模板代码" prop="smsCode">
+            <Input v-model="smsFormData.smsCode" size="large" maxlength="30"></Input>
+          </FormItem>
+          <FormItem label="模板名称" prop="smsContent">
+            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="smsFormData.smsContent" type="textarea" maxlength="150"/>
+          </FormItem>
+          <FormItem label="是否开启" prop="smsState">
+            <i-switch v-model="smsFormData.smsState" size="large" :value="smsFormData.smsState">
+              <span slot="open">开启</span>
+              <span slot="close">关闭</span>
+            </i-switch>
+          </FormItem>
+        </Form>
+
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large"  @click="smsFormDataEdit">设置</Button>
+      </div>
+    </Modal>
+    <!--站内信-->
+    <Modal v-model="noticeModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>站内信设置</span>
+      </p>
+      <div>
+        <Form ref="noticeFormData" :model="noticeFormData" label-position="left" :label-width="100" :rules="noticeFormValidate">
+          <FormItem label="模板名称" prop="templateName">
+            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
+          </FormItem>
+          <FormItem label="模板名称" prop="smsContent">
+            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="noticeFormData.noticeContent" type="textarea" maxlength="150"/>
+          </FormItem>
+        </Form>
+
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large"  @click="noticeFormDataEdit">设置</Button>
+      </div>
+    </Modal>
+
+    <!--微信模板-->
+    <Modal v-model="wechatModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>微信设置</span>
+      </p>
+      <div>
+        <Form ref="wechatFormData" :model="wechatFormData" label-position="left" :label-width="100" :rules="wechatFormValidate">
+          <FormItem label="模板名称" prop="templateName">
+            <Input v-model="templateName" size="large" maxlength="9" disabled></Input>
+          </FormItem>
+          <FormItem label="头部信息" prop="first">
+            <Input v-model="wechatFormData.first" size="large" maxlength="50"></Input>
+          </FormItem>
+          <FormItem label="备注" prop="remark">
+            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="wechatFormData.remark" type="textarea" maxlength="150"/>
+          </FormItem>
+          <FormItem label="是否开启" prop="enable">
+            <i-switch v-model="wechatFormData.enable" size="large" :value="smsFormData.enable">
+              <span slot="open">开启</span>
+              <span slot="close">关闭</span>
+            </i-switch>
+          </FormItem>
+        </Form>
+
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large"  @click="wechatFormDataEdit">设置</Button>
+      </div>
+    </Modal>
+    <Tabs value="log" @on-click="tabPaneChange" v-model="tab">
+      <TabPane label="会员消息" name="MEMBER">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="getDataList" icon="md-refresh">刷新</Button>
+              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+            </Row>
+            <Row v-show="openTip">
+              <Alert show-icon>
+                已选择
+                <span class="select-count">{{selectCount}}</span> 项
+                <a class="select-clear" @click="clearSelectAll">清空</a>
+              </Alert>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="columns"
+                :data="data"
+                sortable="custom"
+                @on-sort-change="changeSort"
+                @on-selection-change="showSelect"
+                ref="memberTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="searchForm.pageNumber"
+                :total="total"
+                :page-size="searchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+      <TabPane label="店铺消息" name="SHOP">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="getDataList" icon="md-refresh">刷新</Button>
+              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+            </Row>
+            <Row v-show="openTip">
+              <Alert show-icon>
+                已选择
+                <span class="select-count">{{selectCount}}</span> 项
+                <a class="select-clear" @click="clearSelectAll">清空</a>
+              </Alert>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="columns"
+                :data="data"
+                sortable="custom"
+                @on-sort-change="changeSort"
+                @on-selection-change="showSelect"
+                ref="shopTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="searchForm.pageNumber"
+                :total="total"
+                :page-size="searchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+
+      <TabPane label="微信消息" name="WECHAT">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="weChatSync" type="primary" icon="md-add">同步微信消息</Button>
+              <Button @click="getDataList" icon="md-refresh">刷新</Button>
+              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+            </Row>
+            <Row v-show="openTip">
+              <Alert show-icon>
+                已选择
+                <span class="select-count">{{selectCount}}</span> 项
+                <a class="select-clear" @click="clearSelectAll">清空</a>
+              </Alert>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="weChatColumns"
+                :data="weChatData"
+                sortable="custom"
+                @on-sort-change="changeSort"
+                @on-selection-change="showSelect"
+                ref="weChatTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="weChatSearchForm.pageNumber"
+                :total="weChatTotal"
+                :page-size="weChatSearchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+
+      <TabPane label="其他消息" name="OTHER">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="getDataList" icon="md-refresh">刷新</Button>
+              <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+            </Row>
+            <Row v-show="openTip">
+              <Alert show-icon>
+                已选择
+                <span class="select-count">{{selectCount}}</span> 项
+                <a class="select-clear" @click="clearSelectAll">清空</a>
+              </Alert>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="columns"
+                :data="data"
+                sortable="custom"
+                @on-sort-change="changeSort"
+                @on-selection-change="showSelect"
+                ref="otherTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="searchForm.pageNumber"
+                :total="total"
+                :page-size="searchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+    </Tabs>
+  </div>
+
+
+</template>
+
+<script>
+  import {
+    getMessageData,
+    editSmsMessageTemplate,
+    editNoticeMessageTemplate,
+    wechatMessageSync,
+    getWechatMessagePage,
+    editWechatMessageTemplate,
+    delWechatMessageTemplate
+  } from "@/api/setting";
+
+  export default {
+    title: "message-manage",
+    data() {
+      return {
+        messageTemplate:'',//当前消息模板
+        messageTemplateId:'',
+        templateName:'',
+        smsModal: false,//短信
+        smsFormData:{
+          smsState:'',
+          smsContent:'',
+          smsCode: ''
+        },
+        smsFormValidate:{
+          smsCode: [{ required: true, message: '请输入短信编码'}],
+          smsContent: [{ required: true, message: '请输入短信内容'}],
+        },
+        noticeModal: false,//站内信
+        noticeFormData:{
+          noticeContent:''
+        },
+        noticeFormValidate:{
+          noticeContent: [{ required: true, message: '请输入站内信内容'}],
+        },
+        wechatModal:false,//微信消息
+        wechatFormData:{
+          remark:'',
+          first:'',
+          enable:'',
+        },
+        wechatFormValidate:{
+          remark: [{ required: true, message: '请输入站内信内容'}],
+          first: [{ required: true, message: '请输入头部文字信息'}],
+        },
+        tab: "MEMBER",
+        openTip: true,
+        loading: true, // 表单加载状态
+        userLoading: true,
+        selectCount: 0, // 多选计数
+        selectList: [], // 多选数据
+        drop: false,
+        dropDownContent: "展开",
+        dropDownIcon: "ios-arrow-down",
+        searchForm: {
+          // 搜索框对应data对象
+          type: "MEMBER",
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "" // 终止时间
+        },
+        //微信消息查询
+        weChatSearchForm: {
+          // 搜索框对应data对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        selectDate: null, // 选择日期绑定modal
+        columns: [
+          // 表头
+          {
+            type: "selection",
+            width: 60,
+            align: "center"
+          },
+          {
+            title: "ID",
+            key: "id",
+            width: 180,
+            sortable: true
+          },
+          {
+            title: "模板名称",
+            key: "name",
+            width: 300,
+            sortable: true
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            sortable: true,
+            sortType: "desc"
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 280,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.smsSettingAlert(params.row);
+                      }
+                    }
+                  },
+                  "短信设置"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.noticeSettingAlert(params.row);
+                      }
+                    }
+                  },
+                  "站内信设置"
+                )
+              ]);
+            }
+          }
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+        weChatColumns: [
+          // 表头
+          {
+            type: "selection",
+            width: 60,
+            align: "center"
+          },
+          {
+            title: "模板编号",
+            key: "code",
+            width: 500,
+            sortable: true
+          },
+          {
+            title: "是否开启",
+            key: "enable",
+            sortable: true,
+            width: 150,
+            render: (h, params) => {
+              if (params.row.enable == true) {
+                return h('div', [
+                  h('span', {
+                  }, '开启'),
+                ]);
+              }  else {
+                return h('div', [
+                  h('span', {
+                  }, '关闭'),
+                ]);
+              }
+            },
+          },
+          {
+            title: "模板名称",
+            key: "name",
+            width: 200,
+            sortable: true
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            sortable: true,
+            sortType: "desc",
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 200,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.wechatSettingAlert(params.row);
+                      }
+                    }
+                  },
+                  "编辑"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.delWeChat(params.row);
+                      }
+                    }
+                  },
+                  "删除"
+                )
+              ]);
+            }
+          }
+        ],
+        weChatData: [], // 表单数据
+        weChatTotal: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      dropDown() {
+        if (this.drop) {
+          this.dropDownContent = "展开";
+          this.dropDownIcon = "ios-arrow-down";
+        } else {
+          this.dropDownContent = "收起";
+          this.dropDownIcon = "ios-arrow-up";
+        }
+        this.drop = !this.drop;
+      },
+      changePage(v) {
+        this.searchForm.type = this.tab;
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.type = this.tab;
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      //短信设置弹出框
+      smsSettingAlert(v){
+        this.smsFormData.smsState = v.smsState == 'OPEN' ? true:false
+        this.smsFormData.smsContent = v.smsContent
+        this.smsFormData.smsCode = v.smsCode
+        this.templateName = v.name
+        this.messageTemplateId = v.id
+        this.smsModal = true
+      },
+      //站内信弹出框
+      noticeSettingAlert(v){
+        this.noticeFormData.noticeContent = v.noticeContent
+        this.templateName = v.name
+        this.messageTemplateId = v.id
+        this.noticeModal = true
+      },
+      //微信弹出框
+      wechatSettingAlert(v){
+        this.wechatFormData.remark = v.remark
+        this.wechatFormData.first = v.first
+        this.wechatFormData.enable = v.enable
+        this.templateName = v.name
+        this.messageTemplateId = v.id
+        this.wechatModal = true
+      },
+      //短信设置保存
+      smsFormDataEdit(){
+        this.$refs['smsFormData'].validate((valid) => {
+          if (valid) {
+             if(this.smsFormData.smsState){
+               this.smsFormData.smsState = "OPEN"
+             }else{
+               this.smsFormData.smsState = "CLOSE"
+             }
+            editSmsMessageTemplate(this.messageTemplateId,this.smsFormData).then(res => {
+              if(res.message === 'success') {
+                this.$Message.success('短信模板修改成功');
+                this.smsModal = false;
+                this.getDataList();
+              }
+            });
+          }
+        })
+      },
+      //微信设置保存
+      wechatFormDataEdit(){
+        this.$refs['wechatFormData'].validate((valid) => {
+          if (valid) {
+            editWechatMessageTemplate(this.messageTemplateId,this.wechatFormData).then(res => {
+              if(res.message === 'success') {
+                this.$Message.success('微信模板修改成功');
+                this.wechatModal = false;
+                this.getWechatMessagePage();
+              }
+            });
+          }
+        })
+      },
+      //站内信设置保存
+      noticeFormDataEdit(){
+        this.$refs['noticeFormData'].validate((valid) => {
+          if (valid) {
+            editNoticeMessageTemplate(this.messageTemplateId,this.noticeFormData).then(res => {
+              if(res.message === 'success') {
+                this.$Message.success('站内信修改成功');
+                this.noticeModal = false;
+                this.getDataList();
+              }
+            });
+          }
+        })
+      },
+      //同步微信消息
+      weChatSync(){
+        this.$Modal.confirm({
+          title: "提示",
+          // 记得确认修改此处
+          content: "确认要同步微信消息模板?",
+          loading: true,
+          onOk: () => {
+            // 同步微信消息模板
+            wechatMessageSync().then(res => {
+              this.$Modal.remove();
+              if(res.success) {
+                this.$Message.success('微信消息模板同步成功');
+              }
+            });
+          }
+        });
+
+      },
+      //删除微信模消息
+      delWeChat(v){
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定删除此模板?",
+          loading: true,
+          onOk: () => {
+            // 删除微信消息模板
+            delWechatMessageTemplate(v.id).then(res => {
+              if(res.success) {
+                this.$Modal.remove();
+                this.$Message.success('微信模板删除成功');
+                this.getWechatMessagePage()
+              }
+            });
+          }
+        });
+
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        getMessageData(this.searchForm).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+      //分页获取微信消息
+      getWechatMessagePage(){
+        getWechatMessagePage(this.weChatSearchForm).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.weChatData = res.result.records;
+            this.weChatTotal = res.result.total;
+          }
+        });
+      },
+      //tab切换事件
+      tabPaneChange(v) {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.searchForm.type = v;
+        //如果是微信消息则走单独的接口
+        if(v === "WECHAT"){
+          this.getWechatMessagePage();
+        }else{
+          this.getDataList();
+        }
+
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.selectDate = null;
+        this.searchForm.startDate = "";
+        this.searchForm.endDate = "";
+        // 重新加载数据
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order == "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      showSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      clearSelectAll() {
+        this.$refs.memberTable.selectAll(false);
+        this.$refs.weChatTable.selectAll(false);
+        this.$refs.shopTable.selectAll(false);
+        this.$refs.otherTable.selectAll(false);
+
+      }
+    },
+    mounted() {
+      this.init();
+    }
+  };
+</script>
diff --git a/manager/src/views/member/message-manage/messageManage.scss b/manager/src/views/member/message-manage/messageManage.scss
new file mode 100644
index 00000000..f3ff14f7
--- /dev/null
+++ b/manager/src/views/member/message-manage/messageManage.scss
@@ -0,0 +1,5 @@
+.wangEditor {
+    .ivu-form-item-content {
+        line-height: unset !important;
+    }
+}
\ No newline at end of file
diff --git a/manager/src/views/member/message-manage/messageManage.vue b/manager/src/views/member/message-manage/messageManage.vue
new file mode 100644
index 00000000..841f960c
--- /dev/null
+++ b/manager/src/views/member/message-manage/messageManage.vue
@@ -0,0 +1,417 @@
+<style lang="scss">
+@import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70">
+          <Form-item label="消息标题" prop="title">
+            <Input
+              type="text"
+              v-model="searchForm.title"
+              placeholder="请输入消息标题"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="消息内容" prop="content">
+            <Input
+              type="text"
+              v-model="searchForm.content"
+              placeholder="请输入消息内容"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <span v-if="drop">
+            <Form-item label="消息类型" prop="type">
+              <Select
+                v-model="searchForm.type"
+                placeholder="请选择消息类型"
+                clearable
+                style="width: 200px"
+              >
+                <Option
+                  v-for="(item, i) in dictMessageType"
+                  :key="i"
+                  :value="item.value"
+                >{{item.title}}</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="创建时间">
+              <DatePicker
+                v-model="selectDate"
+                type="daterange"
+                format="yyyy-MM-dd"
+                clearable
+                @on-change="selectDateRange"
+                placeholder="选择起始时间"
+                style="width: 200px"
+              ></DatePicker>
+            </Form-item>
+          </span>
+          <Form-item style="margin-left:-35px;" class="br">
+            <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+            <Button @click="handleReset">重置</Button>
+            <a class="drop-down" @click="dropDown">
+              {{dropDownContent}}
+              <Icon :type="dropDownIcon"></Icon>
+            </a>
+          </Form-item>
+        </Form>
+      </Row>
+      <Row class="operation">
+        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
+        <Button @click="delAll" icon="md-trash">批量删除撤回</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openSearch=!openSearch">{{openSearch ? "关闭搜索" : "开启搜索"}}</Button>
+        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择
+          <span class="select-count">{{selectCount}}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="showSelect"
+          ref="table"
+        ></Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  getMessageData,
+  addMessage,
+  editMessage,
+  deleteMessage
+} from "@/api/index";
+export default {
+  title: "message-manage",
+  data() {
+    return {
+      openSearch: true,
+      openTip: true,
+      loading: true, // 表单加载状态
+      userLoading: true,
+      selectCount: 0, // 多选计数
+      selectList: [], // 多选数据
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框对应data对象
+        title: "",
+        content: "",
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "" // 终止时间
+      },
+      selectDate: null, // 选择日期绑定modal
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          type: "index",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "消息标题",
+          key: "title",
+          width: 200,
+          sortable: true
+        },
+        {
+          title: "消息内容",
+          key: "content",
+          minWidth: 275,
+          tooltip: true
+        },
+        {
+          title: "类型",
+          key: "type",
+          width: 120,
+          align: "center"
+        },
+        {
+          title: "新创建账号推送",
+          key: "createSend",
+          align: "center",
+          width: 135,
+          render: (h, params) => {
+            if (params.row.createSend) {
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "blue"
+                    }
+                  },
+                  "开启"
+                )
+              ]);
+            } else {
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "default"
+                    }
+                  },
+                  "关闭"
+                )
+              ]);
+            }
+          }
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          width: 180,
+          sortable: true,
+          sortType: "desc"
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 280,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    }
+                  }
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.sendDetail(params.row);
+                    }
+                  }
+                },
+                "查看发送详情"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "删除撤回"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      dictMessageType: this.$store.state.dict.messageType
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      getMessageData(this.searchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order == "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    add() {
+      let query = { type: 0, backRoute: this.$route.name };
+      this.$router.push({
+        name: "add_edit_message",
+        query: query
+      });
+    },
+    edit(v) {
+      let query = { type: 1, id: v.id, backRoute: this.$route.name };
+      this.$router.push({
+        name: "add_edit_message",
+        query: query
+      });
+    },
+    sendDetail(v) {
+      let query = { id: v.id };
+      this.$router.push({
+        name: "message_send_detail",
+        query: query
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.title + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deleteMessage(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        }
+      });
+    },
+    showSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function(e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          deleteMessage(ids).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
diff --git a/manager/src/views/member/message-manage/messageSendDetail.vue b/manager/src/views/member/message-manage/messageSendDetail.vue
new file mode 100644
index 00000000..08a76669
--- /dev/null
+++ b/manager/src/views/member/message-manage/messageSendDetail.vue
@@ -0,0 +1,327 @@
+<style lang="scss">
+@import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" inline :label-width="90">
+          <Form-item label="发送用户ID" prop="userId">
+            <Input
+              type="text"
+              v-model="userId"
+              placeholder="请输入发送用户完整ID"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="发送状态" prop="status">
+            <Select v-model="status" placeholder="请选择" style="width: 200px" clearable>
+              <Option value="0">未读</Option>
+              <Option value="1">已读</Option>
+              <Option value="2">回收站</Option>
+            </Select>
+          </Form-item>
+          <Form-item style="margin-left:-35px;" class="br">
+            <Button @click="getDataList" type="primary" icon="ios-search">搜索</Button>
+            <Button @click="handleReset">重置</Button>
+          </Form-item>
+        </Form>
+      </Row>
+      <Row class="operation">
+        <Button v-hasRole="'ROLE_ADMIN'" @click="delAll" icon="md-trash">批量删除</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openSearch=!openSearch">{{openSearch ? "关闭搜索" : "开启搜索"}}</Button>
+        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择
+          <span class="select-count">{{selectCount}}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="pageNumber"
+          :total="total"
+          :page-size="pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getMessageSendData, deleteMessageSend } from "@/api/index";
+export default {
+  name: "message_send_detail",
+  data() {
+    return {
+      openSearch: true,
+      openTip: true,
+      loading: true, // 表单加载状态
+      messageId: "",
+      sortColumn: "createTime", // 排序字段
+      sortType: "desc", // 排序方式
+      status: "", // 发送状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          type: "index",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "发送消息标题",
+          key: "title"
+        },
+        {
+          title: "发送用户",
+          key: "username",
+          sortable: true
+        },
+        {
+          title: "状态",
+          key: "status",
+          align: "center",
+          sortable: true,
+          render: (h, params) => {
+            if (params.row.status == 0) {
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "default"
+                    }
+                  },
+                  "未读"
+                )
+              ]);
+            } else if (params.row.status == 1) {
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "green"
+                    }
+                  },
+                  "已读"
+                )
+              ]);
+            } else if (params.row.status == 2) {
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "orange"
+                    }
+                  },
+                  "回收站"
+                )
+              ]);
+            }
+          }
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          sortable: true,
+          sortType: "desc"
+        },
+        {
+          title: "更新时间",
+          key: "updateTime",
+          sortable: true
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                      icon: "md-trash"
+                    },
+                    on: {
+                      click: () => {
+                        this.remove(params.row);
+                      }
+                    }
+                  },
+                  "删除"
+                )
+              ]);
+            }
+        }
+      ],
+      data: [], // 表单数据
+      pageNumber: 1, // 当前页数
+      pageSize: 10, // 页面大小
+      total: 0, // 表单数据总数
+      userId: ""
+    };
+  },
+  methods: {
+    init() {
+      this.messageId = this.$route.query.id;
+      this.getDataList();
+    },
+    changePage(v) {
+      this.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.pageSize = v;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.sortColumn = e.key;
+      this.sortType = e.order;
+      if (e.order == "normal") {
+        this.sortType = "";
+      }
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    getDataList(v) {
+      this.loading = true;
+      if (v == 0) {
+        this.userId = "";
+      }
+      let params = {
+        pageNumber: this.pageNumber,
+        pageSize: this.pageSize,
+        sort: this.sortColumn,
+        order: this.sortType,
+        messageId: this.messageId,
+        status: this.status,
+        userId: this.userId
+      };
+      // 避免后台默认值
+      if (!params.status) {
+        params.status = "";
+      }
+      getMessageSendData(params).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    handleReset() {
+      this.userId = "";
+      this.status = "";
+      this.getDataList();
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除该条数据?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deleteMessageSend(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        }
+      });
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function(e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          deleteMessageSend(ids).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        }
+      });
+    }
+  },
+  watch: {
+    // 监听路由变化通过id获取数据
+    $route(to, from) {
+      if (to.name == "message_send_detail") {
+        this.messageId = this.$route.query.id;
+        this.getDataList();
+      }
+    }
+  },
+  mounted() {
+    this.init();
+    this.$Modal.info({
+      title: "提示",
+      content: "该页面已根据用户角色隐藏操作按钮"
+    });
+  }
+};
+</script>
diff --git a/manager/src/views/member/message-manage/weChatMessageManager.vue b/manager/src/views/member/message-manage/weChatMessageManager.vue
new file mode 100644
index 00000000..061eedd2
--- /dev/null
+++ b/manager/src/views/member/message-manage/weChatMessageManager.vue
@@ -0,0 +1,404 @@
+<style lang="less">
+@import "@/styles/table-common.scss";
+</style>
+<template>
+  <div>
+    <!--微信模板-->
+    <Modal v-model="wechatModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>微信设置</span>
+      </p>
+      <div>
+        <Form ref="wechatFormData" :model="wechatFormData" label-position="left" :label-width="100">
+          <FormItem v-if="tab === 'WECHAT'" label="模板名称">
+            <Input v-model="wechatFormData.name" size="large" maxlength="9" disabled></Input>
+          </FormItem>
+          <FormItem v-if="tab === 'WECHAT'" label="头部信息" prop="first">
+            <Input v-model="wechatFormData.first" size="large" maxlength="50"></Input>
+          </FormItem>
+          <FormItem v-if="tab === 'WECHAT'" label="备注" prop="remark">
+            <Input class='textarea' :rows="5" :autosize="{maxRows:5,minRows: 5}" v-model="wechatFormData.remark"
+                   type="textarea" maxlength="150"/>
+          </FormItem>
+          <FormItem label="是否开启" prop="enable">
+            <i-switch v-model="wechatFormData.enable" size="large">
+              <span slot="open">开启</span>
+              <span slot="close">关闭</span>
+            </i-switch>
+          </FormItem>
+        </Form>
+
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button v-if="tab === 'WECHAT'" type="success" size="large" @click="wechatFormDataEdit">保存</Button>
+
+        <Button v-else type="success" size="large" @click="wechatMPFormDataEdit">保存</Button>
+      </div>
+    </Modal>
+
+
+    <Tabs @on-click="tabPaneChange" v-model="tab">
+      <TabPane label="微信消息" name="WECHAT">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="weChatSync" type="primary">同步微信消息</Button>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="weChatColumns"
+                :data="weChatData"
+                ref="weChatTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="weChatSearchForm.pageNumber"
+                :total="weChatTotal"
+                :page-size="weChatSearchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+
+      <TabPane label="微信小程序订阅消息" name="WECHATMP">
+        <div class="search">
+          <Card>
+
+            <Row class="operation">
+              <Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button>
+            </Row>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="weChatColumns"
+                :data="weChatMPData"
+                sortable="custom"
+                ref="weChatMPTable"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="weChatMPSearchForm.pageNumber"
+                :total="weChatMPTotal"
+                :page-size="weChatMPSearchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10,20,50]"
+                size="small"
+              ></Page>
+            </Row>
+          </Card>
+        </div>
+      </TabPane>
+    </Tabs>
+  </div>
+
+
+</template>
+
+<script>
+import {
+  wechatMessageSync,
+  getWechatMessagePage,
+  editWechatMessageTemplate,
+  delWechatMessageTemplate,
+
+  wechatMPMessageSync,
+  getWechatMPMessagePage,
+  editWechatMPMessageTemplate,
+  delWechatMPMessageTemplate
+} from "@/api/setting";
+
+export default {
+  title: "wechat-message-manage",
+  data() {
+    return {
+
+      wechatModal: false,//微信消息
+      wechatFormData: {},
+      wechatMPModal: false,//微信消息
+      wechatMPFormData: {},
+      tab: "WECHAT",
+      searchForm: {
+        type: "WECHAT"
+      },
+      openTip: true,
+      loading: true, // 表单加载状态
+      name: '',
+      id: '',
+      userLoading: true,
+      selectCount: 0, // 多选计数
+      selectList: [], // 多选数据
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      //微信消息查询
+      weChatSearchForm: {
+        // 搜索框对应data对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      weChatMPSearchForm: {
+        // 搜索框对应data对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      weChatColumns: [
+        {
+          title: "模板编号",
+          key: "code",
+          width: 500,
+          sortable: true
+        },
+        {
+          title: "是否开启",
+          key: "enable",
+          sortable: true,
+          width: 150,
+          render: (h, params) => {
+            if (params.row.enable == true) {
+              return h('div', [
+                h('span', {}, '开启'),
+              ]);
+            } else {
+              return h('div', [
+                h('span', {}, '关闭'),
+              ]);
+            }
+          },
+        },
+        {
+          title: "模板名称",
+          key: "name",
+          width: 200,
+          sortable: true
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          sortable: true,
+          sortType: "desc",
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 200,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.wechatSettingAlert(params.row);
+                    }
+                  }
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.delWeChat(params.row);
+                    }
+                  }
+                },
+                "删除"
+              )
+            ]);
+          }
+        }
+      ],
+      weChatData: [], // 表单数据
+      weChatMPData: [], // 表单数据
+      weChatTotal: 0, // 表单数据总数
+      weChatMPTotal: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.type = this.tab;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.type = this.tab;
+      this.getDataList();
+    },
+    //微信弹出框
+    wechatSettingAlert(v) {
+      this.wechatFormData = v
+      this.id = v.id
+      this.wechatModal = true
+    },
+
+    //同步微信消息
+    weChatSync(mp) {
+      this.$Modal.confirm({
+        title: "提示",
+        // 记得确认修改此处
+        content: "确认要初始化微信小程序消息订阅?",
+        loading: true,
+        onOk: () => {
+          // 同步微信消息模板
+
+          if (mp === "mp") {
+            wechatMPMessageSync().then(res => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success('微信小程序消息订阅初始化');
+              }
+            });
+          } else {
+            // 同步微信消息模板
+            wechatMessageSync().then(res => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success('微信消息模板初始化成功');
+              }
+            });
+          }
+        }
+      });
+    },
+    //微信设置保存
+    wechatFormDataEdit() {
+      this.$refs['wechatFormData'].validate((valid) => {
+        if (valid) {
+          editWechatMessageTemplate(this.id, this.wechatFormData).then(res => {
+            if (res.message === 'success') {
+              this.$Message.success('微信模板修改成功');
+              this.wechatModal = false;
+              this.getWechatMessagePage();
+            }
+          });
+        }
+      })
+    },
+    wechatMPFormDataEdit() {
+      this.$refs['wechatFormData'].validate((valid) => {
+        if (valid) {
+          editWechatMPMessageTemplate(this.id, this.wechatMPFormData).then(res => {
+            if (res.message === 'success') {
+              this.$Message.success('微信消息订阅模板修改成功');
+              this.wechatModal = false;
+              this.getWechatMessagePage();
+            }
+          });
+        }
+      })
+    },
+
+    //删除微信模消息
+    delWeChat(v) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "确定删除此模板?",
+        loading: true,
+        onOk: () => {
+          // 删除微信消息模板
+          if (this.tab === "WECHAT") {
+            delWechatMessageTemplate(v.id).then(res => {
+              if (res.success) {
+                this.$Modal.remove();
+                this.$Message.success('微信模板删除成功');
+                this.getWechatMessagePage()
+              }
+            });
+          } else {
+            delWechatMPMessageTemplate(v.id).then(res => {
+              if (res.success) {
+                this.$Modal.remove();
+                this.$Message.success('微信消息订阅删除成功');
+                this.getWechatMessagePage()
+              }
+            });
+          }
+        }
+      });
+
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      getWechatMessagePage(this.searchWe).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.weChatData = res.result.records;
+          this.weChatTotal = res.result.total;
+        }
+      });
+    },
+    //分页获取微信消息
+    getWechatMessagePage() {
+      getWechatMessagePage(this.weChatSearchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.weChatData = res.result.records;
+          this.weChatTotal = res.result.total;
+        }
+      });
+    },
+    //分页获取微信小程序消息订阅
+    getWechatMPMessagePage() {
+      getWechatMPMessagePage(this.weChatMPSearchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.weChatMPData = res.result.records;
+          this.weChatMPTotal = res.result.total;
+        }
+      });
+    },
+    //tab切换事件
+    tabPaneChange(v) {
+      this.searchForm.type = v;
+      //如果是微信消息则走单独的接口
+      if (v === "WECHAT") {
+        this.getWechatMessagePage();
+      } else if (v === "WECHATMP") {
+        this.getWechatMPMessagePage();
+      }
+
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
diff --git a/manager/src/views/member/notice/addMessage.vue b/manager/src/views/member/notice/addMessage.vue
new file mode 100644
index 00000000..c987c79f
--- /dev/null
+++ b/manager/src/views/member/notice/addMessage.vue
@@ -0,0 +1,213 @@
+<style lang="scss"  scoped>
+@import "../message-manage/messageManage.scss";
+</style>
+<template>
+  <div>
+    <Card>
+      <p slot="title">
+        <span v-if="type==0">发送新消息</span>
+        <span v-else>编辑消息</span>
+      </p>
+      <Row>
+        <Form
+          ref="form"
+          :model="form"
+          :label-width="90"
+          :rules="formValidate"
+          style="position:relative"
+        >
+          <FormItem label="标题" prop="title">
+            <Input v-model="form.title" style="width:600px" />
+          </FormItem>
+          <FormItem label="内容" prop="content" class="wangEditor">
+            <editor v-model="form.content"></editor>
+          </FormItem>
+          <div v-if="type==0">
+            <FormItem label="发送范围">
+              <RadioGroup v-model="form.sendType" >
+                <Radio label="ALL">全部会员</Radio>
+                <Radio label="SELECT">指定会员</Radio>
+              </RadioGroup>
+            </FormItem>
+            <div>
+              <FormItem label="选择用户" v-if="form.sendType==='SELECT'">
+                <member-choose text="选择发送用户" @on-change="handleSelectUser"></member-choose>
+              </FormItem>
+            </div>
+          </div>
+          <Form-item class="br">
+            <Button
+              type="primary"
+              :loading="submitLoading"
+              @click="handleSubmit"
+              style="width:100px"
+            >提交</Button>
+            <Button @click="handelCancel">取消</Button>
+          </Form-item>
+          <Spin size="large" fix v-if="loading"></Spin>
+        </Form>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import editor from "@/views/my-components/lili/editor";
+import memberChoose from "@/views/my-components/lili/member-choose";
+export default {
+  name: "add_message",
+  components: {
+    memberChoose,
+    editor
+  },
+  data() {
+    return {
+      type: 0,
+      loading: false, // 表单加载状态
+      selectUsers: [],
+      userModalVisible: false,
+      modalTitle: "", // 添加或编辑标题
+      form: {
+        // 添加或编辑表单对象初始化数据
+        title: "",
+        content: "",
+        sendType: "ALL",
+        memberIds: ""
+      },
+      formValidate: {
+        // 表单验证规则
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }]
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      dictMessageType: this.$store.state.dict.messageType,
+      backRoute: ""
+    };
+  },
+  methods: {
+    init() {
+      this.type = this.$route.query.type;
+      this.backRoute = this.$route.query.backRoute;
+      if (this.type == 1) {
+        this.form.id = this.$route.query.id;
+        this.getData();
+      }
+    },
+    getData() {
+      this.loading = true;
+      getMessageDataById(this.form.id).then(res => {
+        this.loading = false;
+        if (res.success) {
+          // 转换null为""
+          let v = res.result;
+          for (let attr in v) {
+            if (v[attr] == null) {
+              v[attr] = "";
+            }
+          }
+          let str = JSON.stringify(v);
+          let data = JSON.parse(str);
+          this.form = data;
+        }
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
+
+        let ids = [];
+        this.selectUsers.forEach(e => {
+          ids += e.id + ",";
+        });
+        if (ids.length > 0) {
+          ids = ids.substring(0, ids.length - 1);
+        }
+        this.form.memberIds = ids;
+
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    handelSubmit() {
+      console.log()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.type == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            // 用户id数据
+
+            addMessage(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else if (this.type == 1) {
+            // 编辑
+            editMessage(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    handleSelectUser(v) {
+      this.selectUsers = v;
+    },
+    handelCancel() {
+      this.closeCurrentPage();
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add_message");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.push({
+        name: this.backRoute
+      });
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    // 监听路由变化
+    $route(to, from) {
+      if (to.name == "member-notice-sender") {
+        this.type = this.$route.query.type;
+        if (this.type == 1) {
+          this.form.id = this.$route.query.id;
+          this.getData();
+        }
+      }
+    }
+  }
+};
+</script>
diff --git a/manager/src/views/member/notice/sender.vue b/manager/src/views/member/notice/sender.vue
new file mode 100644
index 00000000..06c763e1
--- /dev/null
+++ b/manager/src/views/member/notice/sender.vue
@@ -0,0 +1,342 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row @keydown.enter.native="handleSearch">
+                        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+                            <Form-item label="标题" prop="title">
+                                <Input type="text" v-model="searchForm.title" placeholder="请输入标题" clearable style="width: 200px"/>
+                            </Form-item>
+                            <Form-item label="消息内容" prop="content">
+                                <Input type="text" v-model="searchForm.content" placeholder="请输入消息内容" clearable style="width: 200px"/>
+                            </Form-item>
+                            <span v-if="drop">
+                <Form-item label="发送类型" prop="sendType">
+                  <Select v-model="searchForm.sendType" placeholder="请选择" clearable style="width: 200px">
+                    <Option value="ALL">全站会员</Option>
+                    <Option value="SELECT">指定会员</Option>
+                  </Select>
+                </Form-item>
+                <Form-item label="创建人" prop="createBy">
+                  <Input type="text" v-model="searchForm.createBy" placeholder="请输入创建人" clearable style="width: 200px"/>
+                </Form-item>
+              </span>
+                            <Form-item style="margin-left:-35px;" class="br">
+                                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+                                <Button @click="handleReset">重置</Button>
+                                <a class="drop-down" @click="dropDown">
+                                    {{dropDownContent}}
+                                    <Icon :type="dropDownIcon"></Icon>
+                                </a>
+                            </Form-item>
+                        </Form>
+                    </Row>
+                    <Row class="operation">
+                        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
+                        <Button @click="delAll" icon="md-trash">批量删除</Button>
+                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                    </Row>
+                    <Row v-show="openTip">
+                        <Alert show-icon>
+                            已选择 <span class="select-count">{{selectCount}}</span> 项
+                            <a class="select-clear" @click="clearSelectAll">清空</a>
+                        </Alert>
+                    </Row>
+                    <Row>
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "member-notice-sender",
+        components: {
+        },
+        data() {
+            return {
+                openSearch: true, // 显示搜索
+                openTip: true, // 显示提示
+                loading: true, // 表单加载状态
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                drop: false,
+                dropDownContent: "展开",
+                dropDownIcon: "ios-arrow-down",
+                searchForm: { // 搜索框初始化对象
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                },
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    // 表头
+                    {
+                        type: "selection",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        type: "index",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        title: "标题",
+                        key: "title",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "发送类型",
+                        key: "sendType",
+                        minWidth: 120,
+                        sortable: false,
+
+                        render: (h, params) => {
+                            if (params.row.sendType == "ALL") {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "全部会员"
+                                        }
+                                    })
+                                ]);
+                            }else{
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "指定会员"
+                                        }
+                                    })
+                                ]);
+                            }
+                        }
+
+                    },
+                    {
+                        title: "创建人",
+                        key: "createBy",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "创建时间",
+                        key: "createTime",
+                        minWidth: 120,
+                        sortable: true,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        width: 200,
+                        render: (h, params) => {
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                            icon: "md-trash"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.remove(params.row);
+                                            }
+                                        }
+                                    },
+                                    "删除"
+                                )
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            dropDown() {
+                if (this.drop) {
+                    this.dropDownContent = "展开";
+                    this.dropDownIcon = "ios-arrow-down";
+                } else {
+                    this.dropDownContent = "收起";
+                    this.dropDownIcon = "ios-arrow-up";
+                }
+                this.drop = !this.drop;
+            },
+            getDataList() {
+                this.loading = true;
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                // 以下为模拟数据
+                //this.data = [
+                //];
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            add() {
+                let query = { type: 0, backRoute: this.$route.name };
+                this.$router.push({
+                    name: "add_message",
+                    query: query
+                });
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.$refs.form.resetFields();
+                // 转换null为""
+                for (let attr in v) {
+                    if (v[attr] === null) {
+                        v[attr] = "";
+                    }
+                }
+                let str = JSON.stringify(v);
+                let data = JSON.parse(str);
+                this.form = data;
+                this.modalVisible = true;
+            },
+            remove(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要删除么?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                        // 模拟请求成功
+                        //this.$Message.success("操作成功");
+                        //this.$Modal.remove();
+                        //this.getDataList();
+                    }
+                });
+            },
+            delAll() {
+                if (this.selectCount <= 0) {
+                    this.$Message.warning("您还未选择要删除的数据");
+                    return;
+                }
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+                    loading: true,
+                    onOk: () => {
+                        let ids = "";
+                        this.selectList.forEach(function(e) {
+                            ids += e.id + ",";
+                        });
+                        ids = ids.substring(0, ids.length - 1);
+                        // 批量删除
+                        this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.clearSelectAll();
+                                this.getDataList();
+                            }
+                        });
+                        // 模拟请求成功
+                        //this.$Message.success("操作成功");
+                        //this.$Modal.remove();
+                        //this.clearSelectAll();
+                        //this.getDataList();
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+    // 建议引入通用样式 可删除下面样式代码
+    // @import "@/styles/table-common.scss";
+    .search {
+        .operation {
+            margin-bottom: 2vh;
+        }
+        .select-count {
+            font-weight: 600;
+            color: #40a9ff;
+        }
+        .select-clear {
+            margin-left: 10px;
+        }
+        .page {
+            margin-top: 2vh;
+        }
+        .drop-down {
+            margin-left: 5px;
+        }
+    }
+</style>
diff --git a/manager/src/views/member/point/point.vue b/manager/src/views/member/point/point.vue
new file mode 100644
index 00000000..7c7b8d54
--- /dev/null
+++ b/manager/src/views/member/point/point.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="search">
+    <Row>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form
+            ref="searchForm"
+            :model="searchForm"
+            inline
+            :label-width="70"
+            class="search-form"
+          >
+            <Form-item label="会员名称" prop="username">
+              <Input
+                type="text"
+                v-model="searchForm.memberName"
+                placeholder="请输入会员名称"
+                clearable
+                style="width: 200px"
+              />
+              </Form-item>
+            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          >
+          </Table>
+
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page
+            :current="searchForm.pageNumber"
+            :total="total"
+            :page-size="searchForm.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+            show-sizer
+          ></Page>
+        </Row>
+      </Card>
+    </Row>
+
+  </div>
+</template>
+
+<script>
+  import region from "@/views/lili-components/region";
+  import * as API_Member from "@/api/member.js";
+  import ossManage from "@/views/sys/oss-manage/ossManage";
+  import * as RegExp from '@/libs/RegExp.js';
+
+  export default {
+    name: "point",
+    components: {
+      region,
+      ossManage,
+    },
+    data() {
+      return {
+        descFlag: false, //编辑查看框
+        loading: true, // 表单加载状态
+        addFlag: false,
+        updateRegion: false,
+        addMemberForm:{
+          mobile: "",
+          username: "",
+          password: "",
+        },
+        searchForm: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        picModelFlag: false,
+        // 表单验证规则
+        formValidate: {},
+        addRule:{
+          mobile: [
+            { required: true, message: '请输入手机号码' },
+            {
+              pattern: RegExp.mobile,
+              message: '请输入正确的手机号'
+            }
+          ],
+          username: [
+            { required: true, message: '请输入会员名称' },
+          ],
+          password: [
+            { required: true, message: '请输入密码' },
+          ],
+        },
+        ruleValidate: {}, //修改验证
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "操作内容",
+            key: "content",
+            minWidth: 180,
+            tooltip: true
+          },
+
+          {
+            title: "之前积分",
+            key: "beforePoint",
+            width: 110,
+          },
+
+          {
+            title: "变动积分",
+            key: "point",
+            width: 110,
+            render: (h, params) => {
+              if (params.row.pointType == 1) {
+                return h('div', [
+                  h('span', {
+                    style: {
+                      color: 'green'
+                    }
+                  }, "+" + params.row.point),
+                ]);
+              } else {
+                return h('div', [
+                  h('span', {
+                    style: {
+                      color: 'red'
+                    }
+                  }, "-" + params.row.point),
+                ]);
+              }
+
+            }
+          },
+          {
+            title: "当前积分",
+            key: "point",
+            width: 110,
+          },
+          {
+            title: "操作时间",
+            key: "createTime",
+            width: 170
+          },
+
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      // 回调给父级
+      callback(val) {
+        this.$emit("callback", val);
+      },
+      init() {
+        this.getData();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getData();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getData();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
+
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getData();
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      //查新积分列表
+      getData() {
+        this.loading = true;
+        API_Member.getHistoryPointData(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+
+  .face {
+    width: 60px;
+    height: 60px;
+    border-radius: 50%;
+  }
+</style>
diff --git a/manager/src/views/message/message.scss b/manager/src/views/message/message.scss
new file mode 100644
index 00000000..2050bbb5
--- /dev/null
+++ b/manager/src/views/message/message.scss
@@ -0,0 +1,161 @@
+.message {
+    &-main-con {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        right: 0px;
+        bottom: 0px;
+    }
+    &-mainlist-con {
+        position: absolute;
+        left: 0;
+        top: 10px;
+        width: 300px;
+        bottom: 0;
+        padding: 10px 0;
+        div {
+            padding: 10px;
+            margin: 0 20px;
+            border-bottom: 1px dashed #d2d3d2;
+            &:last-child {
+                border: none;
+            }
+            .mes-wrap {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+            .message-count-badge-outer {
+                margin-left: 5px;
+            }
+            .message-count-badge {
+                background: #d2d3d2;
+            }
+            .message-count-badge-red {
+                background: #ed3f14;
+            }
+            .mes-type-btn-text {
+                margin-left: 10px;
+            }
+        }
+    }
+    &-content-con {
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        bottom: 10px;
+        left: 300px;
+        background: white;
+        border-radius: 3px;
+        box-shadow: 2px 2px 10px 2px rgba(0, 0, 0, .1);
+        overflow: auto;
+        .message-title-list-con {
+            width: 100%;
+            height: 100%;
+        }
+        .message-content-top-bar {
+            height: 40px;
+            width: 100%;
+            background: white;
+            position: absolute;
+            left: 0;
+            top: 0;
+            border-bottom: 1px solid #dededb;
+            .mes-back-btn-con {
+                position: absolute;
+                width: 70px;
+                height: 30px;
+                left: 0;
+                top: 5px;
+            }
+            .mes-title {
+                position: absolute;
+                top: 0;
+                right: 70px;
+                bottom: 0;
+                left: 70px;
+                line-height: 40px;
+                padding: 0 30px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                text-align: center;
+            }
+        }
+        .mes-time-con {
+            position: absolute;
+            width: 100%;
+            top: 40px;
+            left: 0;
+            padding: 20px 0;
+            text-align: center;
+            font-size: 14px;
+            color: #b7b7b5;
+        }
+        .message-content-body {
+            position: absolute;
+            top: 90px;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            overflow: auto;
+            .message-content {
+                padding: 10px 20px;
+            }
+        }
+    }
+}
+
+.page-fix {
+    position: fixed;
+    right: 2vw;
+    bottom: 3vh;
+}
+
+.back-message-list-enter,
+    .back-message-list-leave-to {
+        opacity: 0;
+    }
+    
+    .back-message-list-enter-active,
+    .back-message-list-leave-active {
+        transition: all .5s;
+    }
+    
+    .back-message-list-enter-to,
+    .back-message-list-leave {
+        opacity: 1;
+    }
+    
+    .view-message-enter,
+    .view-message-leave-to {
+        opacity: 0;
+    }
+    
+    .view-message-enter-active,
+    .view-message-leave-active {
+        transition: all .5s;
+    }
+    
+    .view-message-enter-to,
+    .view-message-leave {
+        opacity: 1;
+    }
+    
+    .mes-current-type-btn-enter,
+    .mes-current-type-btn-leave-to {
+        opacity: 0;
+        width: 0;
+    }
+    
+    .mes-current-type-btn-enter-active,
+    .mes-current-type-btn-leave-active {
+        transition: all .3s;
+    }
+    
+    .mes-current-type-btn-enter-to,
+    .mes-current-type-btn-leave {
+        opacity: 1;
+        width: 12px;
+    }
+
diff --git a/manager/src/views/message/message.vue b/manager/src/views/message/message.vue
new file mode 100644
index 00000000..5751c722
--- /dev/null
+++ b/manager/src/views/message/message.vue
@@ -0,0 +1,465 @@
+<style lang="scss" scoped>
+@import "./message.scss";
+</style>
+
+<template>
+  <div class="message-main-con">
+    <div class="message-mainlist-con">
+      <div>
+        <Button @click="setCurrentMesType('unread')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'unread'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">未读消息</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge-red"
+              :count="unreadCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+      <div>
+        <Button @click="setCurrentMesType('hasread')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'hasread'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">已读消息</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge"
+              :count="hasreadCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+      <div>
+        <Button @click="setCurrentMesType('recyclebin')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'recyclebin'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">回收站</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge"
+              :count="recyclebinCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+    </div>
+    <div class="message-content-con">
+      <transition name="view-message">
+        <div v-if="showMesTitleList" class="message-title-list-con">
+          <Table
+            ref="messageList"
+            :loading="loading"
+            :columns="mesTitleColumns"
+            :data="currentMesList"
+            :no-data-text="noDataText"
+          ></Table>
+          <Page
+            :current="params.pageNumber"
+            :total="total"
+            :page-size="params.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[5,10]"
+            size="small"
+            show-total
+            show-elevator
+            show-sizer
+            class="page-fix"
+          ></Page>
+        </div>
+      </transition>
+      <transition name="back-message-list">
+        <div v-if="!showMesTitleList" class="message-view-content-con">
+          <div class="message-content-top-bar">
+            <span class="mes-back-btn-con">
+              <Button type="text" @click="backMesTitleList">
+                <Icon type="ios-arrow-back"></Icon>&nbsp;&nbsp;返回
+              </Button>
+            </span>
+            <h3 class="mes-title">{{ mes.title }}</h3>
+          </div>
+          <p class="mes-time-con">
+            <Icon type="android-time"></Icon>
+            &nbsp;&nbsp;{{ mes.time }}
+          </p>
+          <div class="message-content-body">
+            <p class="message-content" v-html="mes.content">{{ mes.content }}</p>
+          </div>
+        </div>
+      </transition>
+    </div>
+  </div>
+</template>
+
+<script>
+import Cookies from "js-cookie";
+import {
+  getMessageSendData,
+  editMessageSend,
+  deleteMessageSend
+} from "@/api/index";
+export default {
+  name: "message_index",
+  data() {
+    const markAsreadBtn = (h, params) => {
+      return h(
+        "Button",
+        {
+          props: {
+            icon: "md-eye-off",
+            size: "small"
+          },
+          on: {
+            click: () => {
+              // 标记已读
+              let v = params.row;
+              // 转换null为""
+              for (let attr in v) {
+                if (v[attr] == null) {
+                  v[attr] = "";
+                }
+              }
+              let str = JSON.stringify(v);
+              let data = JSON.parse(str);
+              data.status = 1;
+              this.loading = true;
+              editMessageSend(data).then(res => {
+                this.loading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.unreadCount -= 1;
+                  this.hasreadCount += 1;
+                  this.$store.commit("setMessageCount", this.unreadCount);
+                  this.refreshMessage();
+                }
+              });
+            }
+          }
+        },
+        "标为已读"
+      );
+    };
+    const deleteMesBtn = (h, params) => {
+      return h(
+        "Button",
+        {
+          props: {
+            icon: "md-trash",
+            size: "small",
+            type: "error"
+          },
+          on: {
+            click: () => {
+              // 移除
+              let v = params.row;
+              // 转换null为""
+              for (let attr in v) {
+                if (v[attr] == null) {
+                  v[attr] = "";
+                }
+              }
+              let str = JSON.stringify(v);
+              let data = JSON.parse(str);
+              data.status = 2;
+              this.loading = true;
+              editMessageSend(data).then(res => {
+                this.loading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.hasreadCount -= 1;
+                  this.recyclebinCount += 1;
+                  this.refreshMessage();
+                }
+              });
+            }
+          }
+        },
+        "删除"
+      );
+    };
+    const restoreBtn = (h, params) => {
+      return h(
+        "Button",
+        {
+          props: {
+            icon: "md-redo",
+            size: "small"
+          },
+          style: {
+            margin: "0 5px 0 0"
+          },
+          on: {
+            click: () => {
+              // 还原
+              let v = params.row;
+              // 转换null为""
+              for (let attr in v) {
+                if (v[attr] == null) {
+                  v[attr] = "";
+                }
+              }
+              let str = JSON.stringify(v);
+              let data = JSON.parse(str);
+              data.status = 1;
+              this.loading = true;
+              editMessageSend(data).then(res => {
+                this.loading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.recyclebinCount -= 1;
+                  this.hasreadCount += 1;
+                  this.refreshMessage();
+                }
+              });
+            }
+          }
+        },
+        "还原"
+      );
+    };
+    const deleteRealBtn = (h, params) => {
+      return h(
+        "Button",
+        {
+          props: {
+            icon: "md-trash",
+            size: "small",
+            type: "error"
+          },
+          on: {
+            click: () => {
+              // 彻底删除
+              let v = params.row;
+              this.loading = true;
+              deleteMessageSend(v.id).then(res => {
+                this.loading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.recyclebinCount -= 1;
+                  this.refreshMessage();
+                }
+              });
+            }
+          }
+        },
+        "彻底删除"
+      );
+    };
+    return {
+      loading: true,
+      params: {
+        userId: JSON.parse(Cookies.get("userInfo")).id,
+        status: 0,
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc" // 默认排序方式
+      },
+      total: 0,
+      totalUnread: 0,
+      totalRead: 0,
+      totalRemove: 0,
+      currentMesList: [],
+      unreadMesList: [],
+      hasreadMesList: [],
+      recyclebinList: [],
+      currentMessageType: "unread",
+      showMesTitleList: true,
+      unreadCount: 0,
+      hasreadCount: 0,
+      recyclebinCount: 0,
+      noDataText: "暂无未读消息",
+      mes: {
+        title: "",
+        time: "",
+        content: ""
+      },
+      dictMessageType: this.$store.state.dict.messageType,
+      mesTitleColumns: [
+        {
+          type: "index",
+          width: 50,
+          align: "center"
+        },
+        {
+          title: " ",
+          key: "title",
+          align: "left",
+          ellipsis: true,
+          render: (h, params) => {
+            return h("span", [
+              h(
+                "a",
+                {
+                  style: {
+                    margin: "0 30px 0 0"
+                  },
+                  on: {
+                    click: () => {
+                      this.showMesTitleList = false;
+                      this.mes.title = params.row.title;
+                      this.mes.time = params.row.createTime;
+                      this.getContent(params.row);
+                    }
+                  }
+                },
+                "【" + params.row.type + "】 " + params.row.title
+              )
+            ]);
+          }
+        },
+        {
+          title: " ",
+          key: "time",
+          align: "center",
+          width: 190,
+          render: (h, params) => {
+            return h("span", [
+              h("Icon", {
+                props: {
+                  type: "md-time",
+                  size: 16
+                },
+                style: {
+                  margin: "0 5px 3px 0"
+                }
+              }),
+              h("span", params.row.createTime)
+            ]);
+          }
+        },
+        {
+          title: " ",
+          key: "asread",
+          align: "center",
+          width: 210,
+          render: (h, params) => {
+            if (this.currentMessageType == "unread") {
+              return h("div", [markAsreadBtn(h, params)]);
+            } else if (this.currentMessageType == "hasread") {
+              return h("div", [deleteMesBtn(h, params)]);
+            } else {
+              return h("div", [
+                restoreBtn(h, params),
+                deleteRealBtn(h, params)
+              ]);
+            }
+          }
+        }
+      ]
+    };
+  },
+  methods: {
+    changePage(v) {
+      this.params.pageNumber = v;
+      this.refreshMessage();
+    },
+    changePageSize(v) {
+      this.params.pageSize = v;
+      this.refreshMessage();
+    },
+    refreshMessage() {
+      let status = 0;
+      let type = this.currentMessageType;
+      if (type == "unread") {
+        status = 0;
+      } else if (type == "hasread") {
+        status = 1;
+      } else {
+        status = 2;
+      }
+      this.params.status = status;
+      this.loading = true;
+      getMessageSendData(this.params).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.currentMesList = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    initMessage() {
+      this.params.status = 0;
+      getMessageSendData(this.params).then(res => {
+        if (res.success) {
+          this.unreadCount = res.result.total;
+          this.initReadMessage();
+        }
+      });
+    },
+    initReadMessage() {
+      this.params.status = 1;
+      getMessageSendData(this.params).then(res => {
+        if (res.success) {
+          this.hasreadCount = res.result.total;
+          this.initRemoveMessage();
+        }
+      });
+    },
+    initRemoveMessage() {
+      this.params.status = 2;
+      getMessageSendData(this.params).then(res => {
+        if (res.success) {
+          this.recyclebinCount = res.result.total;
+          this.setCurrentMesType("unread");
+        }
+      });
+    },
+    editMessage(status) {
+      editMessageSend().then(res => {
+        if (res.success) {
+          this.$Message.success("操作成功");
+        }
+      });
+    },
+    deleteMessage(id) {
+      deleteMessageSend(id).then(res => {
+        if (res.success) {
+          this.$Message.success("删除成功");
+        }
+      });
+    },
+    backMesTitleList() {
+      this.showMesTitleList = true;
+    },
+    setCurrentMesType(type) {
+      if (this.currentMessageType !== type) {
+        this.showMesTitleList = true;
+      }
+      this.currentMessageType = type;
+      if (type == "unread") {
+        this.noDataText = "暂无未读消息";
+      } else if (type == "hasread") {
+        this.noDataText = "暂无已读消息";
+      } else {
+        this.noDataText = "回收站无消息";
+      }
+      this.params.pageNumber = 1;
+      this.refreshMessage();
+    },
+    getContent(v) {
+      this.mes.content = v.content;
+    }
+  },
+  mounted() {
+    this.initMessage();
+  },
+  watch: {
+    // 监听路由变化通过id获取数据
+    $route(to, from) {
+      if (to.name == "message_index") {
+        this.initMessage();
+      }
+    }
+  }
+};
+</script>
+
diff --git a/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue b/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue
new file mode 100644
index 00000000..9473674c
--- /dev/null
+++ b/manager/src/views/my-components/goodsSkuSelector/goodsSku.vue
@@ -0,0 +1,633 @@
+<template>
+  <Collapse v-model="open_panel">
+    <Panel name="1">
+      规格名称
+      <div slot="content" class="sku-item-content">
+        <Form :model="skuForm" @submit.native.prevent style="width:100%;">
+          <div v-for="(item, $index) in skuInfo" :key="$index" class="sku_value">
+            <Card :bordered="true" style="margin: 15px 0;">
+              <FormItem label="规格名：" class="sku-item-content-name">
+                <AutoComplete
+                  style="width: 150px;"
+                  v-model="item.name"
+                  :maxlength="30"
+                  :data="skuKey"
+                  placeholder="请输入规格项名称"
+                  :filter-method="filterMethod"
+                  @on-change="skuItemChange(item.name,$index)"
+                  @keyup.enter.native="editSkuItem(item, $index)"
+                >
+                   <!-- @on-focus="getActiveSkuItem(index, $index ,item, val)"
+                   @on-blur="editSkuItem(item, $index)"
+                   on-change 变更
+                   on-focus	聚焦时触发	event
+                   on-blur	失焦时触发
+                   keyup.enter.native 回车时 -->
+                </AutoComplete>
+                <Button
+                  type="error"
+                  style="margin-left: 10px;"
+                  @click="handleCloseSkuItem($index)"
+                >删除</Button>
+                <Checkbox
+                  v-if="$index === 0"
+                  style="padding: 0px 0px 0px 30px;"
+                  v-model="checkedImage"
+                  @on-change="handleChangeImage"
+                >规格图片</Checkbox>
+              </FormItem>
+
+              <FormItem label="规格值：" class="sku-item-content-value">
+                <!--规格值文本列表-->
+                <div
+                  v-for="(val, index) in item.spec_values"
+                  :key="index"
+                  style="padding: 0px 20px 10px 0px;float: left"
+                >
+                  <div style="display:inline-block;">
+                    <AutoComplete
+                      style="width: 150px; float: left"
+                      v-model="val.value"
+                      :maxlength="30"
+                      :data="skuValue"
+                      placeholder="请输入规格值名称"
+                      :filter-method="filterMethod"
+                      @on-change="skuValueChange(val.value,$index)"
+                      @on-focus="editSkuIValue($index)"
+                      @keyup.enter.native="editSkuIValue(item, val, $index, index)"
+                    ></AutoComplete>
+                    <Button
+                      type="error"
+                      style="float: left;margin-left: 10px"
+                      @click="handleCloseSkuValue($index, index)"
+                    >删除</Button>
+                  </div>
+                  <div>
+                    <upload-pic-thumb
+                        style="text-align: left;"
+                        v-show="$index === 0 && checkedImage"
+                        v-model="val.spec_image" v-on:change="thumbChange" :multiple="false" v-on:uploadchange="uploadchange"
+                    />
+                  </div>
+                </div>
+                <div style="float: left">
+                  <Button type="primary" @click="addSpec($index, item)">添加规格值</Button>
+                </div>
+              </FormItem>
+            </Card>
+          </div>
+        </Form>
+        <Button type="primary" size="mini" @click="addSkuItem">添加规格项目</Button>
+      </div>
+    </Panel>
+    <Panel name="2">
+      规格详细
+      <div slot="content">
+        <div slot="content">
+          <Table
+            :columns="skuTableColumn"
+            :data="skuTableData"
+            style="width: 100%;.ivu-table-overflowX{ overflow-x: hidden;}"
+            :span-method="handleSpan"
+          >
+            <template slot-scope="{ row }" slot="sn">
+              <Input
+                v-model="row.sn"
+                placeholder="请输入货号"
+                @on-change="updateSkuTable(row,'sn')"
+                @on-focus="updateSkuTable(row,'sn')"
+                @on-blur="updateSkuTable(row,'sn')"
+              />
+            </template>
+
+            <template slot-scope="{ row }" slot="weight">
+              <Input
+                v-model="row.weight"
+                placeholder="请输入重量"
+                @on-change="updateSkuTable(row,'weight')"
+              />
+            </template>
+
+            <template slot-scope="{ row }" slot="quantity">
+              <Input
+                v-model="row.quantity"
+                placeholder="请输入库存"
+                @on-change="updateSkuTable(row,'quantity')"
+              />
+            </template>
+
+            <template slot-scope="{ row }" slot="cost">
+              <Input
+                v-model="row.cost"
+                placeholder="请输入成本价"
+                @on-change="updateSkuTable(row,'cost')"
+              />
+            </template>
+
+            <template slot-scope="{ row }" slot="price">
+              <Input
+                v-model="row.price"
+                placeholder="请输入成本价"
+                @on-change="updateSkuTable(row,'price')"
+              />
+            </template>
+          </Table>
+        </div>
+      </div>
+    </Panel>
+  </Collapse>
+</template>
+<script>
+  import { regular } from "@/utils";
+  import uploadPicThumb from "../lili/upload-pic-thumb.vue";
+  import cloneObj from "@/utils/index";
+export default {
+  name: "goodsSku",
+  components: {
+    uploadPicThumb
+  },
+  props: {
+    open_panel: {
+      type: [String, Number],
+      default: false
+    },
+    /** 是否自动生成货号 */
+    productSn: {
+      type: Boolean,
+      default: false
+    },
+    /** 当前商品编号 */
+    goodsSn: {
+      type: [String, Number],
+      default: ['', 0]
+    }
+  },
+  data() {
+    return {
+      /** 请求数据*/
+      skuData: [],
+
+      /** 当前可选择的 规格名称*/
+      skuKey: [],
+
+      /** 当前可选择的 规格值*/
+      skuValue: [],
+
+      /** 表单数据*/
+      skuForm: {},
+      /** 表格头 */
+      skuTableColumn: [],
+      /** 表格数据 */
+      skuTableData: [
+        {
+          sn: '',
+          weight: '',
+          quantity: '',
+          cost: '',
+          price: ''
+        }
+      ],
+      /** 要提交的规格数据*/
+      skuInfo: [],
+
+      /** 当前规格项下的规格值列表*/
+      specList: [],
+
+      /** 当前规格项索引 */
+      activeSkuItemIndex: 0,
+
+      /** 当前规格项 */
+      activeSkuItem: {},
+
+      /** 规格图片 */
+      images: [],
+      /** 当前规格值索引 */
+      activeSkuValIndex: 0,
+
+      /** 当前规格值 */
+      activeSkuVal: {},
+      /** 存储未通过校验的单元格位置  */
+      validateError: [],
+      //规格照片
+      checkedImage:false
+    };
+  },
+  mounted(){
+
+  },
+  watch: {
+    /** 自动生成货号 */
+    productSn() {
+      if (this.productSn && this.skuTableData.length > 0) {
+        let count = 1
+        this.skuTableData.forEach(key => {
+          key.sn = this.goodsSn + '-00000' + count
+          count++
+        })
+        /** 异步更新skuTableData数据 */
+        this.$emit("getTableData", this.skuTableData);
+      }
+    }
+  },
+  methods: {
+    uploadchange(url){
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /** 添加规格项 */
+    addSkuItem() {
+      // 写入对象，下标，具体对象
+      this.$set(this.skuInfo, this.skuInfo.length, {
+        spec_values: []
+      });
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /** 移除当前规格项 进行数据变化*/
+    handleCloseSkuItem($index) {
+      this.skuInfo.splice($index, 1);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /** 规格变更  */
+    skuItemChange(value, $index) {
+      this.activeSkuItemIndex = $index;
+      //判定是否存在这个规格分组
+      let item = this.findSpec(value);
+      /** 更新skuInfo数据 */
+      this.$set(this.skuInfo[this.activeSkuItemIndex], "name", item.name);
+      this.$set(this.skuInfo[this.activeSkuItemIndex], "spec_values", []);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /**
+     * 根据规格项名称，搜索对应的规格对象（如果是服务器设置过的话）
+     */
+    findSpec(name) {
+      let spec = { name: name };
+      this.skuData.forEach(item => {
+        if (item.name === name) {
+          spec = item;
+        }
+      });
+      return spec;
+    },
+
+    /** 选中/不选中 添加规格图片 是否显示上传组件*/
+    handleChangeImage(val) {
+      this.$set(this.skuInfo, this.skuInfo.length, {});
+      this.skuInfo.splice(this.skuInfo.length - 1, 1);
+      this.checkedImage = val;
+      /** 如果 图片按钮不显示 则置空图片列表中的所有图片数据 并且spec_type设置为0 */
+      if (!val) {
+        this.skuInfo.forEach(key => {
+          if (key.spec_values) {
+            key.spec_values.forEach(item => {
+              item.spec_image = "";
+            });
+          }
+        });
+      }
+       /**
+        * 渲染规格详细表格
+        */
+      this.renderTableData();
+
+
+    },
+
+    /** 规格值 */
+
+    /** 添加当前规格项的规格值*/
+    addSpec($index, item) {
+      this.activeSkuItemIndex = $index;
+      this.$set(
+        this.skuInfo[$index].spec_values,
+        this.skuInfo[$index].spec_values.length,
+        {
+          name: item.name
+        }
+      );
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /** 移除当前规格值 */
+    handleCloseSkuValue($index, index) {
+      this.skuInfo[$index].spec_values.splice(index, 1);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /** 选择规格值时触发 */
+    skuValueChange(val) {
+      /** 更新skuInfo数据 */
+      let _arr = cloneObj(this.skuInfo[this.activeSkuItemIndex]);
+      this.$set(_arr.spec_values[this.activeSkuValIndex], "name", _arr.name);
+      this.$set(this.skuInfo, this.activeSkuItemIndex, _arr);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+
+    /** 编辑规格值时触发 */
+    editSkuIValue($index) {
+      if (this.skuInfo.length >= $index) {
+        let data = this.findSpec(this.skuInfo[$index].name);
+        this.skuValue = data.value;
+      }
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /** 获取编辑时的skuInfo信息 */
+    getSkuInfo() {
+      /** 下拉列表数据(skuData)存在时 检测productSkuInfo中对应的规格(spec_id)项 并且赋值于skuInfo中对应的规格项信息（描述 + 名称） */
+      if (this.categoryId) {
+        API_spec.getSpecValuesListData(this.categoryId, {}).then(response => {
+          this.skuData = response;
+          if (
+            this.skuData.length > 0 &&
+            Array.isArray(this.productSkuInfo) &&
+            this.productSkuInfo.length > 0
+          ) {
+            this.skuInfo = cloneObj(this.productSkuInfo);
+            if (this.skuInfo.length > 0) {
+              this.skuInfo.forEach(key => {
+                this.skuData.forEach(item => {
+                  if (key.spec_id === item.spec_id) {
+                    key.name = item.name;
+                    key.spec_memo = item.spec_memo;
+                  }
+                });
+              });
+            }
+            /** 如果存在图片则进行显示 */
+            if (this.skuInfo[0].spec_values[0].spec_type === 1) {
+              this.checkedImage = true;
+            }
+            /** 触发一次数据转换（规格选择数据=> 规格表格数据） */
+          }
+        });
+      }
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /**
+     * 渲染table所需要的column 和 data
+     */
+    renderTableData() {
+      this.skuTableColumn = [];
+      this.skuTableData = [];
+
+      //渲染头部
+
+      this.skuInfo.forEach(sku => {
+        //列名称
+        let columnName = sku.name;
+        this.skuTableColumn.push({
+          title: columnName,
+          key: columnName
+        });
+      });
+      this.skuTableColumn.push(
+        {
+          title: "货号",
+          slot: "sn"
+        },
+        {
+          title: "重量",
+          slot: "weight"
+        },
+        {
+          title: "库存",
+          slot: "quantity"
+        },
+        {
+          title: "成本价",
+          slot: "cost"
+        },
+        {
+          title: "价格",
+          slot: "price"
+        }
+      );
+
+      //克隆所有渲染的数据
+      let cloneTemp = cloneObj(this.skuInfo);
+
+      //数据清空一次
+      this.skuTableData = [];
+      //判定 是否存在规格分组
+      if (cloneTemp[0]) {
+        //存放最终结果
+        let result = [];
+
+        //记录存放表格的 key
+        //循环选中的 sku 数据
+        if(this.checkedImage===false){
+         cloneTemp[0].spec_values.forEach(specItem => {
+           result.push({
+             [specItem.name]: specItem.value
+           });
+         });
+        }else{
+          cloneTemp[0].spec_values.forEach(specItem => {
+            result.push({
+              [specItem.name]: specItem.value,
+              images: specItem.spec_image
+            });
+          });
+        }
+
+        cloneTemp.splice(0, 1);
+
+        result = this.specIterator(result, cloneTemp);
+        result = this.defaultParams(result);
+        this.skuTableData = result;
+      }
+      this.$emit("getTableData", this.skuTableData);
+    },
+
+    /** 自动完成表单所需方法*/
+    filterMethod(value, option) {
+      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+    },
+
+    /** 根据分类id获取系统设置规格信息*/
+    Get_SkuInfoByCategory() {
+      if (this.baseInfoForm.categoryId) {
+        getGoodsSpecInfo(this.baseInfoForm.categoryId, {}).then(response => {
+          this.skuData = response;
+          if (this.skuData.length > 0) {
+            this.skuData.forEach(spec => {
+              this.skuKey.push(spec.name);
+            });
+          }
+        });
+      }
+    },
+    /** 检测是否未通过0-99999999之间的数字校验 */
+    isValidate(index, scope) {
+      return this.validateError.some(key => {
+        return key[0] === index && key[1] === scope.$index
+      })
+    },
+    /** 数据改变之后 抛出数据 */
+    updateSkuTable(row, item) {
+      let index = row._index;
+      this.skuTableData[index][item] = row[item];
+      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
+      if (
+        (!/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row[item]) &&
+          item === "weight") ||
+        parseInt(row[item]) < 0 ||
+        parseInt(row[item]) > 99999999
+      ) {
+        this.$Message.error("请输入0~99999999之间的数字值");
+        return;
+      } else if (
+        (item === "quantity" && !/^[0-9]\d*$/.test(row[item])) ||
+        parseInt(row[item]) < 0 ||
+        parseInt(row[item]) > 99999999
+      ) {
+        // 库存
+        this.$Message.error("请输入0~99999999之间的整数");
+        return;
+      } else if (
+        ((item === "cost" || item === "price") &&
+          !regular.money.test(row[item])) ||
+        parseInt(row[item]) < 0 ||
+        parseInt(row[item]) > 99999999
+      ) {
+        // 成本价 价格
+        this.$Message.error("请输入0~99999999之间的价格");
+        return;
+      }
+      this.skuTableData[index][item] = row[item];
+      this.$emit("getTableData", this.skuTableData);
+      // console.log(999, this.skuTableData)
+    },
+    /**
+     * 迭代属性，形成表格
+     * result 渲染的数据
+     * array spec数据
+     */
+    specIterator(result, cloneTemp) {
+      //是否还可以循环
+      if (cloneTemp.length > 0) {
+        let table = [];
+        result.forEach(resItem => {
+          let tableItem = [];
+          cloneTemp[0].spec_values.forEach(valItem => {
+            let obj = cloneObj(resItem);
+            obj[valItem.name] = valItem.value;
+            table.push(obj);
+          });
+        });
+        result = [];
+        table.forEach(t => {
+          result.push(t);
+        });
+        //清除当前循环的分组
+        cloneTemp.splice(0, 1);
+      } else {
+        return result;
+      }
+      return this.specIterator(result, cloneTemp);
+    },
+    showData() {
+      // console.log(JSON.stringify(this.skuTableData));
+      // console.warn(this.specList);
+    },
+    /**
+     * 添加固有属性
+     */
+    defaultParams(tableData) {
+      return tableData;
+    },
+
+    handleSpan({ row, column, rowIndex, columnIndex }) {},
+
+    thumbChange(){
+      this.$emit("getTableData", this.skuTableData);
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.layout {
+    margin-bottom: 20px;
+
+    .sku-item-content {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: center;
+        width: 100%;
+
+        .sku-item-content-name {
+            margin-top: 24px;
+            display: flex;
+            align-items: flex-start;
+            width: 100%;
+        }
+    }
+    .demo-upload-list{
+        display: inline-block;
+        width: 60px;
+        height: 60px;
+        text-align: center;
+        line-height: 60px;
+        border: 1px solid transparent;
+        border-radius: 4px;
+        overflow: hidden;
+        background: #fff;
+        position: relative;
+        box-shadow: 0 1px 1px rgba(0,0,0,.2);
+        margin-right: 4px;
+    }
+    .demo-upload-list img{
+        width: 100%;
+        height: 100%;
+    }
+    .demo-upload-list-cover{
+        display: none;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: rgba(0,0,0,.6);
+    }
+    .demo-upload-list:hover .demo-upload-list-cover{
+        display: block;
+    }
+    .demo-upload-list-cover i{
+        color: #fff;
+        font-size: 20px;
+        cursor: pointer;
+        margin: 0 2px;
+    }
+
+}
+</style>
diff --git a/manager/src/views/my-components/lili/circle-loading.vue b/manager/src/views/my-components/lili/circle-loading.vue
new file mode 100644
index 00000000..594ef07a
--- /dev/null
+++ b/manager/src/views/my-components/lili/circle-loading.vue
@@ -0,0 +1,18 @@
+<template>
+  <div style="display: inline-block;">
+    <Icon type="ios-loading" size="18" color="#2d8cf0" class="spin-icon-load"></Icon>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "circleLoading"
+};
+</script>
+
+<style lang="scss" scoped>
+.spin-icon-load {
+  animation: ani-demo-spin 1s linear infinite;
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/count-down-button.vue b/manager/src/views/my-components/lili/count-down-button.vue
new file mode 100644
index 00000000..54d90563
--- /dev/null
+++ b/manager/src/views/my-components/lili/count-down-button.vue
@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <Button
+      :countTime="countTime"
+      :loading="loading"
+      :type="type"
+      :size="size"
+      :ghost="ghost"
+      :disabled="disabled||clicked"
+      :icon="icon"
+      :shape="shape"
+      :long="long"
+      @click="handleClick"
+    >{{buttonText}}</Button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "iconChoose",
+  props: {
+    text: {
+      type: String,
+      default: "提交"
+    },
+    autoCountDown: {
+      type: Boolean,
+      default: true
+    },
+    countTime: {
+      type: [Number, String],
+      default: 60
+    },
+    suffixText: {
+      type: String,
+      default: "后重试"
+    },
+    type: String,
+    size: String,
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    ghost: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    icon: String,
+    shape: String,
+    long: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      buttonText: this.text,
+      count: Number(this.countTime),
+      clicked: false
+    };
+  },
+  methods: {
+    init() {},
+    handleClick() {
+      if (this.autoCountDown) {
+        this.clicked = true;
+        this.countDown();
+      }
+      this.$emit("on-click", true);
+    },
+    startCountDown() {
+      this.clicked = true;
+      this.countDown();
+    },
+    countDown() {
+      let that = this;
+      if (this.count == 0) {
+        this.clicked = false;
+        this.count = this.countTime;
+        this.buttonText = this.text;
+        return;
+      } else {
+        this.buttonText = this.count + " 秒" + this.suffixText;
+        this.count--;
+      }
+      setTimeout(function() {
+        that.countDown();
+      }, 1000);
+    },
+    setText(value) {
+      if (value === this.buttonText) {
+        return;
+      }
+      this.buttonText = value;
+    },
+  },
+  watch: {
+    text(val) {
+      this.setText(val);
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss">
+</style>
+
diff --git a/manager/src/views/my-components/lili/department-choose.vue b/manager/src/views/my-components/lili/department-choose.vue
new file mode 100644
index 00000000..350a9463
--- /dev/null
+++ b/manager/src/views/my-components/lili/department-choose.vue
@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <Cascader
+      v-model="selectDep"
+      :data="department"
+      :load-data="loadData"
+      @on-change="handleChangeDep"
+      change-on-select
+      filterable
+      clearable
+      placeholder="请选择"
+    ></Cascader>
+  </div>
+</template>
+
+<script>
+import { initDepartment, loadDepartment } from "@/api/index";
+export default {
+  name: "departmentChoose",
+  props: {
+
+  },
+  data() {
+    return {
+      selectDep: [],
+      department: []
+    };
+  },
+  methods: {
+    initDepartmentData() {
+      initDepartment().then(res => {
+        if (res.success) {
+          res.result.forEach(function(e) {
+            if (e.isParent) {
+              e.value = e.id;
+              e.label = e.title;
+              e.loading = false;
+              e.children = [];
+            } else {
+              e.value = e.id;
+              e.label = e.title;
+            }
+            if (e.status == -1) {
+              e.label = "[已禁用] " + e.label;
+              e.disabled = true;
+            }
+          });
+          this.department = res.result;
+        }
+      });
+    },
+    loadData(item, callback) {
+      item.loading = true;
+      loadDepartment(item.value).then(res => {
+        item.loading = false;
+        if (res.success) {
+          res.result.forEach(function(e) {
+            if (e.isParent) {
+              e.value = e.id;
+              e.label = e.title;
+              e.loading = false;
+              e.children = [];
+            } else {
+              e.value = e.id;
+              e.label = e.title;
+            }
+            if (e.status == -1) {
+              e.label = "[已禁用] " + e.label;
+              e.disabled = true;
+            }
+          });
+          item.children = res.result;
+          callback();
+        }
+      });
+    },
+    handleChangeDep(value, selectedData) {
+      let departmentId = "";
+      // 获取最后一个值
+      if (value && value.length > 0) {
+        departmentId = value[value.length - 1];
+      }
+      this.$emit("on-change", departmentId);
+    },
+    clearSelect() {
+      this.selectDep = [];
+    }
+  },
+  created() {
+    this.initDepartmentData();
+  }
+};
+</script>
+
+<style lang="scss">
+</style>
+
diff --git a/manager/src/views/my-components/lili/department-tree-choose.vue b/manager/src/views/my-components/lili/department-tree-choose.vue
new file mode 100644
index 00000000..f9d46ea2
--- /dev/null
+++ b/manager/src/views/my-components/lili/department-tree-choose.vue
@@ -0,0 +1,184 @@
+<template>
+  <div>
+    <div style="display:flex;">
+      <Input
+        v-model="departmentTitle"
+        readonly
+        style="margin-right:10px;"
+        :placeholder="placeholder"
+        :clearable="clearable"
+        @on-clear="clearSelect"
+      />
+      <Poptip transfer trigger="click" placement="right" title="选择部门" width="250">
+        <Button icon="md-list">选择部门</Button>
+        <div slot="content">
+          <Input
+            v-model="searchKey"
+            suffix="ios-search"
+            @on-change="searchDep"
+            placeholder="输入部门名搜索"
+            clearable
+          />
+          <div class="dep-tree-bar">
+            <Tree
+              :data="dataDep"
+              :load-data="loadData"
+              @on-select-change="selectTree"
+            ></Tree>
+            <Spin size="large" fix v-if="depLoading"></Spin>
+          </div>
+        </div>
+      </Poptip>
+    </div>
+  </div>
+</template>
+
+<script>
+import {initDepartment, loadDepartment, searchDepartment} from "@/api/index";
+
+export default {
+  name: "departmentTreeChoose",
+  props: {
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: "点击选择部门"
+    }
+  },
+  data() {
+    return {
+      depLoading: false,
+      departmentTitle: "",
+      searchKey: "",
+      dataDep: [],
+      selectDep: [],
+      departmentId: []
+    };
+  },
+  methods: {
+    initDepartmentData() {
+      initDepartment().then(res => {
+        if (res.success) {
+          res.result.forEach(function (e) {
+            if (e.isParent) {
+              e.loading = false;
+              e.children = [];
+            }
+            if (e.status == -1) {
+              e.title = "[已禁用] " + e.title;
+              e.disabled = true;
+            }
+          });
+          this.dataDep = res.result;
+        }
+      });
+    },
+    loadData(item, callback) {
+      loadDepartment(item.id).then(res => {
+        if (res.success) {
+          res.result.forEach(function (e) {
+            if (e.isParent) {
+              e.loading = false;
+              e.children = [];
+            }
+            if (e.status == -1) {
+              e.title = "[已禁用] " + e.title;
+              e.disabled = true;
+            }
+          });
+          callback(res.result);
+        }
+      });
+    },
+    searchDep() {
+      // 搜索部门
+      if (this.searchKey) {
+        this.depLoading = true;
+        searchDepartment({title: this.searchKey}).then(res => {
+          this.depLoading = false;
+          if (res.success) {
+            res.result.forEach(function (e) {
+              if (e.status == -1) {
+                e.title = "[已禁用] " + e.title;
+                e.disabled = true;
+              }
+            });
+            this.dataDep = res.result;
+          }
+        });
+      } else {
+        this.initDepartmentData();
+      }
+    },
+    selectTree(v) {
+      if (v.length === 0) {
+        this.$emit("on-change", null);
+        this.departmentId = "";
+        this.departmentTitle = "";
+        return
+      }
+      this.departmentId = v[0].id;
+      this.departmentTitle = v[0].title;
+      let department = {
+        departmentId: this.departmentId,
+        departmentTitle: this.departmentTitle
+      }
+      this.$emit("on-change", department);
+    },
+    clearSelect() {
+      this.departmentId = [];
+      this.departmentTitle = "";
+      this.initDepartmentData();
+      if (this.multiple) {
+        this.$emit("on-change", []);
+      } else {
+        this.$emit("on-change", "");
+      }
+      this.$emit("on-clear");
+    },
+    setData(ids, title) {
+      this.departmentTitle = title;
+      if (this.multiple) {
+        this.departmentId = ids;
+      } else {
+        this.departmentId = [];
+        this.departmentId.push(ids);
+      }
+      // this.$emit("on-change", this.departmentId);
+    }
+  },
+  created() {
+    this.initDepartmentData();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.dep-tree-bar {
+  position: relative;
+  min-height: 80px;
+  max-height: 500px;
+  overflow: auto;
+  margin-top: 5px;
+}
+
+.dep-tree-bar::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.dep-tree-bar::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 0 2px #d1d1d1;
+  background: #e4e4e4;
+}
+
+</style>
+
diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue
new file mode 100644
index 00000000..848746bd
--- /dev/null
+++ b/manager/src/views/my-components/lili/editor.vue
@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <div style="position:relative">
+      <div :id="id" style="text-align: left;width:850px"></div>
+      <div v-if="showExpand">
+        <div class="e-menu e-code" @click="editHTML">
+          <Icon type="md-code-working" size="22" />
+        </div>
+        <div class="e-menu e-preview" @click="fullscreenModal=true">
+          <Icon type="ios-eye" size="24" />
+        </div>
+        <div class="e-menu e-trash" @click="clear">
+          <Icon type="md-trash" size="18" />
+        </div>
+      </div>
+    </div>
+
+    <Modal
+      title="编辑html代码"
+      v-model="showHTMLModal"
+      :mask-closable="false"
+      :width="900"
+      :fullscreen="full"
+    >
+      <Input
+        v-if="!full"
+        v-model="dataEdit"
+        :rows="15"
+        type="textarea"
+        style="max-height:60vh;overflow:auto;"
+      />
+      <Input v-if="full" v-model="dataEdit" :rows="32" type="textarea" />
+      <div slot="footer">
+        <Button @click="full=!full" icon="md-expand">全屏开/关</Button>
+        <Button @click="editHTMLOk" type="primary" icon="md-checkmark-circle-outline">确定保存</Button>
+      </div>
+    </Modal>
+    <Modal title="预览" v-model="fullscreenModal" fullscreen>
+      <div v-html="data">{{data}}</div>
+      <div slot="footer">
+        <Button @click="fullscreenModal=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import E from "wangeditor";
+import xss from "xss";
+// 表情包配置 自定义表情可在该js文件中统一修改
+import { sina } from "@/libs/emoji";
+var editor = null;
+export default {
+  name: "editor",
+  props: {
+    id: {
+      type: String,
+      default: "editor"
+    },
+    value: String,
+    base64: {
+      type: Boolean,
+      default: false
+    },
+    showExpand: {
+      type: Boolean,
+      default: true
+    },
+    openXss: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      editor: null,
+      data: this.value, // 富文本数据
+      dataEdit: "", // 编辑数据
+      showHTMLModal: false, // 显示html
+      full: false, // html全屏开关
+      fullscreenModal: false // 显示全屏预览
+    };
+  },
+  methods: {
+    initEditor() {
+      let that = this;
+      // 详见wangeditor3官网文档 https://www.kancloud.cn/wangfupeng/wangeditor3/332599
+      editor = new E(`#${this.id}`);
+      // 编辑内容绑定数据
+      editor.config.onchange = html => {
+        if (this.openXss) {
+          this.data = xss(html);
+        } else {
+          this.data = html;
+        }
+        this.$emit("input", this.data);
+        this.$emit("on-change", this.data);
+      };
+      editor.config.showFullScreen = false;
+      // z-index
+      editor.config.zIndex = 100;
+      if (this.base64) {
+        // 使用 base64 保存图片
+        editor.config.uploadImgShowBase64 = true;
+      } else {
+        // 配置上传图片服务器端地址
+        editor.config.uploadImgServer = uploadFile;
+        // lili如要header中传入token鉴权
+        editor.config.uploadImgHeaders = {
+          accessToken: that.getStore("accessToken")
+        };
+        editor.config.uploadFileName = "file";
+        editor.config.uploadImgHooks = {
+          before: function(xhr, editor, files) {
+            // 图片上传之前触发
+          },
+          success: function(xhr, editor, result) {
+            // 图片上传并返回结果，图片插入成功之后触发
+          },
+          fail: function(xhr, editor, result) {
+            // 图片上传并返回结果，但图片插入错误时触发
+            that.$Message.error("上传图片失败");
+          },
+          error: function(xhr, editor) {
+            // 图片上传出错时触发
+            that.$Message.error("上传图片出错");
+          },
+          timeout: function(xhr, editor) {
+            // 图片上传超时时触发
+            that.$Message.error("上传图片超时");
+          },
+          // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
+          customInsert: function(insertImg, result, editor) {
+            if (result.success == true) {
+              let url = result.result;
+              insertImg(url);
+              that.$Message.success("上传图片成功");
+            } else {
+              that.$Message.error(result.message);
+            }
+          }
+        };
+      }
+      editor.config.customAlert = function(info) {
+        // info 是需要提示的内容
+        // that.$Message.info(info);
+      };
+      // 字体
+      editor.config.fontNames = ["微软雅黑", "宋体", "黑体", "Arial"];
+      // 表情面板可以有多个 tab ，因此要配置成一个数组。数组每个元素代表一个 tab 的配置
+      editor.config.emotions = [
+        {
+          // tab 的标题
+          title: "新浪",
+          // type -> 'emoji' / 'image'
+          type: "image",
+          // content -> 数组
+          content: sina
+        }
+      ];
+      editor.create();
+      if (this.value) {
+        if (this.openXss) {
+          editor.txt.html(xss(this.value));
+        } else {
+          editor.txt.html(this.value);
+        }
+      }
+    },
+    editHTML() {
+      this.dataEdit = this.data;
+      this.showHTMLModal = true;
+    },
+    editHTMLOk() {
+      editor.txt.html(this.dataEdit);
+      this.$emit("input", this.data);
+      this.$emit("on-change", this.data);
+      this.showHTMLModal = false;
+    },
+    clear() {
+      this.$Modal.confirm({
+        title: "确认清空",
+        content: "确认要清空编辑器内容？清空后不能撤回",
+        onOk: () => {
+          this.data = "";
+          editor.txt.html(this.data);
+          this.$emit("input", this.data);
+          this.$emit("on-change", this.data);
+        }
+      });
+    },
+    setData(value) {
+      if (!editor) {
+        this.initEditor();
+      }
+      if (value && value != this.data) {
+        this.data = value;
+        editor.txt.html(this.data);
+        this.$emit("input", this.data);
+        this.$emit("on-change", this.data);
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.setData(val);
+    }
+  },
+  mounted() {
+    this.initEditor();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.e-menu {
+
+  z-index: 101;
+  position: absolute;
+  cursor: pointer;
+  color: #999;
+  :hover {
+    color: #333;
+  }
+}
+.e-code {
+  top: 6px;
+  left: 818px;
+}
+.e-preview {
+  top: 46px;
+  left: 174px;
+}
+.e-trash {
+  top: 46px;
+  left: 215px;
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/icon-choose.vue b/manager/src/views/my-components/lili/icon-choose.vue
new file mode 100644
index 00000000..87c52aba
--- /dev/null
+++ b/manager/src/views/my-components/lili/icon-choose.vue
@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <div style="display:flex">
+      <Input
+        v-model="currentValue"
+        @on-change="handleChange"
+        :placeholder="placeholder"
+        :size="size"
+        :disabled="disabled"
+        :readonly="readonly"
+        :maxlength="maxlength"
+        :icon="currentValue"
+      />
+      <Button
+        @click="iconModalVisible=true"
+        :size="size"
+        :disabled="disabled"
+        :icon="icon"
+        style="margin-left:10px"
+      >选择图标</Button>
+    </div>
+
+    <Modal
+      title="选择图标"
+      v-model="iconModalVisible"
+      :width="950"
+      :styles="{top: '30px'}"
+      footer-hide
+      :z-index="1060"
+    >
+      <div class="icon-search">
+        <input
+          type="text"
+          v-model="key"
+          :placeholder="tip"
+          @input="handleInput"
+          @focus="handleFocus"
+          @blur="handleBlur"
+        >
+      </div>
+      <div class="icon-block icon-bar">
+        <div class="icon-wrap" v-for="(item, i) in iconData" :key="i" @click="hanleChoose(item)">
+          <div class="icons-item">
+            <Icon :type="item" style="font-size: 32px;"/>
+            <p>{{item}}</p>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { icons } from "@/libs/icon";
+export default {
+  name: "iconChoose",
+  props: {
+    value: {
+      type: String,
+      default: ""
+    },
+    size: String,
+    placeholder: {
+      type: String,
+      default: "输入图标名或选择图标"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: Number,
+    icon: {
+      type: String,
+      default: "md-ionic"
+    }
+  },
+  data() {
+    return {
+      iconModalVisible: false,
+      currentValue: this.value,
+      iconData: [],
+      key: "",
+      tip: "输入英文关键词搜索，比如 success"
+    };
+  },
+  methods: {
+    init() {
+      let re = [];
+      icons.forEach(e => {
+        e.icons.forEach(item => {
+          re.push(item);
+        });
+      });
+      this.iconData = re;
+    },
+    handleInput() {
+      if (this.key) {
+        // 搜索
+        let re = [];
+        icons.forEach(e => {
+          e.tags.forEach(item => {
+            if (item.indexOf(this.key) >= 0) {
+              e.icons.forEach(r => {
+                re.push(r);
+              });
+            }
+          });
+        });
+        this.iconData = re;
+      } else {
+        this.init();
+      }
+    },
+    handleFocus() {
+      if (!this.key) {
+        this.tip = "";
+      }
+    },
+    handleBlur() {
+      if (!this.key) {
+        this.tip = "输入英文关键词搜索，比如 success";
+      }
+    },
+    handleChange(v) {
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue);
+    },
+    setCurrentValue(value) {
+      if (value === this.currentValue) {
+        return;
+      }
+      this.currentValue = value;
+    },
+    hanleChoose(v) {
+      this.currentValue = v;
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue);
+      this.iconModalVisible = false;
+    }
+  },
+  watch: {
+    value(val) {
+      this.setCurrentValue(val);
+    }
+  },
+  created() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.icon-search {
+  position: relative;
+  margin: 20px auto 30px;
+  text-align: center;
+  input {
+    width: 500px;
+    box-sizing: border-box;
+    border: 0;
+    border-radius: 4px;
+    background: #f5f5f5;
+    text-align: center;
+    font-size: 14px;
+    outline: none;
+    margin: 0 auto;
+    padding: 8px 0;
+  }
+}
+.icon-block {
+  display: flex;
+  flex-wrap: wrap;
+  max-height: 500px;
+  overflow: auto;
+}
+.icon-bar {
+  overflow: auto;
+  overflow-x: hidden;
+}
+.icon-bar::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.icon-bar::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: #c3c3c3;
+}
+
+.icon-bar::-webkit-scrollbar-track {
+  background: #fff;
+}
+.icon-wrap {
+  :hover {
+    color: #1890ff;
+    transition: color 0.3s;
+  }
+}
+.icons-item {
+  margin: 6px 6px 6px 0;
+  width: 145px;
+  text-align: center;
+  list-style: none;
+  cursor: pointer;
+  height: 100px;
+  color: #5c6b77;
+  transition: all 0.2s ease;
+  position: relative;
+  padding-top: 10px;
+  p {
+    padding-top: 15px;
+    margin: 5px;
+    font-size: 14px;
+  }
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/member-choose.vue b/manager/src/views/my-components/lili/member-choose.vue
new file mode 100644
index 00000000..195b5dc0
--- /dev/null
+++ b/manager/src/views/my-components/lili/member-choose.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="member-choose">
+    <Button @click="userModalVisible=true" :icon="icon">{{text}}</Button>
+    <span @click="clearSelectData" class="clear">清空已选</span>
+    <Collapse simple class="collapse">
+      <Panel name="1">
+        已选择
+        <span class="select-count">{{selectUsers.length}}</span> 人
+        <p slot="content">
+          <Tag
+            v-for="(item, i) in selectUsers"
+            :key="i"
+            :name="item.id"
+            color="default"
+            closable
+            @on-close="handleCancelUser"
+          >{{item.username}}
+          </Tag>
+        </p>
+      </Panel>
+    </Collapse>
+    <Drawer title="选择用户" closable v-model="userModalVisible" width="800" draggable>
+      <Form ref="searchUserForm" :model="searchUserForm" inline :label-width="55">
+        <Form-item label="用户名" prop="username">
+          <Input
+            type="text"
+            v-model="searchUserForm.username"
+            clearable
+            placeholder="请输入用户名"
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item style="margin-left:-35px;" class="br">
+          <Button @click="handleSearchUser" type="primary" icon="ios-search">搜索</Button>
+          <Button @click="handleResetUser">重置</Button>
+        </Form-item>
+      </Form>
+      <Table
+        :loading="userLoading"
+        border
+        :columns="userColumns"
+        :data="userData"
+        :height="height"
+        ref="userTable"
+      ></Table>
+      <Row type="flex" justify="end" style="margin: 10px 0;">
+        <Page
+          :current="searchUserForm.pageNumber"
+          :total="totalUser"
+          :page-size="searchUserForm.pageSize"
+          @on-change="changeUserPage"
+          @on-page-size-change="changeUserPageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+      <div class="my-drawer-footer">
+        已选择
+        <span class="select-count">{{selectUsers.length}}</span> 人
+        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
+        <Button @click="userModalVisible=false" type="primary" style="margin-left:10px">关闭</Button>
+      </div>
+    </Drawer>
+  </div>
+</template>
+
+<script>
+  import {getMember} from "@/api/member";
+
+  export default {
+    name: "userChoose",
+    props: {
+      text: {
+        type: String,
+        default: "选择会员"
+      },
+      icon: {
+        type: String,
+        default: "md-person-add"
+      }
+    },
+    data() {
+      return {
+        height: 500,
+        userLoading: true,
+        userModalVisible: false,
+        selectUsers: [],
+        searchUserForm: {
+          username: "",
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc" // 默认排序方式
+        },
+        userColumns: [
+          {
+            type: "index",
+            width: 60,
+            align: "center"
+          },
+          {
+            title: "用户名",
+            key: "username",
+            minWidth: 140,
+            sortable: true
+          },
+          {
+            title: "头像",
+            key: "face",
+            width: 80,
+            align: "center",
+            render: (h, params) => {
+              return h("Avatar", {
+                props: {
+                  src: params.row.face
+                }
+              });
+            }
+          },
+          {
+            title: "手机",
+            key: "mobile",
+            width: 125,
+            sortable: true
+          },
+          {
+            title: "状态",
+            key: "status",
+            align: "center",
+            width: 120,
+            render: (h, params) => {
+              if (params.row.delFlag == 0) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "正常启用"
+                    }
+                  })
+                ]);
+              } else if (params.row.delFlag == -1) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "禁用"
+                    }
+                  })
+                ]);
+              }
+            }
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            sortable: true,
+            sortType: "desc",
+            width: 170
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 130,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              let select;
+              this.selectUsers.forEach(item => {
+                if (item.id === params.row.id) {
+                  select = params.row
+                }
+              });
+
+              if (select) {
+                return h("div", [
+                  h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small"
+                    },
+                    on: {
+                      click: () => {
+                        this.chooseCancel(params.row);
+                      }
+                    }
+                  },
+                  "取消选择"
+                  )
+                ]);
+              } else {
+                return h("div", [
+                  h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small"
+                    },
+                    on: {
+                      click: () => {
+                        this.chooseUser(params.row);
+                      }
+                    }
+                  },
+                  "选择"
+                  )
+                ]);
+              }
+            }
+          }
+        ],
+        userData: [],
+        totalUser: 0
+      };
+    },
+    methods: {
+      changeUserPage(v) {
+        this.searchUserForm.pageNumber = v;
+        this.getUserDataList();
+      },
+      changeUserPageSize(v) {
+        this.searchUserForm.pageSize = v;
+        this.getUserDataList();
+      },
+      getUserDataList() {
+        this.userLoading = true;
+        getMember(this.searchUserForm).then(res => {
+          this.userLoading = false;
+          if (res.success) {
+            this.userData = res.result.records;
+            this.totalUser = res.result.total;
+          }
+        });
+      },
+      handleSearchUser() {
+        this.searchUserForm.pageNumber = 1;
+        this.searchUserForm.pageSize = 10;
+        this.getUserDataList();
+      },
+      handleResetUser() {
+        this.$refs.searchUserForm.resetFields();
+        this.searchUserForm.pageNumber = 1;
+        this.searchUserForm.pageSize = 9;
+        this.$refs.dep.clearSelect();
+        this.searchUserForm.departmentId = "";
+        // 重新加载数据
+        this.getUserDataList();
+      },
+      setData(v) {
+        this.selectUsers = v;
+        this.$emit("on-change", this.selectUsers);
+      },
+      chooseCancel(v){
+        let _index;
+        this.selectUsers.forEach((e,index) => {
+          if (v.id == e.id) {
+            _index = index;
+          }
+        });
+
+        if(_index||_index==0){
+          this.selectUsers.splice(_index,1);
+          this.$emit("on-change", this.selectUsers);
+        }
+      },
+      chooseUser(v) {
+        // 去重
+        let that = this;
+        let flag = true;
+        this.selectUsers.forEach(e => {
+          if (v.id == e.id) {
+            flag = false;
+          }
+        });
+        if (flag) {
+          let u = {
+            id: v.id,
+            username: v.username
+          };
+          this.selectUsers.push(u);
+          this.$emit("on-change", this.selectUsers);
+        }
+      },
+      clearSelectData() {
+        this.selectUsers = [];
+        this.$emit("on-change", this.selectUsers);
+      },
+      handleCancelUser(e, id) {
+        // 删除所选用户
+        let newArray = [];
+        this.selectUsers.forEach(e => {
+          if (id != e.id) {
+            newArray.push(e);
+          }
+        });
+        this.selectUsers = newArray;
+        this.$emit("on-change", this.selectUsers);
+        this.$Message.success("删除所选用户成功");
+      }
+    },
+    created() {
+      // 计算高度
+      this.height = Number(document.documentElement.clientHeight - 230);
+      this.getUserDataList();
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .member-choose {
+    .clear {
+      font-size: 12px;
+      margin-left: 15px;
+      color: #40a9ff;
+      cursor: pointer;
+    }
+
+    .collapse {
+      font-size: 12px;
+      margin-top: 15px;
+      width: 500px;
+    }
+
+    .select-count {
+      font-weight: 600;
+      color: #40a9ff;
+    }
+  }
+
+  .my-drawer-footer {
+    z-index: 10;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    background: #fff;
+  }
+</style>
diff --git a/manager/src/views/my-components/lili/quill.vue b/manager/src/views/my-components/lili/quill.vue
new file mode 100644
index 00000000..8c32eb61
--- /dev/null
+++ b/manager/src/views/my-components/lili/quill.vue
@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <div id="toolbar">
+      <button class="ql-bold" title="粗体"></button>
+      <button class="ql-italic" title="斜体"></button>
+      <button class="ql-underline" title="下划线"></button>
+      <button class="ql-strike" title="删除线"></button>
+      <select class="ql-size" title="字体大小">
+        <option value="small"></option>
+        <option selected></option>
+        <option value="large"></option>
+        <option value="huge"></option>
+      </select>
+      <select class="ql-header" title="标题大小">
+        <option value="1"></option>
+        <option value="2"></option>
+        <option value="3"></option>
+        <option value="4"></option>
+        <option value="5"></option>
+        <option value="6"></option>
+        <option selected></option>
+      </select>
+      <select class="ql-font" title="字体"></select>
+      <select class="ql-align" title="对齐方式"></select>
+      <select class="ql-color" title="字体颜色"></select>
+      <select class="ql-background" title="背景颜色"></select>
+      <button class="ql-blockquote" title="引用"></button>
+      <button class="ql-code-block" title="代码块"></button>
+      <button class="ql-list" value="ordered" title="数字列表"></button>
+      <button class="ql-list" value="bullet" title="点列表"></button>
+      <button class="ql-script" value="sub" title="右下标"></button>
+      <button class="ql-script" value="super" title="右上标"></button>
+      <button class="ql-indent" value="-1" title="向左缩进"></button>
+      <button class="ql-indent" value="+1" title="向右缩进"></button>
+      <button class="ql-clean" title="清空样式"></button>
+
+      <button class="ql-link" title="链接"></button>
+      <button class="ql-image" title="插入图片" v-if="base64"></button>
+      <div class="q-menu" title="插入图片" v-if="!base64">
+        <Upload
+          :action="uploadFileUrl"
+          :headers="accessToken"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :format="['jpg','jpeg','png','gif','bmp']"
+          accept=".jpg, .jpeg, .png, .gif, .bmp"
+          :max-size="5120"
+          :on-format-error="handleFormatError"
+          :on-exceeded-size="handleMaxSize"
+          :before-upload="beforeUpload"
+          :show-upload-list="false"
+          ref="qup"
+        >
+          <Icon type="md-images" size="20" />
+        </Upload>
+      </div>
+      <button class="ql-video" title="插入视频链接"></button>
+      <div class="q-menu" title="编辑HTML代码" @click="editHTML" v-if="expandHtml">
+        <Icon type="md-code-working" size="22" />
+      </div>
+      <div class="q-menu" title="预览" @click="fullscreenModal=true" v-if="expandPreview">
+        <Icon type="ios-eye" size="24" />
+      </div>
+      <div class="q-menu q-trash" title="清空" @click="clear" v-if="expandClear">
+        <Icon type="md-trash" size="18" style="display: block;" />
+      </div>
+    </div>
+
+    <div :id="id" :style="{minHeight: minHeight}"></div>
+
+    <Modal
+      title="编辑html代码"
+      v-model="showHTMLModal"
+      :mask-closable="false"
+      :width="900"
+      :fullscreen="full"
+    >
+      <Input
+        v-if="!full"
+        v-model="dataEdit"
+        :rows="15"
+        type="textarea"
+        style="max-height:60vh;overflow:auto;"
+      />
+      <Input v-if="full" v-model="dataEdit" :rows="32" type="textarea" />
+      <div slot="footer">
+        <Button @click="full=!full" icon="md-expand">全屏开/关</Button>
+        <Button @click="editHTMLOk" type="primary" icon="md-checkmark-circle-outline">确定保存</Button>
+      </div>
+    </Modal>
+    <Modal title="预览" v-model="fullscreenModal" fullscreen>
+      <div v-html="data">{{data}}</div>
+      <div slot="footer">
+        <Button @click="fullscreenModal=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import Quill from "quill";
+import "quill/dist/quill.snow.css";
+import xss from "xss";
+var editor = null;
+export default {
+  name: "editor",
+  props: {
+    id: {
+      type: String,
+      default: "quill"
+    },
+    value: String,
+    base64: {
+      type: Boolean,
+      default: false
+    },
+    minHeight: {
+      type: String,
+      default: "300px"
+    },
+    expandHtml: {
+      type: Boolean,
+      default: true
+    },
+    expandPreview: {
+      type: Boolean,
+      default: true
+    },
+    expandClear: {
+      type: Boolean,
+      default: true
+    },
+    openXss: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      accessToken: {},
+      uploadFileUrl: uploadFile,
+      editor: null,
+      options: {
+        theme: "snow",
+        modules: {
+          toolbar: "#toolbar"
+        },
+        placeholder: "在这输入内容 ..."
+      },
+      data: this.value, // 富文本数据
+      dataEdit: "", // 编辑数据
+      showHTMLModal: false, // 显示html
+      full: false, // html全屏开关
+      fullscreenModal: false // 显示全屏预览
+    };
+  },
+  methods: {
+    initEditor() {
+      this.accessToken = {
+        accessToken: this.getStore("accessToken")
+      };
+      editor = new Quill(`#${this.id}`, this.options);
+      let that = this;
+      if (this.value) {
+        editor.pasteHTML(this.value);
+      }
+      editor.on("text-change", function(delta, oldDelta, source) {
+        let html = editor.container.firstChild.innerHTML;
+        if (that.openXss) {
+          that.data = xss(html);
+        } else {
+          that.data = html;
+        }
+        that.$emit("input", that.data);
+        that.$emit("on-change", that.data);
+      });
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "不支持的文件格式",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 5M."
+      });
+    },
+    beforeUpload() {
+      return true;
+    },
+    handleSuccess(res, file) {
+      if (res.success) {
+        let url = res.result;
+        // 获取光标位置
+        let range = editor.getSelection(true);
+        // 总元素
+        let delta = editor.getContents().length;
+        let index;
+        if (range) {
+          index = range.index;
+        } else {
+          index = delta;
+        }
+        // 插入元素
+        editor.insertEmbed(index, "image", url);
+        editor.setSelection(index + 1, 0);
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.$Message.error(error.toString());
+    },
+    editHTML() {
+      this.dataEdit = this.data;
+      this.showHTMLModal = true;
+    },
+    editHTMLOk() {
+      editor.pasteHTML(this.dataEdit);
+      this.$emit("input", this.data);
+      this.$emit("on-change", this.data);
+      this.showHTMLModal = false;
+    },
+    clear() {
+      this.$Modal.confirm({
+        title: "确认清空",
+        content: "确认要清空编辑器内容？清空后不能撤回",
+        onOk: () => {
+          this.data = "";
+          editor.pasteHTML(this.data);
+          this.$emit("input", this.data);
+          this.$emit("on-change", this.data);
+        }
+      });
+    },
+    setData(value) {
+      if (!editor) {
+        this.initEditor();
+      }
+      if (value && value != this.data) {
+        this.data = value;
+        let index = editor.selection.savedRange.index;
+        editor.pasteHTML(this.data);
+        editor.setSelection(index, 0);
+        this.$emit("input", this.data);
+        this.$emit("on-change", this.data);
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.setData(val);
+    }
+  },
+  mounted() {
+    this.initEditor();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.q-menu {
+  margin: 0 3px;
+  display: inline-block;
+  cursor: pointer;
+  color: #444;
+  :hover {
+    color: #06c;
+  }
+}
+.q-trash {
+  margin-bottom: 3px;
+}
+.ql-tooltip {
+  left: 30% !important;
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/rect-loading.vue b/manager/src/views/my-components/lili/rect-loading.vue
new file mode 100644
index 00000000..761607a2
--- /dev/null
+++ b/manager/src/views/my-components/lili/rect-loading.vue
@@ -0,0 +1,81 @@
+<template>
+  <div class="spinner">
+    <div class="rect1"></div>
+    <div class="rect2"></div>
+    <div class="rect3"></div>
+    <div class="rect4"></div>
+    <div class="rect5"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "rectLoading"
+};
+</script>
+
+<style lang="scss" scoped>
+.spinner {
+  margin-top: 20vh;
+  margin-bottom: 30vh;
+  height: 60px;
+  text-align: center;
+  font-size: 10px;
+  span {
+    display: block;
+    font-size: 12px;
+    color: rgba(0, 0, 0, 0.45);
+    margin-top: 1vh;
+  }
+  div {
+    margin-right: 4px;
+    background-color: #4e9ff5;
+    height: 100%;
+    width: 6px;
+    display: inline-block;
+    -webkit-animation: stretchdelay 1.2s infinite ease-in-out;
+    animation: stretchdelay 1.2s infinite ease-in-out;
+  }
+  .rect2 {
+    -webkit-animation-delay: -1.1s;
+    animation-delay: -1.1s;
+  }
+  .rect3 {
+    -webkit-animation-delay: -1s;
+    animation-delay: -1s;
+  }
+  .rect4 {
+    -webkit-animation-delay: -0.9s;
+    animation-delay: -0.9s;
+  }
+  .rect5 {
+    -webkit-animation-delay: -0.8s;
+    animation-delay: -0.8s;
+  }
+}
+
+@-webkit-keyframes stretchdelay {
+  0%,
+  40%,
+  100% {
+    -webkit-transform: scaleY(0.4);
+  }
+  20% {
+    -webkit-transform: scaleY(1);
+  }
+}
+
+@keyframes stretchdelay {
+  0%,
+  40%,
+  100% {
+    transform: scaleY(0.4);
+    -webkit-transform: scaleY(0.4);
+  }
+  20% {
+    transform: scaleY(1);
+    -webkit-transform: scaleY(1);
+  }
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/set-password.vue b/manager/src/views/my-components/lili/set-password.vue
new file mode 100644
index 00000000..0a262d1c
--- /dev/null
+++ b/manager/src/views/my-components/lili/set-password.vue
@@ -0,0 +1,166 @@
+<template>
+  <div class="set-password">
+    <Poptip transfer trigger="focus" placement="right" width="250">
+      <Input
+        type="password"
+        password
+        style="width:350px;"
+        :maxlength="maxlength"
+        v-model="currentValue"
+        @on-change="handleChange"
+        :size="size"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+      />
+      <div :class="tipStyle" slot="content">
+        <div class="words">强度 : {{strength}}</div>
+        <Progress
+          :percent="strengthValue"
+          :status="progressStatus"
+          hide-info
+          style="margin: 13px 0;"
+        />
+        <br />请至少输入 6 个字符。请不要使
+        <br />用容易被猜到的密码。
+      </div>
+    </Poptip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "setPassword",
+  props: {
+    value: String,
+    size: String,
+    placeholder: {
+      type: String,
+      default: "请输入密码，长度为6-20个字符"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: Number,
+      default: 20
+    }
+  },
+  data() {
+    return {
+      currentValue: this.value,
+      tipStyle: "password-tip-none",
+      strengthValue: 0,
+      progressStatus: "normal",
+      strength: "无",
+      grade: 0
+    };
+  },
+  methods: {
+    checkStrengthValue(v) {
+      // 评级制判断密码强度 最高5
+      let grade = 0;
+      if (/\d/.test(v)) {
+        grade++; //数字
+      }
+      if (/[a-z]/.test(v)) {
+        grade++; //小写
+      }
+      if (/[A-Z]/.test(v)) {
+        grade++; //大写
+      }
+      if (/\W/.test(v)) {
+        grade++; //特殊字符
+      }
+      if (v.length >= 10) {
+        grade++;
+      }
+      this.grade = grade;
+      return grade;
+    },
+    strengthChange() {
+      if (!this.currentValue) {
+        this.tipStyle = "password-tip-none";
+        this.strength = "无";
+        this.strengthValue = 0;
+        return;
+      }
+      let grade = this.checkStrengthValue(this.currentValue);
+      if (grade <= 1) {
+        this.progressStatus = "wrong";
+        this.tipStyle = "password-tip-weak";
+        this.strength = "弱";
+        this.strengthValue = 33;
+      } else if (grade >= 2 && grade <= 4) {
+        this.progressStatus = "normal";
+        this.tipStyle = "password-tip-middle";
+        this.strength = "中";
+        this.strengthValue = 66;
+      } else {
+        this.progressStatus = "success";
+        this.tipStyle = "password-tip-strong";
+        this.strength = "强";
+        this.strengthValue = 100;
+      }
+    },
+    handleChange(v) {
+      this.strengthChange();
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue, this.grade, this.strength);
+    },
+    setCurrentValue(value) {
+      if (value === this.currentValue) {
+        return;
+      }
+      this.currentValue = value;
+      this.strengthChange();
+      this.$emit("on-change", this.currentValue, this.grade, this.strength);
+    }
+  },
+  watch: {
+    value(val) {
+      this.setCurrentValue(val);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.set-password .ivu-poptip,
+.set-password .ivu-poptip-rel {
+  display: block;
+}
+.password-tip-none {
+  padding: 1vh 0;
+}
+
+.password-tip-weak {
+  padding: 1vh 0;
+
+  .words {
+    color: #ed3f14;
+  }
+}
+
+.password-tip-middle {
+  padding: 1vh 0;
+
+  .words {
+    color: #2d8cf0;
+  }
+}
+
+.password-tip-strong {
+  padding: 1vh 0;
+
+  .words {
+    color: #52c41a;
+  }
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/sku-choose.vue b/manager/src/views/my-components/lili/sku-choose.vue
new file mode 100644
index 00000000..c5059550
--- /dev/null
+++ b/manager/src/views/my-components/lili/sku-choose.vue
@@ -0,0 +1,358 @@
+<template>
+  <div class="sku-choose">
+    <Button @click="showDrawer=true" :icon="icon">{{text}}</Button>
+    <span @click="clearSelectData" class="clear">清空已选</span>
+    <Collapse simple class="collapse">
+      <Panel name="1">
+        已选择
+        <span class="select-count">{{selectObj.length}}</span> 件
+        <p slot="content">
+          <Tag
+            v-for="(item, i) in selectObj"
+            :key="i"
+            :name="item.id"
+            color="default"
+            closable
+            @on-close="handleCancelObj"
+          >{{createName(item)}}
+          </Tag>
+        </p>
+      </Panel>
+    </Collapse>
+    <Drawer title="选择SKU" closable v-model="showDrawer" :width="width" draggable>
+      <Form ref="searchForm" :model="searchForm" inline :label-width="55">
+        <Form-item label="名称" prop="goodsName">
+          <Input
+            type="text"
+            v-model="searchForm.goodsName"
+            clearable
+            placeholder="输入商品名称"
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item style="margin-left:-35px;" class="br">
+          <Button @click="handleSearchData" type="primary" icon="ios-search">搜索</Button>
+          <Button @click="handleResetObj">重置</Button>
+        </Form-item>
+      </Form>
+      <Table
+        :loading="showLoading"
+        border
+        :columns="tableColumns"
+        :data="tableData"
+        :height="height"
+        ref="tableData"
+      ></Table>
+      <Row type="flex" justify="end" style="margin: 10px 0;">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="tableTotal"
+          :page-size="searchForm.pageSize"
+          @on-change="changeDataPage"
+          @on-page-size-change="changeDataPageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+      <div class="my-drawer-footer">
+        已选择
+        <span class="select-count">{{selectObj.length}}</span> 件
+        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
+        <Button @click="showDrawer=false" type="primary" style="margin-left:10px">关闭</Button>
+      </div>
+    </Drawer>
+  </div>
+</template>
+
+<script>
+  import {getSkuPage} from "@/api/goods";
+
+  export default {
+    name: "userChoose",
+    props: {
+      text: {
+        type: String,
+        default: "选择SKU"
+      },
+      icon: {
+        type: String,
+        default: "md-basket"
+      },
+      initData: {
+        type: Array,
+        default: []
+      },
+      createName: {
+        type: Function,
+        default: function (item) {
+          return item.goodsName
+        }
+      }
+    },
+    mounted(){
+      this.selectObj = this.initData
+      console.log(JSON.stringify(this.initData))
+    },
+    data() {
+      return {
+        //默认值后续计算
+        height: 500,
+        width: 500,
+        //加载状态
+        showLoading: true,
+        //展示抽屉
+        showDrawer: false,
+        selectObj: [],
+        searchForm: {
+          goodsName: "",
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc" // 默认排序方式
+        },
+        tableColumns: [
+          {
+            type: "index",
+            width: 60,
+            align: "center"
+          },
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 140
+          },
+          {
+            title: "规格",
+            key: "specName",
+            minWidth: 140,
+          },
+          {
+            title: "图片",
+            key: "thumbnail",
+            width: 80,
+            align: "center",
+            render: (h, params) => {
+              return h("Avatar", {
+                props: {
+                  src: params.row.face
+                }
+              });
+            }
+          },
+          {
+            title: "状态",
+            key: "status",
+            align: "center",
+            width: 120,
+            render: (h, params) => {
+              if (params.row.delFlag == 0) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "正常"
+                    }
+                  })
+                ]);
+              } else if (params.row.delFlag == -1) {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "禁用"
+                    }
+                  })
+                ]);
+              }
+            }
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            sortable: true,
+            sortType: "desc",
+            width: 170
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 130,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              let select;
+              this.selectObj.forEach(item => {
+                if (item.id === params.row.id) {
+                  select = params.row
+                }
+              });
+
+              if (select) {
+                return h("div", [
+                  h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small"
+                    },
+                    on: {
+                      click: () => {
+                        this.chooseCancel(params.row);
+                      }
+                    }
+                  },
+                  "取消选择"
+                  )
+                ]);
+              } else {
+                return h("div", [
+                  h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small"
+                    },
+                    on: {
+                      click: () => {
+                        this.chooseObj(params.row);
+                      }
+                    }
+                  },
+                  "选择"
+                  )
+                ]);
+              }
+            }
+          }
+        ],
+        tableData: [],
+        tableTotal: 0
+      };
+    },
+    methods: {
+      changeDataPage(v) {
+        this.searchForm.pageNumber = v;
+        this.searchData();
+      },
+      changeDataPageSize(v) {
+        this.searchForm.pageSize = v;
+        this.searchData();
+      },
+      searchData() {
+        this.showLoading = true;
+        getSkuPage(this.searchForm).then(res => {
+          this.showLoading = false;
+          if (res.success) {
+            this.tableData = res.result.records;
+            this.tableTotal = res.result.total;
+          }
+        });
+
+      },
+      handleSearchData() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.searchData();
+      },
+      handleResetObj() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 9;
+        this.searchForm.departmentId = "";
+        // 重新加载数据
+        this.searchData();
+      },
+      setData(v) {
+        this.selectObj = v;
+        this.$emit("on-change", this.selectObj);
+      },
+      chooseCancel(v) {
+        let _index;
+        this.selectObj.forEach((e, index) => {
+          if (v.id == e.id) {
+            _index = index;
+          }
+        });
+
+        if (_index || _index == 0) {
+          this.selectObj.splice(_index, 1);
+          this.$emit("on-change", this.selectObj);
+        }
+      },
+      chooseObj(v) {
+        // 去重
+        let that = this;
+        let flag = true;
+        this.selectObj.forEach(e => {
+          if (v.id == e.id) {
+            flag = false;
+          }
+        });
+        if (flag) {
+          this.selectObj.push(v);
+          this.$emit("on-change", this.selectObj);
+        }
+      },
+      clearSelectData() {
+        this.selectObj = [];
+        this.$emit("on-change", this.selectObj);
+      },
+      handleCancelObj(e, id) {
+        // 删除所选用户
+        let newArray = [];
+        this.selectObj.forEach(e => {
+          if (id != e.id) {
+            newArray.push(e);
+          }
+        });
+        this.selectObj = newArray;
+        this.$emit("on-change", this.selectObj);
+      }
+    },
+    created() {
+      // 计算高度
+      this.height = Number(document.documentElement.clientHeight - 230);
+      this.width = Number(document.documentElement.clientWidth/2)>900?900:Number(document.documentElement.clientWidth/2)
+      this.searchData();
+
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .sku-choose {
+    .clear {
+      font-size: 12px;
+      margin-left: 15px;
+      color: #40a9ff;
+      cursor: pointer;
+    }
+
+    .collapse {
+      font-size: 12px;
+      margin-top: 15px;
+    }
+
+    .select-count {
+      font-weight: 600;
+      color: #40a9ff;
+    }
+  }
+
+  .my-drawer-footer {
+    z-index: 10;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    background: #fff;
+  }
+</style>
diff --git a/manager/src/views/my-components/lili/upload-pic-input.vue b/manager/src/views/my-components/lili/upload-pic-input.vue
new file mode 100644
index 00000000..ff88f669
--- /dev/null
+++ b/manager/src/views/my-components/lili/upload-pic-input.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <div style="display:flex;">
+      <Input
+        v-model="currentValue"
+        @on-change="handleChange"
+        v-show="showInput"
+        :placeholder="placeholder"
+        :size="size"
+        :disabled="disabled"
+        :readonly="readonly"
+        :maxlength="maxlength"
+      >
+        <Button slot="append" icon="md-eye"></Button>
+      </Input>
+      <Poptip transfer trigger="hover" title="图片预览" placement="right" width="350">
+        <Icon type="md-eye" class="see-icon" />
+        <div slot="content">
+          <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+          <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
+        </div>
+      </Poptip>
+      <Upload
+        :action="uploadFileUrl"
+        :headers="accessToken"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :format="['jpg','jpeg','png','gif','bmp']"
+        accept=".jpg, .jpeg, .png, .gif, .bmp"
+        :max-size="maxSize*1024"
+        :on-format-error="handleFormatError"
+        :on-exceeded-size="handleMaxSize"
+        :before-upload="beforeUpload"
+        :show-upload-list="false"
+        ref="up"
+        class="upload"
+      >
+        <Button :loading="loading" :size="size" :disabled="disabled" :icon="icon">上传图片</Button>
+      </Upload>
+    </div>
+
+    <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
+      <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+      <div slot="footer">
+        <Button @click="viewImage=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+export default {
+  name: "uploadPicInput",
+  props: {
+    value: String,
+    size: String,
+    placeholder: {
+      type: String,
+      default: "图片链接"
+    },
+    showInput: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxSize: {
+      type: Number,
+      default: 5
+    },
+    maxlength: Number,
+    icon: {
+      type: String,
+      default: "ios-cloud-upload-outline"
+    }
+  },
+  data() {
+    return {
+      accessToken: {},
+      currentValue: this.value,
+      loading: false,
+      viewImage: false,
+      uploadFileUrl: uploadFile
+    };
+  },
+  methods: {
+    init() {
+      this.accessToken = {
+        accessToken: this.getStore("accessToken")
+      };
+    },
+    handleFormatError(file) {
+      this.loading = false;
+      this.$Notice.warning({
+        title: "不支持的文件格式",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
+      });
+    },
+    handleMaxSize(file) {
+      this.loading = false;
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
+      });
+    },
+    beforeUpload() {
+      this.loading = true;
+      return true;
+    },
+    handleSuccess(res, file) {
+      this.loading = false;
+      if (res.success) {
+        this.currentValue = res.result;
+        this.$emit("input", this.currentValue);
+        this.$emit("on-change", this.currentValue);
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.loading = false;
+      this.$Message.error(error.toString());
+    },
+    handleChange(v) {
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue);
+      this.$attrs.rollback && this.$attrs.rollback()
+    },
+    setCurrentValue(value) {
+      if (value === this.currentValue) {
+        return;
+      }
+      this.currentValue = value;
+      this.$emit("on-change", this.currentValue);
+    }
+  },
+  watch: {
+    value(val) {
+      this.setCurrentValue(val);
+    }
+  },
+  created() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.see-icon {
+  font-size: 16px;
+  margin-left: -32px;
+  margin-top: 3px;
+  padding: 7px;
+  cursor: pointer;
+}
+
+.upload {
+  display: inline-block;
+  margin-left: 10px;
+}
+</style>
+
diff --git a/manager/src/views/my-components/lili/upload-pic-thumb.vue b/manager/src/views/my-components/lili/upload-pic-thumb.vue
new file mode 100644
index 00000000..16c6ddb0
--- /dev/null
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -0,0 +1,288 @@
+<template>
+  <div>
+    <vuedraggable
+      :list="uploadList"
+      :disabled="!draggable||!multiple"
+      :animation="200"
+      class="list-group"
+      ghost-class="thumb-ghost"
+      @end="onEnd"
+    >
+      <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
+        <div v-if="item.status == 'finished'">
+          <img :src="item.url" />
+          <div class="upload-list-cover">
+            <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
+            <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+          </div>
+        </div>
+        <div v-else>
+          <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+        </div>
+      </div>
+    </vuedraggable>
+    <Upload
+      ref="upload"
+      :multiple="multiple"
+      :show-upload-list="false"
+      :on-success="handleSuccess"
+      :on-error="handleError"
+      :format="['jpg','jpeg','png','gif']"
+      :max-size="maxSize*1024"
+      :on-format-error="handleFormatError"
+      :on-exceeded-size="handleMaxSize"
+      :before-upload="handleBeforeUpload"
+      type="drag"
+      :action="uploadFileUrl"
+      :headers="accessToken"
+      style="display: inline-block;width:58px;"
+    >
+      <div style="width: 58px;height:58px;line-height: 58px;">
+        <Icon type="md-camera" size="20"></Icon>
+      </div>
+    </Upload>
+
+    <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
+      <img :src="imgUrl" alt="无效的图片链接" style="width: 100%;margin: 0 auto;display: block;" />
+      <div slot="footer">
+        <Button @click="viewImage=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import vuedraggable from "vuedraggable";
+export default {
+  name: "uploadPicThumb",
+  components: {
+    vuedraggable
+  },
+  props: {
+    value: {
+      type: Object
+    },
+    draggable: {
+      type: Boolean,
+      default: true
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    maxSize: {
+      type: Number,
+      default: 5
+    },
+    limit: {
+      type: Number,
+      default: 10
+    }
+  },
+  data() {
+    return {
+      accessToken: {},
+      uploadFileUrl: uploadFile,
+      uploadList: [],
+      viewImage: false,
+      imgUrl: ""
+    };
+  },
+  methods: {
+    onEnd() {
+      this.returnValue();
+    },
+    init() {
+      this.setData(this.value, true);
+      this.accessToken = {
+        accessToken: this.getStore("accessToken")
+      };
+    },
+    handleView(imgUrl) {
+      this.imgUrl = imgUrl;
+      this.viewImage = true;
+    },
+    handleRemove(file) {
+      this.uploadList = this.uploadList.filter(i => i.url !== file.url);
+      this.returnValue();
+    },
+    handleSuccess(res, file) {
+      if (res.success) {
+
+
+        file.url = res.result;
+        // 单张图片处理
+        if (!this.multiple && this.uploadList.length > 0) {
+          // 删除第一张
+          this.uploadList.splice(0, 1);
+        }
+        this.uploadList.push(file);
+        // 返回组件值
+        this.returnValue();
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.$Message.error(error.toString());
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "不支持的文件格式",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’格式不正确, 请选择 .jpg .jpeg .png .gif图片格式文件"
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’大小过大, 不得超过 " +
+          this.maxSize +
+          "M."
+      });
+    },
+    handleBeforeUpload() {
+      if (this.multiple && this.uploadList.length >= this.limit) {
+        this.$Message.warning("最多只能上传" + this.limit + "张图片");
+        return false;
+      }
+      return true;
+    },
+    returnValue() {
+      if (!this.uploadList || this.uploadList.length < 1) {
+        if (!this.multiple) {
+          this.$emit("input", "");
+          this.$emit("on-change", "");
+        } else {
+          this.$emit("input", []);
+          this.$emit("on-change", []);
+        }
+        return;
+      }
+      if (!this.multiple) {
+        // 单张
+        let v = this.uploadList[0].url;
+        this.$emit("input", v);
+        this.$emit("on-change", v);
+      } else {
+        let v = [];
+        this.uploadList.forEach(e => {
+          v.push(e.url);
+        });
+        this.$emit("input", v);
+        this.$emit("on-change", v);
+      }
+    },
+    setData(v, init) {
+      if (typeof v == "string") {
+        // 单张
+        if (this.multiple) {
+          this.$Message.warning("多张上传仅支持数组数据类型");
+          return;
+        }
+        if (!v) {
+          return;
+        }
+        this.uploadList = [];
+        let item = {
+          url: v,
+          status: "finished"
+        };
+        this.uploadList.push(item);
+        this.$emit("uploadchange", v);
+        this.$emit("on-change", v);
+      } else if (typeof v == "object") {
+        // 多张
+        if (!this.multiple) {
+          this.$Message.warning("单张上传仅支持字符串数据类型");
+          return;
+        }
+        this.uploadList = [];
+        if (v.length > this.limit) {
+          for (let i = 0; i < this.limit; i++) {
+            let item = {
+              url: v[i],
+              status: "finished"
+            };
+            this.uploadList.push(item);
+          }
+          this.$emit("on-change", v.slice(0, this.limit));
+          if (init) {
+            this.$emit("input", v.slice(0, this.limit));
+          }
+          this.$Message.warning("最多只能上传" + this.limit + "张图片");
+        } else {
+          v.forEach(e => {
+            let item = {
+              status: "finished",
+              ...e
+            };
+            this.uploadList.push(item);
+          });
+          this.$emit("on-change", v);
+        }
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.setData(val);
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 5px;
+}
+.upload-list img {
+  width: 100%;
+  height: -webkit-fill-available;
+}
+.upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.upload-list:hover .upload-list-cover {
+  display: block;
+}
+.upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.list-group {
+  display: inline-block;
+}
+.thumb-ghost {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
+</style>
diff --git a/manager/src/views/my-components/lili/user-choose.vue b/manager/src/views/my-components/lili/user-choose.vue
new file mode 100644
index 00000000..74b0b0b9
--- /dev/null
+++ b/manager/src/views/my-components/lili/user-choose.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="user-choose">
+    <Button @click="userModalVisible=true" :icon="icon">{{text}}</Button>
+    <span @click="clearSelectData" class="clear">清空已选</span>
+    <Collapse simple class="collapse">
+      <Panel name="1">
+        已选择
+        <span class="select-count">{{selectUsers.length}}</span> 人
+        <p slot="content">
+          <Tag
+            v-for="(item, i) in selectUsers"
+            :key="i"
+            :name="item.id"
+            color="default"
+            closable
+            @on-close="handleCancelUser"
+          >{{item.username}}</Tag>
+        </p>
+      </Panel>
+    </Collapse>
+    <Drawer title="选择用户" closable v-model="userModalVisible" width="800" draggable>
+      <Form ref="searchUserForm" :model="searchUserForm" inline :label-width="55">
+        <Form-item label="用户名" prop="username">
+          <Input
+            type="text"
+            v-model="searchUserForm.username"
+            clearable
+            placeholder="请输入用户名"
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="部门" prop="department">
+          <department-choose @on-change="handleSelectDep" style="width: 200px" ref="dep"></department-choose>
+        </Form-item>
+        <Form-item style="margin-left:-35px;" class="br">
+          <Button @click="handleSearchUser" type="primary" icon="ios-search">搜索</Button>
+          <Button @click="handleResetUser">重置</Button>
+        </Form-item>
+      </Form>
+      <Table
+        :loading="userLoading"
+        border
+        :columns="userColumns"
+        :data="userData"
+        :height="height"
+        ref="userTable"
+      ></Table>
+      <Row type="flex" justify="end" style="margin: 10px 0;">
+        <Page
+          :current="searchUserForm.pageNumber"
+          :total="totalUser"
+          :page-size="searchUserForm.pageSize"
+          @on-change="changeUserPage"
+          @on-page-size-change="changeUserPageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+      <div class="my-drawer-footer">
+        已选择
+        <span class="select-count">{{selectUsers.length}}</span> 人
+        <Button @click="clearSelectData" style="margin-left:10px">清空已选</Button>
+        <Button @click="userModalVisible=false" type="primary" style="margin-left:10px">关闭</Button>
+      </div>
+    </Drawer>
+  </div>
+</template>
+
+<script>
+import { getUserListData } from "@/api/index";
+import departmentChoose from "./department-choose";
+export default {
+  name: "userChoose",
+  components: {
+    departmentChoose
+  },
+  props: {
+    text: {
+      type: String,
+      default: "选择用户"
+    },
+    icon: {
+      type: String,
+      default: "md-person-add"
+    }
+  },
+  data() {
+    return {
+      //高度 下方已重新计算
+      height: 500,
+      //加载
+      userLoading: true,
+      //显示选择器
+      userModalVisible: false,
+      //选择的对象
+      selectUsers: [],
+      //搜索参数
+      searchUserForm: {
+        username: "",
+        type: "",
+        status: "",
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc" // 默认排序方式
+      },
+      userColumns: [
+        {
+          type: "index",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "用户名",
+          key: "username",
+          minWidth: 140,
+          sortable: true
+        },
+        {
+          title: "头像",
+          key: "avatar",
+          width: 80,
+          align: "center",
+          render: (h, params) => {
+            return h("Avatar", {
+              props: {
+                src: params.row.avatar
+              }
+            });
+          }
+        },
+        {
+          title: "所属部门",
+          key: "departmentTitle",
+          width: 120
+        },
+        {
+          title: "手机",
+          key: "mobile",
+          width: 125,
+          sortable: true
+        },
+        {
+          title: "邮箱",
+          key: "email",
+          width: 180,
+          sortable: true
+        },
+        {
+          title: "性别",
+          key: "sex",
+          width: 70,
+          align: "center"
+        },
+        {
+          title: "用户类型",
+          key: "type",
+          align: "center",
+          width: 100,
+          render: (h, params) => {
+            let re = "";
+            if (params.row.type == 1) {
+              re = "管理员";
+            } else if (params.row.type == 0) {
+              re = "普通用户";
+            }
+            return h("div", re);
+          }
+        },
+        {
+          title: "状态",
+          key: "status",
+          align: "center",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.status == 0) {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "正常启用"
+                  }
+                })
+              ]);
+            } else if (params.row.status == -1) {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "禁用"
+                  }
+                })
+              ]);
+            }
+          }
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          sortable: true,
+          sortType: "desc",
+          width: 170
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 130,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small"
+                  },
+                  on: {
+                    click: () => {
+                      this.chooseUser(params.row);
+                    }
+                  }
+                },
+                "添加该用户"
+              )
+            ]);
+          }
+        }
+      ],
+      userData: [],
+      totalUser: 0
+    };
+  },
+  methods: {
+    handleSelectDep(v) {
+      this.searchUserForm.departmentId = v;
+    },
+    changeUserPage(v) {
+      this.searchUserForm.pageNumber = v;
+      this.getUserDataList();
+    },
+    changeUserPageSize(v) {
+      this.searchUserForm.pageSize = v;
+      this.getUserDataList();
+    },
+    getUserDataList() {
+      this.userLoading = true;
+      getUserListData(this.searchUserForm).then(res => {
+        this.userLoading = false;
+        if (res.success) {
+          this.userData = res.result.records;
+          this.totalUser = res.result.total;
+        }
+      });
+    },
+    handleSearchUser() {
+      this.searchUserForm.pageNumber = 1;
+      this.searchUserForm.pageSize = 9;
+      this.getUserDataList();
+    },
+    handleResetUser() {
+      this.$refs.searchUserForm.resetFields();
+      this.searchUserForm.pageNumber = 1;
+      this.searchUserForm.pageSize = 9;
+      this.$refs.dep.clearSelect();
+      this.searchUserForm.departmentId = "";
+      // 重新加载数据
+      this.getUserDataList();
+    },
+    setData(v) {
+      this.selectUsers = v;
+      this.$emit("on-change", this.selectUsers);
+    },
+    chooseUser(v) {
+      // 去重
+      let that = this;
+      let flag = true;
+      this.selectUsers.forEach(e => {
+        if (v.id == e.id) {
+          that.$Message.warning("已经添加过啦，请勿重复选择");
+          flag = false;
+        }
+      });
+      if (flag) {
+        let u = {
+          id: v.id,
+          username: v.username
+        };
+        this.selectUsers.push(u);
+        this.$emit("on-change", this.selectUsers);
+        this.$Message.success(`添加用户 ${v.username} 成功`);
+      }
+    },
+    clearSelectData() {
+      this.selectUsers = [];
+      this.$emit("on-change", this.selectUsers);
+    },
+    handleCancelUser(e, id) {
+      // 删除所选用户
+      let newArray = [];
+      this.selectUsers.forEach(e => {
+        if (id != e.id) {
+          newArray.push(e);
+        }
+      });
+      this.selectUsers = newArray;
+      this.$emit("on-change", this.selectUsers);
+      this.$Message.success("删除所选用户成功");
+    }
+  },
+  created() {
+    // 计算高度
+    this.height = Number(document.documentElement.clientHeight - 230);
+    this.getUserDataList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.user-choose {
+  .clear {
+    font-size: 12px;
+    margin-left: 15px;
+    color: #40a9ff;
+    cursor: pointer;
+  }
+  .collapse {
+    font-size: 12px;
+    margin-top: 15px;
+    width: 500px;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+}
+.my-drawer-footer {
+  z-index: 10;
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  background: #fff;
+}
+</style>
diff --git a/manager/src/views/my-components/map/index.vue b/manager/src/views/my-components/map/index.vue
new file mode 100644
index 00000000..86e9b8f1
--- /dev/null
+++ b/manager/src/views/my-components/map/index.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="map">
+    <Modal
+        v-model="showMap"
+        title="选择地址"
+        width="800"
+        >
+        <div class="address">{{addrContent.address}}</div>
+        <div id="map-container"></div>
+
+        <div class="search-con">
+            <Input placeholder="输入关键字搜索" id="input-map" v-model="mapSearch"/>
+            <ul>
+                <li v-for="(tip, index) in tips" :key="index" @click="selectAddr(tip.location)">
+                    <p>{{tip.name}}</p>
+                    <p>{{tip.district + tip.address}}</p>
+                </li>
+            </ul>
+        </div>
+        <div slot="footer">
+            <Button type="default" @click="showMap = false">取消</Button>
+            <Button type="primary" :loading="loading" @click="ok">确定</Button>
+        </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import AMapLoader from '@amap/amap-jsapi-loader';
+import {getRegion} from '@/api/common.js'
+export default {
+name:'map',
+data() {
+    return {
+        showMap:false,
+        mapSearch:'', // 地图搜索
+        map:null, // 初始化地图
+        autoComplete:null, // 初始化搜索方法
+        geocoder:null, // 初始化地理、坐标转化
+        positionPicker:null, // 地图拖拽选点
+        tips:[], //搜索关键字列表
+        addrContent:{}, // 回显地址信息
+        loading:false,
+    };
+},
+watch:{
+    mapSearch:function(val){
+        this.searchOfMap(val)
+    }
+},
+methods: {
+    ok(){ // 确定选择
+
+         this.loading = true
+
+         const codeObj = {}
+         const params = {
+             cityCode: this.addrContent.regeocode.addressComponent.citycode,
+             townName: this.addrContent.regeocode.addressComponent.township
+         }
+      getRegion(params).then(res=>{
+             if(res.code == 200) {
+                  this.addrContent.addr = res.result.name.replace(/,/g," ")
+                  this.addrContent.addrId = res.result.id
+                  this.loading = false
+                  this.showMap = false;
+                  this.$emit('getAddress',this.addrContent);
+
+             }
+         })
+
+    },
+    init() {
+        AMapLoader.load({
+            key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
+            version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+            plugins: [
+            "AMap.ToolBar",
+            "AMap.Autocomplete",
+            "AMap.PlaceSearch",
+            "AMap.Geolocation",
+            'AMap.Geocoder'
+            ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+            "AMapUI": {             // 是否加载 AMapUI，缺省不加载
+                "version": '1.1',   // AMapUI 缺省 1.1
+                "plugins":['misc/PositionPicker'],       // 需要加载的 AMapUI ui插件
+            },
+        })
+        .then((AMap) => {
+            let that = this;
+            this.map = new AMap.Map("map-container",{
+                zoom:12
+            });
+            that.map.addControl(new AMap.ToolBar());
+            that.map.addControl(new AMap.Autocomplete());
+            that.map.addControl(new AMap.PlaceSearch());
+            that.map.addControl(new AMap.Geocoder());
+
+            // 实例化Autocomplete
+            let autoOptions = {
+                city: "全国"
+            };
+            that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
+            that.geocoder = new AMap.Geocoder(autoOptions)
+
+
+            that.positionPicker = new AMapUI.PositionPicker({ // 拖拽选点
+                mode: 'dragMap',
+                map:that.map
+            });
+            that.positionPicker.start()
+            /**
+             *
+             * 所有回显数据，都在positionResult里面
+             * 需要字段可以查找
+             *
+             */
+            that.positionPicker.on('success', function(positionResult) {
+
+                that.addrContent = positionResult;
+            });
+
+        })
+        .catch((e) => {});
+    },
+    searchOfMap(val) { // 地图搜索
+        let that = this;
+        this.autoComplete.search(val, function (status, result) {
+            // 搜索成功时，result即是对应的匹配数据
+            if(status == 'complete' && result.info == 'OK'){
+                that.tips = result.tips;
+            }else {
+                that.tips = []
+            }
+        });
+    },
+    selectAddr(location) { // 选择坐标
+        if(!location){
+            this.$Message.warning('请选择正确点位')
+            return false;
+        }
+        const lnglat = [location.lng,location.lat]
+        this.positionPicker.start(lnglat)
+    }
+},
+mounted() {
+    this.init()
+},
+};
+</script>
+<style lang="scss" scoped>
+    #map-container{
+        width: 500px;
+        height: 400px;
+    }
+
+    .search-con{
+        position: absolute;
+        right: 20px;
+        top: 64px;
+        width: 260px;
+        ul{
+            width: 260px;
+            height: 400px;
+            overflow: scroll;
+            li{
+                padding: 5px;
+                p:nth-child(2){
+                    color: #999;
+                    font-size: 12px;
+                }
+                &:hover{
+                    background-color:#eee;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
+    .address{
+        margin-bottom: 10px;
+        // color: $theme_color;
+        font-weight: bold;
+    }
+</style>
diff --git a/manager/src/views/my-components/tree-table/Checkbox/Checkbox.less b/manager/src/views/my-components/tree-table/Checkbox/Checkbox.less
new file mode 100644
index 00000000..ff144fe4
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Checkbox/Checkbox.less
@@ -0,0 +1,117 @@
+// text
+@prefixCls: zk-checkbox;
+// color
+@border: #dddee1;
+@hoverBorder: #bcbcbc;
+@blue: #2d8cf0;
+
+.@{prefixCls}-wrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.@{prefixCls} {
+  display: inline-block;
+  position: relative;
+  line-height: 1;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  outline: none;
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @hoverBorder;
+    }
+  }
+}
+
+.@{prefixCls}__inner {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  position: relative;
+  top: 0;
+  left: 0;
+  border: 1px solid @border;
+  border-radius: 2px;
+  background-color: #ffffff;
+  transition: border-color .2s ease-in-out,background-color .2s ease-in-out;
+  &::after {
+    content: "";
+    display: table;
+    width: 4px;
+    height: 8px;
+    position: absolute;
+    top: 1px;
+    left: 4px;
+    border: 2px solid #fff;
+    border-top: 0;
+    border-left: 0;
+    transform: rotate(45deg) scale(0);
+    transition: all .2s ease-in-out;
+  }
+}
+
+.@{prefixCls}--indeterminate {
+  .@{prefixCls}__inner {
+    background-color: @blue;
+    border-color: @blue;
+    &::after {
+      content: "";
+      width: 8px;
+      height: 1px;
+      transform: scale(1);
+      position: absolute;
+      left: 2px;
+      top: 5px;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @blue;
+    }
+  }
+}
+
+.@{prefixCls}--checked {
+  .@{prefixCls}__inner {
+    border-color: @blue;
+    background-color: @blue;
+    &::after {
+      content: "";
+      display: table;
+      width: 4px;
+      height: 8px;
+      position: absolute;
+      top: 1px;
+      left: 4px;
+      border: 2px solid #ffffff;
+      border-top: 0;
+      border-left: 0;
+      transform: rotate(45deg) scale(1);
+      transition: all .2s ease-in-out;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @blue;
+    }
+  }
+}
+
+.@{prefixCls}--disabled {
+  cursor: not-allowed;
+  .@{prefixCls}__inner {
+    background-color: #f3f3f3;
+    border-color: @border;
+    &::after {
+      animation-name: none;
+      border-color: #ccc;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @border;
+    }
+  }
+}
diff --git a/manager/src/views/my-components/tree-table/Checkbox/Checkbox.vue b/manager/src/views/my-components/tree-table/Checkbox/Checkbox.vue
new file mode 100644
index 00000000..749743ca
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Checkbox/Checkbox.vue
@@ -0,0 +1,58 @@
+<template lang="html">
+  <label :class="`${prefixCls}-wrapper`">
+    <span :class="checkboxClass">
+      <span
+        :class="`${prefixCls}__inner`"
+        @click="toggle"></span>
+    </span>
+  </label>
+</template>
+
+<script>
+  export default {
+    name: 'zk-checkbox',
+    props: {
+      value: {
+        type: Boolean,
+        default: false,
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      indeterminate: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        prefixCls: 'zk-checkbox',
+      };
+    },
+    computed: {
+      checkboxClass() {
+        return [
+          `${this.prefixCls}`,
+          {
+            [`${this.prefixCls}--disabled`]: this.disabled,
+            [`${this.prefixCls}--checked`]: this.value,
+            [`${this.prefixCls}--indeterminate`]: this.indeterminate,
+          },
+        ];
+      },
+    },
+    methods: {
+      toggle() {
+        if (this.disabled) {
+          return false;
+        }
+        const value = !this.value;
+        this.$emit('input', value);
+        return this.$emit('on-change', value);
+      },
+    },
+  };
+</script>
+
+<style lang="less" scoped src="./Checkbox.less"></style>
diff --git a/manager/src/views/my-components/tree-table/Table/Table.less b/manager/src/views/my-components/tree-table/Table/Table.less
new file mode 100644
index 00000000..6fd20e92
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/Table.less
@@ -0,0 +1,170 @@
+@import "./font/iconfont";
+
+// text
+@prefixCls: zk-table;
+// color
+@black: #515a6e;
+@white: #ffffff;
+@border: #e9eaec;
+@hoverRow: #ebf7ff;
+@backgroundRow: #f8f8f9;
+
+.@{prefixCls} {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  background-color: @white;
+  border: 1px solid @border;
+  font-size: 14px;
+  line-height: 26px;
+  color: @black;
+  overflow: hidden;
+}
+
+.@{prefixCls}__header-cell {
+  font-weight: bold;
+}
+
+.@{prefixCls}__cell-inner {
+  padding: 0px 18px;
+}
+
+.@{prefixCls}-default {
+  font-size: 14px;
+
+  .@{prefixCls}__header-row {
+    height: 40px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 48px !important;
+  }
+}
+
+.@{prefixCls}-small {
+  font-size: 12px;
+
+  .@{prefixCls}__header-row {
+    height: 36px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 40px !important;
+  }
+}
+
+.@{prefixCls}-large {
+  font-size: 16px;
+
+  .@{prefixCls}__header-row {
+    height: 43px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 60px !important;
+  }
+}
+
+.@{prefixCls}__header-wrapper,
+.@{prefixCls}__footer-wrapper {
+  overflow: hidden;
+}
+
+.@{prefixCls}__body-wrapper {
+  overflow: auto;
+}
+
+.@{prefixCls}__header,
+.@{prefixCls}__body,
+.@{prefixCls}__footer {
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.@{prefixCls}__header-row {
+  height: 40px;
+  box-sizing: border-box;
+  background-color: @backgroundRow;
+  border-bottom: 1px solid @border;
+}
+
+.@{prefixCls}__footer-row {
+  height: 40px;
+  box-sizing: border-box;
+  background-color: @white;
+  border-top: 1px solid @border;
+}
+
+.@{prefixCls}__body-row {
+  height: 48px;
+  box-sizing: border-box;
+
+  &:not(:first-of-type) {
+    border-top: 1px solid @border;
+  }
+}
+
+.@{prefixCls}__header-cell,
+.@{prefixCls}__body-cell,
+.@{prefixCls}__footer-cell {
+  box-sizing: border-box;
+  text-align: left;
+  vertical-align: middle;
+  word-break: break-all;
+  overflow: hidden;
+}
+
+.@{prefixCls}--firstProp-header-inner {
+  padding-left: 32px;
+}
+
+.@{prefixCls}--empty-row {
+  height: 80px;
+}
+
+.@{prefixCls}--empty-content {
+  text-align: center;
+}
+
+.@{prefixCls}--center-cell {
+  text-align: center;
+}
+
+.@{prefixCls}--right-cell {
+  text-align: right;
+}
+
+.@{prefixCls}--stripe-row {
+  background-color: @backgroundRow;
+}
+
+.@{prefixCls}--row-hover {
+  background-color: @hoverRow;
+}
+
+.@{prefixCls}--border-cell {
+  &:not(:last-of-type) {
+    border-right: 1px solid @border;
+  }
+}
+
+.@{prefixCls}--tree-icon {
+  margin-right: 6px;
+  cursor: pointer;
+}
+
+.@{prefixCls}--expand-inner {
+  text-align: center;
+  cursor: pointer;
+  transition: transform .2s ease-in-out;
+}
+
+.@{prefixCls}--expanded-inner {
+  transform: rotate(90deg);
+}
+
+.@{prefixCls}--expand-content {
+  padding: 20px;
+}
\ No newline at end of file
diff --git a/manager/src/views/my-components/tree-table/Table/Table.vue b/manager/src/views/my-components/tree-table/Table/Table.vue
new file mode 100644
index 00000000..2f6c4b6b
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/Table.vue
@@ -0,0 +1,396 @@
+<template lang="html">
+  <div
+    v-if="columns.length > 0"
+    ref="table"
+    :class="[prefixCls, `${prefixCls}-${size}`, tableClass]">
+    <Spin fix v-if="loading"></Spin>
+    <div
+      v-show="showHeader"
+      ref="header-wrapper"
+      :class="`${prefixCls}__header-wrapper`"
+      @mousewheel="handleEvent('header', $event)">
+      <table-header
+        ref="table-header">
+      </table-header>
+    </div>
+    <div
+      ref="body-wrapper"
+      :style="bodyWrapperStyle"
+      :class="`${prefixCls}__body-wrapper`"
+      @scroll="handleEvent('body', $event)">
+      <table-body
+        ref="table-body"
+        :class="bodyClass">
+      </table-body>
+    </div>
+    <div
+      v-show="showSummary && data.length > 0"
+      ref="footer-wrapper"
+      :class="`${prefixCls}__footer-wrapper`"
+      @mousewheel="handleEvent('footer', $event)">
+      <table-footer
+        ref="table-footer">
+      </table-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import TableHeader from "./TableHeader";
+import TableBody from "./TableBody";
+import TableFooter from "./TableFooter";
+import { mixins, scrollBarWidth as getSbw } from "./utils";
+
+/* eslint-disable no-underscore-dangle */
+/* eslint-disable no-param-reassign */
+
+// function getBodyData(data, isTreeType, childrenProp, isFold, level = 1) {
+function getBodyData(
+  primaryKey,
+  oldBodyData,
+  data,
+  isTreeType,
+  childrenProp,
+  isFold,
+  parentFold,
+  level = 1
+) {
+  let bodyData = [];
+  data.forEach((row, index) => {
+    const children = row[childrenProp];
+    const childrenLen =
+      Object.prototype.toString.call(children).slice(8, -1) === "Array"
+        ? children.length
+        : 0;
+    let curIsFold = isFold;
+    if (
+      isFold &&
+      typeof primaryKey === "string" &&
+      Array.isArray(oldBodyData)
+    ) {
+      for (let i = 0; i < oldBodyData.length; i++) {
+        const oldRow = oldBodyData[i];
+        if (oldRow[primaryKey] === row[primaryKey]) {
+          if ("_isFold" in oldRow) {
+            curIsFold = oldRow._isFold;
+          }
+          break;
+        }
+      }
+    }
+    bodyData.push({
+      _isHover: false,
+      _isExpanded: false,
+      _isChecked: false,
+      _level: level,
+      // _isHide: isFold ? level !== 1 : false,
+      // _isFold: isFold,
+      _isHide: level !== 1 ? isFold && parentFold : false,
+      _isFold: isFold && curIsFold,
+      _childrenLen: childrenLen,
+      _normalIndex: index + 1,
+      ...row
+    });
+    if (isTreeType) {
+      if (childrenLen > 0) {
+        // bodyData = bodyData.concat(getBodyData(children, true, childrenProp, isFold, level + 1));
+        bodyData = bodyData.concat(
+          getBodyData(
+            primaryKey,
+            oldBodyData,
+            children,
+            true,
+            childrenProp,
+            isFold,
+            curIsFold,
+            level + 1
+          )
+        );
+      }
+    }
+  });
+  return bodyData;
+}
+
+function initialState(table, expandKey) {
+  return {
+    bodyHeight: "auto",
+    firstProp: expandKey || (table.columns[0] && table.columns[0].key),
+    // bodyData: getBodyData(table.data, table.treeType, table.childrenProp, table.isFold),
+    bodyData: getBodyData(
+      table.primaryKey,
+      table.bodyData,
+      table.data,
+      table.treeType,
+      table.childrenProp,
+      table.isFold,
+      false
+    )
+  };
+}
+
+function initialColumns(table, clientWidth) {
+  let columnsWidth = 0;
+  const minWidthColumns = [];
+  const otherColumns = [];
+  const columns = table.columns.concat();
+  if (table.expandType) {
+    columns.unshift({
+      width: "50"
+    });
+  }
+  if (table.selectable) {
+    columns.unshift({
+      width: "50"
+    });
+  }
+  if (table.showIndex) {
+    columns.unshift({
+      width: "50px",
+      key: "_normalIndex",
+      title: table.indexText
+    });
+  }
+  columns.forEach((column, index) => {
+    let width = "";
+    let minWidth = "";
+    if (!column.width) {
+      if (column.minWidth) {
+        minWidth =
+          typeof column.minWidth === "number"
+            ? column.minWidth
+            : parseInt(column.minWidth, 10);
+      } else {
+        minWidth = 80;
+      }
+      minWidthColumns.push({
+        ...column,
+        minWidth,
+        _index: index
+      });
+    } else {
+      width =
+        typeof column.width === "number"
+          ? column.width
+          : parseInt(column.width, 10);
+      otherColumns.push({
+        ...column,
+        width,
+        _index: index
+      });
+    }
+    columnsWidth += minWidth || width;
+  });
+  const scrollBarWidth = getSbw();
+  const totalWidth = columnsWidth + scrollBarWidth;
+  const isScrollX = totalWidth > clientWidth;
+  if (!isScrollX) {
+    const extraWidth = clientWidth - totalWidth;
+    const averageExtraWidth = Math.floor(extraWidth / minWidthColumns.length);
+    minWidthColumns.forEach(column => {
+      column.computedWidth = column.minWidth + averageExtraWidth;
+    });
+  }
+  const tableColumns = otherColumns.concat(minWidthColumns);
+  tableColumns.sort((a, b) => a._index - b._index);
+  return tableColumns;
+}
+
+export default {
+  name: "TreeTable",
+  mixins: [mixins],
+  components: {
+    TableHeader,
+    TableBody,
+    TableFooter
+  },
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    },
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    size: {
+      default() {
+        return !this.$IVIEW || this.$IVIEW.size === ""
+          ? "default"
+          : this.$IVIEW.size;
+      }
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    maxHeight: {
+      type: [String, Number],
+      default: "auto"
+    },
+    stripe: {
+      type: Boolean,
+      default: false
+    },
+    border: {
+      type: Boolean,
+      default: false
+    },
+    treeType: {
+      type: Boolean,
+      default: true
+    },
+    childrenProp: {
+      type: String,
+      default: "children"
+    },
+    isFold: {
+      type: Boolean,
+      default: true
+    },
+    expandType: {
+      type: Boolean,
+      default: true
+    },
+    selectable: {
+      type: Boolean,
+      default: true
+    },
+    selectType: {
+      type: String,
+      default: "checkbox"
+    },
+    emptyText: {
+      type: String,
+      default: "暂无数据"
+    },
+    showHeader: {
+      type: Boolean,
+      default: true
+    },
+    showIndex: {
+      type: Boolean,
+      default: false
+    },
+    indexText: {
+      type: String,
+      default: "#"
+    },
+    showSummary: {
+      type: Boolean,
+      default: false
+    },
+    sumText: {
+      type: String,
+      default: "合计"
+    },
+    primaryKey: String,
+    summaryMethod: Function,
+    showRowHover: {
+      type: Boolean,
+      default: true
+    },
+    rowKey: Function,
+    rowClassName: [String, Function],
+    cellClassName: [String, Function],
+    rowStyle: [Object, Function],
+    cellStyle: [Object, Function],
+    expandKey: String
+  },
+  data() {
+    return {
+      computedWidth: "",
+      computedHeight: "",
+      tableColumns: [],
+      ...initialState(this, this.expandKey)
+    };
+  },
+  computed: {
+    bodyWrapperStyle() {
+      return {
+        height: this.bodyHeight
+      };
+    },
+    tableClass() {
+      return {
+        [`${this.prefixCls}--border`]: this.border
+      };
+    },
+    bodyClass() {
+      return {
+        [`${this.prefixCls}--stripe`]: this.stripe
+      };
+    }
+  },
+  methods: {
+    handleEvent(type, $event) {
+      this.validateType(type, ["header", "body", "footer"], "handleEvent");
+      const eventType = $event.type;
+      if (eventType === "scroll") {
+        this.$refs["header-wrapper"].scrollLeft = $event.target.scrollLeft;
+        this.$refs["footer-wrapper"].scrollLeft = $event.target.scrollLeft;
+      }
+      if (eventType === "mousewheel") {
+        const deltaX = $event.deltaX;
+        const $body = this.$refs["body-wrapper"];
+        if (deltaX > 0) {
+          $body.scrollLeft += 10;
+        } else {
+          $body.scrollLeft -= 10;
+        }
+      }
+      return this.$emit(`${type}-${eventType}`, $event);
+    },
+    // computedWidth, computedHeight, tableColumns
+    measure() {
+      this.$nextTick(() => {
+        const { clientWidth, clientHeight } = this.$el;
+        this.computedWidth = clientWidth + 2;
+        this.computedHeight = clientHeight + 2;
+
+        const maxHeight = parseInt(this.maxHeight, 10);
+        if (this.maxHeight !== "auto" && this.computedHeight > maxHeight) {
+          this.bodyHeight = `${maxHeight - 83}px`;
+        }
+        this.tableColumns = initialColumns(this, clientWidth);
+      });
+    },
+    getCheckedProp(key = "index") {
+      if (!this.selectable) {
+        return [];
+      }
+      const checkedIndexs = [];
+      this.bodyData.forEach((item, index) => {
+        if (item._isChecked) {
+          if (key === "index") {
+            checkedIndexs.push(index);
+          } else {
+            checkedIndexs.push(item[key]);
+          }
+        }
+      });
+      return checkedIndexs;
+    }
+  },
+  watch: {
+    $props: {
+      deep: true,
+      handler() {
+        Object.assign(this.$data, initialState(this, this.expandKey));
+      }
+    }
+  },
+  updated() {
+    this.measure();
+  },
+  mounted() {
+    this.measure();
+    window.addEventListener("resize", this.measure);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.measure);
+  }
+};
+</script>
+
+<style lang="less" src="./Table.less"></style>
diff --git a/manager/src/views/my-components/tree-table/Table/TableBody.js b/manager/src/views/my-components/tree-table/Table/TableBody.js
new file mode 100644
index 00000000..a14abac7
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/TableBody.js
@@ -0,0 +1,328 @@
+import Checkbox from '../Checkbox/Checkbox'; // eslint-disable-line
+// import Radio from '../Radio/Radio'; // eslint-disable-line
+import { mixins } from './utils';
+import { Radio } from 'view-design'; // eslint-disable-line
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: 'TreeTable__body',
+  mixins: [mixins],
+  components: { Radio },
+  data() {
+    return {
+      radioSelectedIndex: -1,
+    };
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    },
+  },
+  methods: {
+    toggleStatus(type, row, rowIndex, value) {
+      this.validateType(type, ['Expanded', 'Checked', 'Hide', 'Fold'], 'toggleStatus', false);
+      const target = this.table.bodyData[rowIndex];
+      this.table.bodyData.splice(rowIndex, 1, {
+        ...target,
+        [`_is${type}`]: typeof value === 'undefined' ? !row[`_is${type}`] : value,
+      });
+    },
+    getChildrenIndex(parentLevel, parentIndex, careFold = true) {
+      const data = this.table.bodyData;
+      let childrenIndex = [];
+      for (let i = parentIndex + 1; i < data.length; i++) {
+        if (data[i]._level <= parentLevel) break;
+        if (data[i]._level - 1 === parentLevel) {
+          childrenIndex.push(i);
+        }
+      }
+      const len = childrenIndex.length; // important!!!
+      if (len > 0) {
+        for (let i = 0; i < len; i++) {
+          const childData = data[childrenIndex[i]];
+          if (
+            childData._childrenLen &&
+            (!careFold || (careFold && !childData._isFold))
+          ) {
+            childrenIndex = childrenIndex.concat(
+              this.getChildrenIndex(childData._level, childrenIndex[i], careFold));
+          }
+        }
+      }
+      return childrenIndex;
+    },
+    handleEvent($event, type, data, others) {
+      const certainType = this.validateType(type, ['cell', 'row', 'checkbox', 'icon', 'radio'], 'handleEvent');
+      const eventType = $event ? $event.type : '';
+      const { row, rowIndex, column, columnIndex } = data;
+      const latestData = this.table.bodyData;
+      // Checkbox
+      if (certainType.checkbox) {
+        const { isChecked } = others;
+        this.toggleStatus('Checked', row, rowIndex, isChecked);
+        if (row._childrenLen > 0) {
+          const childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
+          for (let i = 0; i < childrenIndex.length; i++) {
+            this.toggleStatus('Checked', latestData[childrenIndex[i]], childrenIndex[i], isChecked);
+          }
+        }
+        return this.table.$emit('checkbox-click', latestData[rowIndex], column, columnIndex, $event);
+      }
+      // Radio
+      if (certainType.radio) {
+        this.radioSelectedIndex = rowIndex;
+        return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
+      }
+      // Tree's icon
+      if (certainType.icon) {
+        $event.stopPropagation();
+        this.toggleStatus('Fold', row, rowIndex);
+        const childrenIndex = this.getChildrenIndex(row._level, rowIndex);
+        for (let i = 0; i < childrenIndex.length; i++) {
+          this.toggleStatus('Hide', latestData[childrenIndex[i]], childrenIndex[i]);
+        }
+        return this.table.$emit('tree-icon-click', latestData[rowIndex], column, columnIndex, $event);
+      }
+      if (certainType.cell && eventType === 'click') {
+        // 点击扩展单元格
+        if (this.isExpandCell(this.table, columnIndex)) {
+          this.toggleStatus('Expanded', row, rowIndex);
+          return this.table.$emit('expand-cell-click', latestData[rowIndex], column, columnIndex, $event);
+        }
+      }
+      // 行：Hover
+      if (certainType.row && (eventType === 'mouseenter' || eventType === 'mouseleave')) {
+        const { hover } = others;
+        const target = latestData[rowIndex];
+        latestData.splice(rowIndex, 1, {
+          ...target,
+          _isHover: hover,
+        });
+      }
+      if (certainType.row && others && others.clickRow && certainType.radio) {
+        this.radioSelectedIndex = rowIndex;
+        return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
+      }
+      if (certainType.cell) {
+        return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, column, columnIndex, $event);
+      }
+      return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, $event);
+    },
+  },
+  render() {
+    // key
+    // function getKey(row, rowIndex) {
+    //   const rowKey = this.table.rowKey;
+    //   if (rowKey) {
+    //     return rowKey.call(null, row, rowIndex);
+    //   }
+    //   return rowIndex;
+    // }
+
+    // style
+    function getStyle(type, row, rowIndex, column, columnIndex) {
+      const certainType = this.validateType(type, ['cell', 'row'], 'getStyle');
+      const style = this.table[`${type}Style`];
+      if (typeof style === 'function') {
+        if (certainType.row) {
+          return style.call(null, row, rowIndex);
+        }
+        if (certainType.cell) {
+          return style.call(null, row, rowIndex, column, columnIndex);
+        }
+      }
+      return style;
+    }
+
+    // className
+    function getClassName(type, row, rowIndex, column, columnIndex) {
+      const certainType = this.validateType(type, ['cell', 'row', 'inner'], 'getClassName');
+      const classList = [];
+      if (column && column.key == "_normalIndex") {
+        classList.push(`${this.prefixCls}--center-cell`);
+      }
+      // console.log(certainType.inner)
+      if (certainType.row || certainType.cell) {
+        const className = this.table[`${type}ClassName`];
+        if (typeof className === 'string') {
+          classList.push(className);
+        } else if (typeof className === 'function') {
+          if (certainType.row) {
+            classList.push(className.call(null, row, rowIndex) || '');
+          }
+          if (certainType.cell) {
+            classList.push(className.call(null, row, rowIndex, column, columnIndex) || '');
+          }
+        }
+        if (certainType.row) {
+          classList.push(`${this.prefixCls}__body-row`);
+          if (this.table.stripe && rowIndex % 2 !== 0) {
+            classList.push(`${this.prefixCls}--stripe-row`);
+          }
+          if (this.table.showRowHover && row._isHover) {
+            classList.push(`${this.prefixCls}--row-hover`);
+          }
+        }
+        if (certainType.cell) {
+          classList.push(`${this.prefixCls}__body-cell`);
+          if (this.table.border) {
+            classList.push(`${this.prefixCls}--border-cell`);
+          }
+          const align = column.align;
+          if (['center', 'right'].indexOf(align) > -1) {
+            classList.push(`${this.prefixCls}--${align}-cell`);
+          }
+        }
+      }
+      if (certainType.inner) {
+        classList.push(`${this.prefixCls}__cell-inner`);
+        if (this.isExpandCell(this.table, columnIndex)) {
+          classList.push(`${this.prefixCls}--expand-inner`);
+          if (row._isExpanded) {
+            classList.push(`${this.prefixCls}--expanded-inner`);
+          }
+        }
+      }
+      return classList.join(' ');
+    }
+
+    // 根据type渲染单元格Cell
+    function renderCell(row, rowIndex, column, columnIndex) {
+      // ExpandType
+      if (this.isExpandCell(this.table, columnIndex)) {
+        return <i class='zk-icon zk-icon-angle-right'></i>;
+      }
+      // SelectionType's Checkbox
+      if (this.isSelectionCell(this.table, columnIndex)) {
+        let res = null;
+        if (this.table.selectType === 'checkbox') {
+          let allCheck;
+          let childrenIndex;
+          const hasChildren = row._childrenLen > 0;
+          if (hasChildren) {
+            childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
+            allCheck = true;
+            for (let i = 0; i < childrenIndex.length; i++) {
+              if (!this.table.bodyData[childrenIndex[i]]._isChecked) {
+                allCheck = false;
+                break;
+              }
+            }
+          } else {
+            allCheck = row._isChecked;
+          }
+          let indeterminate = false;
+          if (hasChildren && !allCheck) {
+            for (let i = 0; i < childrenIndex.length; i++) {
+              if (this.table.bodyData[childrenIndex[i]]._isChecked) {
+                indeterminate = true;
+                break;
+              }
+            }
+          }
+          // res = <Checkbox
+          //   indeterminate={indeterminate}
+          //   value={allCheck}
+          //   onOn-change={isChecked => this.handleEvent(null, 'checkbox', { row, rowIndex, column, columnIndex }, { isChecked })}>
+          // </Checkbox>;
+        } else {
+          res = <Radio value={this.radioSelectedIndex === rowIndex} on-on-change={() => this.handleEvent(null, 'radio', { row, rowIndex, column, columnIndex })}></Radio>;
+        }
+        return res;
+      }
+
+      // Tree's firstProp
+      if (this.table.treeType && this.table.firstProp === column.key) {
+        return <span
+          class={`${this.prefixCls}--level-${row._level}-cell`}
+          style={{
+            marginLeft: `${(row._level - 1) * 24}px`,
+            paddingLeft: row._childrenLen === 0 ? '20px' : '',
+          }}>
+          {row._childrenLen > 0 &&
+            <i
+              class={`${this.prefixCls}--tree-icon zk-icon zk-icon-${row._isFold ? 'plus' : 'minus'}-square-o`}
+              on-click={$event => this.handleEvent($event, 'icon', { row, rowIndex, column, columnIndex }, { isFold: row._isFold })}></i>
+          }
+          {row[column.key] ? row[column.key] : ''}
+        </span>;
+      }
+      // TreeType children's index
+      if (this.table.showIndex && this.table.treeType && column.key === '_normalIndex' && row._level > 1) {
+        return '';
+      }
+      if (column.type === undefined || column.type === 'custom') {
+        return row[column.key];
+      } else if (column.type === 'template') {
+        return this.table.$scopedSlots[column.template]
+          ? this.table.$scopedSlots[column.template]({ row, rowIndex, column, columnIndex })
+          : '';
+      }
+      return '';
+    }
+
+    // Template
+    return (
+      <table cellspacing="0" cellpadding="0" border="0" class={`${this.prefixCls}__body`}>
+        {/* <colgroup>
+          {this.table.tableColumns.map(column =>
+            <col width={column.computedWidth || column.minWidth || column.width}></col>)
+          }
+        </colgroup> */}
+        <tbody>
+          {  this.table.bodyData.length > 0
+            ? this.table.bodyData.map((row, rowIndex) =>
+              [
+                <tr
+                  v-show={!row._isHide}
+                  key={`table_row_${rowIndex}`}
+                  style={getStyle.call(this, 'row', row, rowIndex)}
+                  class={getClassName.call(this, 'row', row, rowIndex)}
+                  on-click={$event => this.handleEvent($event, 'row', { row, rowIndex }, { clickRow: true })}
+                  on-dblclick={$event => this.handleEvent($event, 'row', { row, rowIndex })}
+                  on-contextmenu={$event => this.handleEvent($event, 'row', { row, rowIndex })}
+                  on-mouseenter={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: true })}
+                  on-mouseleave={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: false })}>
+                  {   this.table.tableColumns.map((column, columnIndex) =>
+                  column.key ?  <td
+                      style={getStyle.call(this, 'cell', row, rowIndex, column, columnIndex)}
+                      class={getClassName.call(this, 'cell', row, rowIndex, column, columnIndex)}
+                      on-click={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-dblclick={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-contextmenu={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-mouseenter={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-mouseleave={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}>
+                      <div class={getClassName.call(this, 'inner', row, rowIndex, column, columnIndex)}>
+                        {renderCell.call(this, row, rowIndex, column, columnIndex)}
+                      </div>
+                    </td>:"")
+                  }
+                </tr>,
+                this.table.expandType && row._isExpanded &&
+                <tr
+                  key={rowIndex}
+                  class={`${this.prefixCls}__body-row ${this.prefixCls}--expand-row`}>
+                  <td
+                    class={`${this.prefixCls}--expand-content`}
+                    colspan={this.table.tableColumns.length}>
+                    {this.table.$scopedSlots.expand
+                      ? this.table.$scopedSlots.expand({ row, rowIndex })
+                      : ''
+                    }
+                  </td>
+                </tr>,
+              ])
+            : <tr
+              class={`${this.prefixCls}--empty-row`}>
+              <td
+                class={`${this.prefixCls}__body-cell ${this.prefixCls}--empty-content`}
+                colspan={this.table.tableColumns.length}>
+                {this.table.emptyText}
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    );
+  },
+};
diff --git a/manager/src/views/my-components/tree-table/Table/TableFooter.js b/manager/src/views/my-components/tree-table/Table/TableFooter.js
new file mode 100644
index 00000000..b3eed8a6
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/TableFooter.js
@@ -0,0 +1,84 @@
+import { mixins } from './utils';
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: 'TreeTable__footer',
+  mixins: [mixins],
+  data() {
+    return {
+
+    };
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    },
+  },
+  methods: {
+
+  },
+  render() {
+    // 计算各列总和
+    function renderCell({ key }, columnIndex) {
+      if (columnIndex === 0) {
+        return this.table.sumText;
+      }
+      const rows = this.table.bodyData;
+      const values = rows.map(row => Number(row[key]));
+      const precisions = [];
+      let notNumber = true;
+      values.forEach((value) => {
+        if (!isNaN(value)) {
+          notNumber = false;
+          const decimal = value.toString().split('.')[1];
+          precisions.push(decimal ? decimal.length : 0);
+        }
+      });
+      const precision = Math.max.apply(null, precisions);
+      if (!notNumber) {
+        return values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return parseFloat((prev + curr).toFixed(precision));
+          }
+          return prev;
+        }, 0);
+      }
+      return '';
+    }
+
+    // className
+    function getClassName() {
+      const classList = [];
+      classList.push(`${this.prefixCls}__footer-cell`);
+      if (this.table.border) {
+        classList.push(`${this.prefixCls}--border-cell`);
+      }
+      return classList.join(' ');
+    }
+
+    // Template
+    return (
+      <table cellspacing="0" cellpadding="0" border="0" class={ `${this.prefixCls}__footer` }>
+        <colgroup>
+          { this.table.tableColumns.map(column =>
+            <col width={ column.computedWidth || column.minWidth || column.width }></col>)
+          }
+        </colgroup>
+        <tfoot>
+          <tr class={ `${this.prefixCls}__footer-row` }>
+            { this.table.tableColumns.map((column, columnIndex) =>
+              <td class={ getClassName.call(this) }>
+                <div class={ `${this.prefixCls}__cell-inner` }>
+                  { this.table.summaryMethod
+                    ? this.table.summaryMethod(this.table.bodyData, column, columnIndex)
+                    : renderCell.call(this, column, columnIndex) }
+                </div>
+              </td>)
+            }
+          </tr>
+        </tfoot>
+      </table>
+    );
+  },
+};
diff --git a/manager/src/views/my-components/tree-table/Table/TableHeader.js b/manager/src/views/my-components/tree-table/Table/TableHeader.js
new file mode 100644
index 00000000..23570dfa
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/TableHeader.js
@@ -0,0 +1,108 @@
+import Checkbox from "../Checkbox/Checkbox"; // eslint-disable-line
+import { mixins } from "./utils";
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: "TreeTable__header",
+  mixins: [mixins],
+  data() {
+    return {};
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    }
+  },
+  methods: {
+    toggleAllChecked(checked) {
+      this.table.bodyData = this.table.bodyData.map(row => ({
+        ...row,
+        _isChecked: checked
+      }));
+    }
+  },
+  render() {
+    // className
+    function getClassName(type, { headerAlign, key }) {
+      const certainType = this.validateType(
+        type,
+        ["cell", "inner"],
+        "getClassName"
+      );
+      const classList = [];
+      if (key == "_normalIndex") {
+        classList.push(`${this.prefixCls}--center-cell`);
+      }
+      if (certainType.cell) {
+        classList.push(`${this.prefixCls}__header-cell`);
+        if (this.table.border) {
+          classList.push(`${this.prefixCls}--border-cell`);
+        }
+        if (["center", "right"].indexOf(headerAlign) > -1) {
+          classList.push(`${this.prefixCls}--${headerAlign}-cell`);
+        }
+      }
+      if (certainType.inner) {
+        classList.push(`${this.prefixCls}__cell-inner`);
+        if (this.table.treeType && this.table.firstProp === key) {
+          classList.push(`${this.prefixCls}--firstProp-header-inner`);
+        }
+      }
+      return classList.join(" ");
+    }
+
+    // 根据type渲染单元格Label
+    function renderLabel(column, columnIndex) {
+      if (
+        this.isSelectionCell(this.table, columnIndex) &&
+        this.selectType === "checkbox"
+      ) {
+        const allCheck = this.table.bodyData.every(row => row._isChecked);
+        const indeterminate =
+          !allCheck && this.table.bodyData.some(row => row._isChecked);
+        return (
+          <Checkbox
+            indeterminate={indeterminate}
+            value={allCheck}
+            onOn-change={checked => this.toggleAllChecked(checked)}
+          ></Checkbox>
+        );
+      }
+      return column.title ? column.title : "";
+    }
+
+    // Template
+    return (
+      <table
+        cellspacing="0"
+        cellpadding="0"
+        border="0"
+        class={`${this.prefixCls}__header`}
+      >
+        {/* <colgroup>
+          {this.table.tableColumns.map(column => (
+            <col
+              width={column.computedWidth || column.minWidth || column.width}
+            ></col>
+          ))}
+        </colgroup> */}
+        <thead>
+          <tr class={`${this.prefixCls}__header-row`}>
+            {
+              this.table.tableColumns.map((column, columnIndex) =>
+                column.key ? (
+                  <th class={getClassName.call(this, "cell", column)}>
+                    <div class={getClassName.call(this, "inner", column)}>
+                      {renderLabel.call(this, column, columnIndex)}
+                    </div>
+                  </th>
+                ) : (
+                  ""
+                )
+              )}
+          </tr>
+        </thead>
+      </table>
+    );
+  }
+};
diff --git a/manager/src/views/my-components/tree-table/Table/font/iconfont.eot b/manager/src/views/my-components/tree-table/Table/font/iconfont.eot
new file mode 100644
index 00000000..2b35d90c
Binary files /dev/null and b/manager/src/views/my-components/tree-table/Table/font/iconfont.eot differ
diff --git a/manager/src/views/my-components/tree-table/Table/font/iconfont.less b/manager/src/views/my-components/tree-table/Table/font/iconfont.less
new file mode 100644
index 00000000..ca06f860
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/font/iconfont.less
@@ -0,0 +1,22 @@
+// icon
+@font-face {font-family: "iconfont";
+  src: url('iconfont.eot?t=1505310522875'); /* IE9*/
+  src: url('iconfont.eot?t=1505310522875#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAW0AAsAAAAACOQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kggY21hcAAAAYAAAABuAAABojLtBtFnbHlmAAAB8AAAAa8AAAKA73SzT2hlYWQAAAOgAAAALwAAADYO3fRqaGhlYQAAA9AAAAAcAAAAJAfeA4ZobXR4AAAD7AAAABMAAAAUE+kAAGxvY2EAAAQAAAAADAAAAAwBbAHYbWF4cAAABAwAAAAeAAAAIAEUAF1uYW1lAAAELAAAAUUAAAJtPlT+fXBvc3QAAAV0AAAAQAAAAFryy5h0eJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/s04gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDwzZm7438AQw9zA0AAUZgTJAQAoHgyieJzFkcENwyAUQ98HyqHKKDmEZoEOklOnYOK/RmI+uXSCWDLG/pZAALyALK5iAfthDBxKLfLMO/LCJl+lRqL7fp7y3VuoKprV0KxO0qbyGOy5o/+xxPq9nV6YflNX9DY5fsA/k6Pj+yTpAn3jEO8AAHiclVDNitNQFD7n3slNE9vE5N7kpOn0J0mbKB3DGDMZRGw3bhQXA2LB5TyAbmfjohvBhQvfYEAEoc8wr+EDiK4KPkITU0EcXDmHw3fOgfN9fHygATTf+BUPQMIduA9P4AwAxRxjiw0xysqczdGLNI+UxbMki/QkzvljpFgov6jKlIQubLRwhA+iospyluFJuWCPsPCHiP1B+MKdHbr8I5pBNnpXP2Of0Bsnh/biXv30aKmKiexcdF2377ofOkLTOowd2Ba+Jt/QDFPUnzU79K7Gd9kYu/0sfP6qNxm45+/LN8MZGYjrNcrBxPqydEKn7behL92+frvXCcJeMlV48eNWILvD9Du0hXtgl+wSHIBZnJZLzNKyKgh9paPAdVca260hAxPBMBowz9t1uzUDuT8CswEDDtq8Gr7mADaM4QgetrKRhbozQooWeOrkKJVIojg9ccqqjcT3uBJ6lGNZnUYjnBU+ORbGaeYskM93m+kx4vGUrX5PQXK3kUSSrSS9JFWvFJHCjaIGJCFSugcOLeM6c7f6wyFZf/37+PO6AgD/x/vNnN/A7H8bhF86tmcbAHicY2BkYGAAYl/p/jnx/DZfGbhZGEDg6v0IKwT9/yELA7MEkMvBwAQSBQAZYgnZAHicY2BkYGBu+N/AEMPCAAJAkpEBFbACAEcLAm54nGNhYGBgfsnAwMKAwAAOmwD9AAAAAAAAdgCYAPYBQHicY2BkYGBgZQgEYhBgAmIuIGRg+A/mMwAAES0BcgAAeJxlj01OwzAQhV/6B6QSqqhgh+QFYgEo/RGrblhUavdddN+mTpsqiSPHrdQDcB6OwAk4AtyAO/BIJ5s2lsffvHljTwDc4Acejt8t95E9XDI7cg0XuBeuU38QbpBfhJto41W4Rf1N2MczpsJtdGF5g9e4YvaEd2EPHXwI13CNT+E69S/hBvlbuIk7/Aq30PHqwj7mXle4jUcv9sdWL5xeqeVBxaHJIpM5v4KZXu+Sha3S6pxrW8QmU4OgX0lTnWlb3VPs10PnIhVZk6oJqzpJjMqt2erQBRvn8lGvF4kehCblWGP+tsYCjnEFhSUOjDFCGGSIyujoO1Vm9K+xQ8Jee1Y9zed0WxTU/3OFAQL0z1xTurLSeTpPgT1fG1J1dCtuy56UNJFezUkSskJe1rZUQuoBNmVXjhF6XNGJPyhnSP8ACVpuyAAAAHicY2BigAAuBuyAlZGJkZmRhZGVkY2BsYI7MS89J1W3KDM9o4S3IKe0WLe4sDSxKFU3ny83Mw+Jy8AAAHSWD8A=') format('woff'),
+  url('iconfont.ttf?t=1505310522875') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('iconfont.svg?t=1505310522875#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.zk-icon {
+  font-family: "iconfont" !important;
+  font-size: 14px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.zk-icon-plus-square-o:before { content: "\e631"; }
+
+.zk-icon-minus-square-o:before { content: "\e632"; }
+
+.zk-icon-angle-right:before { content: "\e633"; }
diff --git a/manager/src/views/my-components/tree-table/Table/font/iconfont.svg b/manager/src/views/my-components/tree-table/Table/font/iconfont.svg
new file mode 100644
index 00000000..085fd562
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/font/iconfont.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="angle-right" unicode="&#58931;" d="M384.087 97.474c-7.857 0-15.713 2.997-21.707 8.992-11.989 11.989-11.989 31.426 0 43.415l234.118 234.12-234.118 234.118c-11.988 11.989-11.988 31.427 0 43.416 11.989 11.988 31.426 11.988 43.416 0l255.826-255.827c11.989-11.989 11.989-31.427 0-43.416l-255.826-255.827c-5.995-5.995-13.851-8.992-21.708-8.992z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="plus-square-o" unicode="&#58929;" d="M810.666667 768H213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333v-597.333334c0-46.933333 38.4-85.333333 85.333333-85.333333h597.333334c46.933333 0 85.333333 38.4 85.333333 85.333333V682.666667c0 46.933333-38.4 85.333333-85.333333 85.333333z m42.666666-682.666667c0-25.6-17.066667-42.666667-42.666666-42.666666H213.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666V682.666667c0 25.6 17.066667 42.666667 42.666666 42.666666h597.333334c25.6 0 42.666667-17.066667 42.666666-42.666666v-597.333334zM768 384c0-25.6-17.066667-42.666667-42.666667-42.666667H298.666667c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h426.666666c25.6 0 42.666667-17.066667 42.666667-42.666667zM512 640c25.6 0 42.666667-17.066667 42.666667-42.666667v-426.666666c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667V597.333333c0 25.6 17.066667 42.666667 42.666667 42.666667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="minus-square-o" unicode="&#58930;" d="M810.666667 768H213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333v-597.333334c0-46.933333 38.4-85.333333 85.333333-85.333333h597.333334c46.933333 0 85.333333 38.4 85.333333 85.333333V682.666667c0 46.933333-38.4 85.333333-85.333333 85.333333z m42.666666-682.666667c0-25.6-17.066667-42.666667-42.666666-42.666666H213.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666V682.666667c0 25.6 17.066667 42.666667 42.666666 42.666666h597.333334c25.6 0 42.666667-17.066667 42.666666-42.666666v-597.333334zM768 384c0-25.6-17.066667-42.666667-42.666667-42.666667H298.666667c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h426.666666c25.6 0 42.666667-17.066667 42.666667-42.666667z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/manager/src/views/my-components/tree-table/Table/font/iconfont.ttf b/manager/src/views/my-components/tree-table/Table/font/iconfont.ttf
new file mode 100644
index 00000000..545bf911
Binary files /dev/null and b/manager/src/views/my-components/tree-table/Table/font/iconfont.ttf differ
diff --git a/manager/src/views/my-components/tree-table/Table/font/iconfont.woff b/manager/src/views/my-components/tree-table/Table/font/iconfont.woff
new file mode 100644
index 00000000..fe9b1d70
Binary files /dev/null and b/manager/src/views/my-components/tree-table/Table/font/iconfont.woff differ
diff --git a/manager/src/views/my-components/tree-table/Table/utils/index.js b/manager/src/views/my-components/tree-table/Table/utils/index.js
new file mode 100644
index 00000000..dfbbb101
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/utils/index.js
@@ -0,0 +1,6 @@
+import mixins from './mixins';
+import scrollBarWidth from './scrollBarWidth';
+export {
+    mixins,
+    scrollBarWidth
+}
diff --git a/manager/src/views/my-components/tree-table/Table/utils/mixins.js b/manager/src/views/my-components/tree-table/Table/utils/mixins.js
new file mode 100644
index 00000000..5b9ee251
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/utils/mixins.js
@@ -0,0 +1,34 @@
+export default {
+  data() {
+    return {
+      prefixCls: 'zk-table',
+    };
+  },
+  methods: {
+    validateType(type, validTypes, funcName, isReturn = true) {
+      if (validTypes.indexOf(type) < 0) throw new Error(`${funcName}'s type must is ${validTypes.join(' or ')}.`);
+      if (isReturn) {
+        const certainType = {};
+        validTypes.forEach((item) => {
+          certainType[item] = item === type;
+        });
+        return certainType;
+      }
+      return true;
+    },
+    isExpandCell(table, columnIndex) {
+      return table.expandType && (
+        (table.showIndex && columnIndex === 1) ||
+        (!table.showIndex && columnIndex === 0)
+      );
+    },
+    isSelectionCell(table, columnIndex) {
+      return table.selectable && (
+        (table.showIndex && table.expandType && columnIndex === 2) ||
+        (!table.showIndex && table.expandType && columnIndex === 1) ||
+        (table.showIndex && !table.expandType && columnIndex === 1) ||
+        (!table.showIndex && !table.expandType && columnIndex === 0)
+      );
+    },
+  },
+};
diff --git a/manager/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js b/manager/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
new file mode 100644
index 00000000..9bd201d4
--- /dev/null
+++ b/manager/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
@@ -0,0 +1,28 @@
+import Vue from 'vue';
+
+let scrollBarWidth;
+
+export default function () {
+  if (Vue.prototype.$isServer) return 0;
+  if (scrollBarWidth !== undefined) return scrollBarWidth;
+
+  const outer = document.createElement('div');
+  outer.style.visibility = 'hidden';
+  outer.style.width = '100px';
+  outer.style.position = 'absolute';
+  outer.style.top = '-9999px';
+  document.body.appendChild(outer);
+
+  const widthNoScroll = outer.offsetWidth;
+  outer.style.overflow = 'scroll';
+
+  const inner = document.createElement('div');
+  inner.style.width = '100%';
+  outer.appendChild(inner);
+
+  const widthWithScroll = inner.offsetWidth;
+  outer.parentNode.removeChild(outer);
+  scrollBarWidth = widthNoScroll - widthWithScroll;
+
+  return scrollBarWidth;
+}
diff --git a/manager/src/views/order/after-order/afterSale.vue b/manager/src/views/order/after-order/afterSale.vue
new file mode 100644
index 00000000..390f9700
--- /dev/null
+++ b/manager/src/views/order/after-order/afterSale.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Tabs value="RETURN_MONEY" @on-click="handleClickType">
+            <TabPane label="退款" name="RETURN_MONEY">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add"  type="primary" >添加</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    ></Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    ></Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+            <TabPane label="取消" name="CANCEL">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add" type="primary" icon="md-add">添加</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    ></Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    ></Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+            <TabPane label="退货" name="RETURN_GOODS">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add" type="primary" icon="md-add">添加</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    ></Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    ></Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+            <TabPane label="投诉" name="COMPLAIN">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add" type="primary" icon="md-add">添加</Button>
+                    <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    ></Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    ></Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+          </Tabs>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="售后原因" prop="reason">
+          <Input v-model="form.reason" maxlength="20" clearable style="width: 100%"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    data() {
+      return {
+        modalVisible: false,//添加售后原因弹出框
+        modalTitle: "", //添加售后原因弹出框标题
+        loading: true, // 表单加载状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        modalType: 0, // 添加或编辑标识
+        submitLoading: false, // 添加或编辑提交状态
+        form: {
+          reason: ""
+        },//添加编辑表单
+        formValidate: {
+          reason: [
+            {
+              required: true,
+              message: "请输入售后原因",
+              trigger: "blur",
+            },
+          ],
+        },
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          serviceType: "RETURN_MONEY"
+        },
+        columns: [
+          {
+            title: "创建人",
+            key: "createBy",
+            minWidth: 120,
+          },
+          {
+            title: "原因",
+            key: "reason",
+            minWidth: 400,
+          },
+          {
+            title: "时间",
+            key: "createTime",
+            minWidth: 100,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      }
+                    }
+                  },
+                  "编辑"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.remove(params.row);
+                      }
+                    }
+                  },
+                  "删除"
+                )
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0,//条数
+      };
+    },
+
+    methods: {
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        this.getDataList();
+      },
+      //切换tab
+      handleClickType(v) {
+        this.searchForm.pageNumber = 1 // 当前页数
+        this.searchForm.pageSize = 10 // 页面大小
+        //退款
+        if (v == "RETURN_MONEY") {
+          this.searchForm.serviceType = "RETURN_MONEY"
+        }
+        //退货
+        if (v == "RETURN_GOODS") {
+          this.searchForm.serviceType = "RETURN_GOODS"
+        }
+        //取消
+        if (v == "CANCEL") {
+          this.searchForm.serviceType = "CANCEL"
+        }
+        //取消
+        if (v == "COMPLAIN") {
+          this.searchForm.serviceType = "COMPLAIN"
+        }
+        this.getDataList();
+      },
+      //获取售后原因数据
+      getDataList() {
+        this.loading = true;
+        API_Order.getAfterSaleReasonPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total
+          }
+        });
+        this.loading = false;
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      //添加售后原因
+      add() {
+        this.form.reason = ""
+        this.modalVisible = true
+        this.modalTitle = "添加售后原因"
+      },
+      //修改售后原因
+      edit(v) {
+        this.form.reason = v.reason
+        this.modalVisible = true
+        this.modalTitle = "修改售后原因"
+      },
+      //提交表单
+      handleSubmit() {
+        this.form.serviceType = this.searchForm.serviceType
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            if (this.modalType == 0) {
+              // 添加
+              delete this.form.id;
+              API_Order.addAfterSaleReason(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("添加成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            } else {
+              // 编辑
+              API_Order.editAfterSaleReason(this.form.id, this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("修改成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      //删除售后原因
+      remove(v) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "确认要删除此售后原因?",
+          loading: true,
+          onOk: () => {
+            // 删除
+            API_Order.delAfterSaleReason(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("售后原因已删除");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      }
+
+    },
+    mounted() {
+      this.getDataList();
+    },
+  };
+</script>
diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue
new file mode 100644
index 00000000..8c55bac6
--- /dev/null
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -0,0 +1,381 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  placeholder="请输入订单编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后单号" prop="sn">
+                <Input
+                  type="text"
+                  v-model="searchForm.sn"
+                  placeholder="请输入售后单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后状态">
+                <Select v-model="searchForm.serviceStatus" placeholder="全部" clearable style="width: 200px">
+                  <Option value="APPLY">申请售后</Option>
+                  <Option value="PASS">通过售后</Option>
+                  <Option value="REFUSE">拒绝售后</Option>
+                  <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
+                  <Option value="SELLER_RE_DELIVERY">商家换货/补发</Option>
+                  <Option value="SELLER_CONFIRM">卖家确认收货</Option>
+                  <Option value="SELLER_TERMINATION">卖家终止售后</Option>
+                  <Option value="BUYER_CONFIRM">买家确认收货</Option>
+                  <Option value="BUYER_CANCEL">买家取消售后</Option>
+                  <Option value="COMPLETE">完成售后</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="商家名称" prop="sellerName">
+                <Input
+                  type="text"
+                  v-model="searchForm.sellerName"
+                  placeholder="请输入商家名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后类型">
+                <Select v-model="searchForm.serviceType" placeholder="全部" clearable style="width: 200px">
+                  <Option value="RETURN_MONEY">退款</Option>
+                  <Option value="RETURN_GOODS">退货</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 80px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
+                  </div>
+
+                  <div style="margin-left: 13px;margin-top: 3px;">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    name: "orderList",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          orderSn: "",
+          memberName: "",
+          serviceStatus: "",
+          sellerName:"",
+          sn: "",
+
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "售后服务单号",
+            key: "sn",
+            minWidth: 140,
+            tooltip: true
+          },
+          {
+            title: "订单编号",
+            key: "orderSn",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "商品",
+            key: "goodsName",
+            minWidth: 300,
+            tooltip: true,
+            slot: "goodsSlot",
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            width: 140,
+          },
+          {
+            title: "商家名称",
+            key: "storeName",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            title: "售后金额",
+            key: "applyRefundPrice",
+            width: 110,
+            render: (h, params) => {
+              if(params.row.applyRefundPrice == null){
+                return h(
+                  "div",
+                  this.$options.filters.unitPrice(0, "￥")
+                );
+              }else{
+                return h(
+                  "div",
+                  this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥")
+                );
+              }
+
+            },
+          },
+          {
+            title: "售后类型",
+            key: "serviceType",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.serviceType == "RETURN_MONEY") {
+                return h('div', [h('span', {}, '退款'),]);
+              } else if (params.row.serviceType == "RETURN_GOODS") {
+                return h('div', [h('span', {}, '退货'),]);
+              } else if (params.row.serviceType == "EXCHANGE_GOODS") {
+                return h('div', [h('span', {}, '换货'),]);
+              }
+            }
+          },
+
+          {
+            title: "售后状态",
+            key: "serviceStatus",
+            width: 110,
+            render: (h, params) => {
+              if (params.row.serviceStatus == "APPLY") {
+                return h('div', [h('span', {}, '申请中'),]);
+              } else if (params.row.serviceStatus == "PASS") {
+                return h('div', [h('span', {}, '通过售后'),]);
+              } else if (params.row.serviceStatus == "REFUSE") {
+                return h('div', [h('span', {}, '拒绝售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_RETURN") {
+                return h('div', [h('span', {}, '买家退货，待卖家收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_RE_DELIVERY") {
+                return h('div', [h('span', {}, '商家换货/补发'),]);
+              } else if (params.row.serviceStatus == "SELLER_CONFIRM") {
+                return h('div', [h('span', {}, '卖家确认收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_TERMINATION") {
+                return h('div', [h('span', {}, '卖家终止售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_CONFIRM") {
+                return h('div', [h('span', {}, '买家确认收货'),]);
+              } else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('span', {}, '买家取消售后'),]);
+              } else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('span', {}, '完成售后'),]);
+              }else if (params.row.serviceStatus == "WAIT_REFUND") {
+                return h('div', [h('span', {}, '待平台退款'),]);
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            fixed: "right",
+            align: "center",
+            width: 100,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.getAfterSaleOrderPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //确认收款
+      confirmPrice(v) {
+        this.$Modal.confirm({
+          title: "确认收款",
+          content: "您确定要收款吗？",
+          loading: true,
+          onOk: () => {
+            API_Order.orderPay(v.sn).then(res => {
+              if (res.success) {
+                this.$Message.success("收款成功")
+                this.getDataList()
+              }
+              this.$Modal.remove();
+            })
+          },
+        });
+
+      },
+
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "after-order-detail",
+          query: {sn: sn},
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
new file mode 100644
index 00000000..275fd992
--- /dev/null
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -0,0 +1,746 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <div class="main-content">
+          <div class="div-flow-left">
+            <div class="div-form-default">
+              <h3>退货申请</h3>
+              <dl>
+                <dt>退货状态</dt>
+                <dd v-if="afterSaleInfo.serviceStatus =='APPLY'">申请退货</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='PASS'">申请通过</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='REFUSE'">申请拒绝</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">买家退货，待卖家收货</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">商家换货</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_CONFIRM'">卖家确认收货</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='SELLER_TERMINATION'">卖家终止售后</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CONFIRM'">买家确认收货</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CANCEL'">买家取消售后</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='WAIT_REFUND'">等待平台退款</dd>
+                <dd v-if="afterSaleInfo.serviceStatus =='COMPLETE'">已完成</dd>
+              </dl>
+              <dl>
+                <dt>退货退款编号</dt>
+                <dd>{{afterSaleInfo.sn}}</dd>
+              </dl>
+              <dl>
+                <dt>退货退款原因</dt>
+                <dd>{{afterSaleInfo.reason}}</dd>
+              </dl>
+              <dl>
+                <dt>申请退款金额</dt>
+                <dd>￥{{afterSaleInfo.applyRefundPrice | unitPrice}}</dd>
+              </dl>
+              <dl v-if="afterSaleInfo.actualRefundPrice">
+                <dt>实际退款金额</dt>
+                <dd>{{afterSaleInfo.actualRefundPrice}}</dd>
+              </dl>
+              <dl v-if="afterSaleInfo.refundPoint">
+                <dt>退还积分</dt>
+                <dd>{{afterSaleInfo.refundPoint}}</dd>
+              </dl>
+              <dl>
+                <dt>退货数量</dt>
+                <dd>{{afterSaleInfo.num}}</dd>
+              </dl>
+              <dl>
+                <dt>问题描述</dt>
+                <dd>{{afterSaleInfo.problemDesc}}</dd>
+              </dl>
+              <dl>
+                <dt>凭证</dt>
+                <dd v-if="afterSaleImage == ''">
+                  暂无凭证
+                </dd>
+                <dd v-else>
+                  <div class="div-img" v-for="(item, index) in afterSaleImage">
+                    <img class="complain-img" :src=item>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+
+            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
+              <h3>商家处理意见</h3>
+              <dl>
+                <dt>商家</dt>
+                <dd>
+                  <div class="div-content">
+                    {{afterSaleInfo.storeName}}
+                  </div>
+
+                </dd>
+              </dl>
+              <dl>
+                <dt>是否同意</dt>
+                <dd>
+                  <div class="div-content">
+                    <RadioGroup v-model="params.serviceStatus">
+                      <Radio label="PASS">
+                        <span>同意</span>
+                      </Radio>
+                      <Radio label="REFUSE">
+                        <span>拒绝</span>
+                      </Radio>
+                    </RadioGroup>
+                  </div>
+
+                </dd>
+              </dl>
+              <dl>
+                <dt>备注信息</dt>
+                <dd>
+                  <Input v-model="params.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                </dd>
+              </dl>
+              <dl>
+                <dd>
+                  <div style="text-align: right;width: 45%;margin-top: 10px">
+                    <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                      确定
+                    </Button>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus !='APPLY'">
+              <h3>商家处理</h3>
+              <dl>
+                <dt>商家</dt>
+                <dd>
+                  <div class="div-content">
+                    {{afterSaleInfo.storeName}}
+                  </div>
+
+                </dd>
+              </dl>
+              <dl>
+                <dt>审核结果</dt>
+                <dd>
+                  <div class="div-content">
+                    <span v-if="params.serviceStatus=='PASS'">
+                      审核通过
+                    </span>
+                    <span v-else>
+                      审核拒绝
+                    </span>
+                  </div>
+
+                </dd>
+              </dl>
+              <dl>
+                <dt>备注信息</dt>
+                <dd>
+                  {{afterSaleInfo.auditRemark}}
+                </dd>
+              </dl>
+            </div>
+          </div>
+          <div class="div-flow-center">
+
+          </div>
+          <div class="div-flow-right">
+            <div class="div-form-default">
+              <h3>相关商品交易信息</h3>
+              <dl>
+                <dt>
+                  <img :src="afterSaleInfo.goodsImage" height="60px">
+                </dt>
+                <dd>
+                  <a>{{afterSaleInfo.goodsName}}</a><br>
+                  <span>{{afterSaleInfo.num}}(数量)</span><br>
+
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default">
+              <h3>订单相关信息</h3>
+              <dl>
+                <dt>
+                  订单编号
+                </dt>
+                <dd>
+                  {{afterSaleInfo.orderSn}}
+                </dd>
+              </dl>
+
+            </div>
+            <!--"-->
+            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO.refund">
+              <h3>平台退款</h3>
+
+              <dl>
+                <dt>备注信息</dt>
+                <dd>
+                  <Input v-model="refundPriceForm.remark" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                </dd>
+              </dl>
+              <dl>
+                <dt>操作</dt>
+                <dd>
+                  <Button type="primary" :loading="submitLoading" @click="refundPriceSubmit" style="margin-left: 5px">
+                    退款
+                  </Button>
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">
+              <h3>物流信息</h3>
+              <dl>
+                <dt>
+                  收货人
+                </dt>
+                <dd>
+                  {{afterSaleInfo.sconsigneeName}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货人手机
+                </dt>
+                <dd>
+                  {{afterSaleInfo.sconsigneeMobile}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货地址
+                </dt>
+                <dd>
+                  {{afterSaleInfo.sconsigneeAddressPath}} {{afterSaleInfo.sconsigneeDetail}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  物流公司
+                </dt>
+                <dd>
+                  {{afterSaleInfo.slogisticsNo}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  物流单号
+                </dt>
+                <dd>
+                  {{afterSaleInfo.slogisticsCode}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>操作</dt>
+                <dd>
+                  <Button type="primary" :loading="submitLoading" @click="sellerConfirmSubmit" style="margin-left: 5px">
+                    确认收货
+                  </Button>
+                  <Button type="primary" :loading="submitLoading" @click="logisticsSeller()" style="margin-left: 5px">
+                    查询物流
+                  </Button>
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='PASS' && afterSaleInfo.serviceType == 'EXCHANGE_GOODS'">
+              <h3>换货</h3>
+              <dl>
+                <dt>
+                  换货
+                </dt>
+                <dd>
+                  <Button type="primary" :loading="submitLoading" @click="exchangeGoods" style="margin-left: 5px">
+                    换货
+                  </Button>
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">
+              <h3>物流信息</h3>
+              <dl>
+                <dt>
+                  收货人
+                </dt>
+                <dd>
+                  {{afterSaleInfo.mconsigneeName}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货人手机
+                </dt>
+                <dd>
+                  {{afterSaleInfo.mconsigneeMobile}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货地址
+                </dt>
+                <dd>
+                  {{afterSaleInfo.mconsigneeAddressPath}} {{afterSaleInfo.mconsigneeDetail}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  物流公司
+                </dt>
+                <dd>
+                  {{afterSaleInfo.mlogisticsName}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  物流单号
+                </dt>
+                <dd>
+                  {{afterSaleInfo.mlogisticsNo}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>操作</dt>
+                <dd>
+                  <Button type="primary" :loading="submitLoading" @click="logisticsBuyer()" style="margin-left: 5px">
+                    查询物流
+                  </Button>
+                </dd>
+              </dl>
+
+            </div>
+
+          </div>
+        </div>
+
+      </Card>
+      </Col>
+    </Row>
+    <!-- 订单发货 -->
+    <Modal v-model="modalVisible" width="500px">
+      <p slot="header">
+        <span>订单发货</span>
+      </p>
+      <div>
+        <Form ref="form" :model="form" :label-width="90" :rules="formValidate" style="position:relative">
+          <FormItem label="物流公司" prop="logisticsId">
+            <Select v-model="form.logisticsId" placeholder="请选择" style="width:250px">
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{item.name}}
+              </Option>
+            </Select>
+          </FormItem>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" style="width:250px" />
+          </FormItem>
+        </Form>
+
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button size="large" @click="orderDeliverCancel">取消</Button>
+        <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
+
+      </div>
+    </Modal>
+    <!-- 查询物流 -->
+    <Modal v-model="logisticsModal" width="40">
+      <p slot="header">
+        <span>查询物流</span>
+      </p>
+      <div class="layui-layer-wrap">
+        <dl>
+          <dt>售后单号：</dt>
+          <dd>
+            <div class="text-box">{{sn}}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>物流公司：</dt>
+          <dd>
+            <div class="text-box">{{logisticsInfo.shipper}}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>快递单号：</dt>
+          <dd>
+            <div nctype="ordersSn" class="text-box">{{logisticsInfo.logisticCode}}</div>
+          </dd>
+        </dl>
+        <div class="div-express-log">
+          <ul class="express-log">
+            <li v-for="(item,index) in logisticsInfo.traces">
+              <span class="time">{{item.AcceptTime}}</span>
+              <span class="detail">{{item.AcceptStation}}</span>
+            </li>
+          </ul>
+        </div>
+
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="logisticsClose">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+export default {
+  name: "orderComplaint",
+  components: {
+    uploadPicThumb,
+  },
+  data() {
+    return {
+      sn: "",
+      logisticsModal: false, //查询物流模态框
+      logisticsInfo: {}, //物流信息
+      form: {
+        logisticsNo: "",
+        logisticsId: "",
+      }, //换货发货form
+      formValidate: {
+        logisticsNo: [
+          { required: true, message: "发货单号不能为空", trigger: "change" },
+        ],
+        logisticsId: [
+          { required: true, message: "请选择物流公司", trigger: "blur" },
+        ],
+      },
+      modalVisible: false, // 添加或编辑显示
+      afterSaleInfo: {},
+      afterSaleImage: [], //会员申诉图片
+      appealImages: [], //商家申诉的图片
+      submitLoading: false, // 添加或编辑提交状态
+      checkedLogistics: [], //选中的物流公司集合
+      //商家处理意见
+      params: {
+        serviceStatus: "PASS",
+        remark: "",
+      },
+      //平台退款
+      refundPriceForm: {
+        remark: "",
+      },
+    };
+  },
+  watch: {
+    $route(to, from) {},
+  },
+  methods: {
+    getDetail() {
+      this.loading = true;
+      API_Order.getAfterSaleOrderDetail(this.sn).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.afterSaleInfo = res.result;
+          this.afterSaleImage = (res.result.afterSaleImage || "").split(",");
+          //退货地址去掉逗号
+          this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(
+            ",",
+            " "
+          );
+        }
+      });
+    },
+    //换货弹出框
+    exchangeGoods() {
+      API_Order.getLogisticsChecked().then((res) => {
+        if (res.success) {
+          this.checkedLogistics = res.result;
+          this.modalVisible = true;
+        }
+      });
+    },
+    orderDeliverCancel() {
+      this.modalVisible = false;
+    },
+    //商家确认收货
+    sellerConfirmSubmit() {
+      this.$Modal.confirm({
+        title: "确认收货",
+        content: "请确认已经收到退货货物？",
+        loading: true,
+        onOk: () => {
+          API_Order.afterSaleSellerConfirm(this.sn, this.params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("收货成功");
+              this.getDetail();
+            }
+          });
+        },
+      });
+    },
+    //平台退款
+    refundPriceSubmit() {
+      if (this.refundPriceForm.remark == "") {
+        this.$Message.error("请输入退款备注");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认退款",
+        content: "请确认退款？",
+        loading: true,
+        onOk: () => {
+          API_Order.refundPrice(this.sn, this.refundPriceForm).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("收款成功");
+              this.getDetail();
+            }
+          });
+        },
+      });
+    },
+    //查询物流
+    logisticsSeller() {
+      this.logisticsModal = true;
+      API_Order.getSellerDeliveryTraces(this.sn).then((res) => {
+        if (res.success && res.result != null) {
+          this.logisticsInfo = res.result;
+        }
+      });
+    },
+    //查询物流
+    logisticsBuyer() {
+      this.logisticsModal = true;
+      API_Order.getAfterSaleTraces(this.sn).then((res) => {
+        if (res.success && res.result != null) {
+          this.logisticsInfo = res.result;
+        }
+      });
+    },
+    //关闭物流弹出框
+    logisticsClose() {
+      this.logisticsModal = false;
+    },
+
+    //换货发货
+    orderDeliverySubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          API_Order.afterSaleSellerDelivery(this.sn, this.form).then((res) => {
+            if (res.success) {
+              this.$Message.success("订单发货成功");
+              this.modalVisible = false;
+              this.getDataDetail();
+            }
+          });
+        }
+      });
+    },
+    //回复
+    handleSubmit() {
+      if (this.params.remark == "") {
+        this.$Message.error("请输入备注信息");
+        return;
+      }
+      API_Order.afterSaleSellerReview(this.sn, this.params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("审核成功");
+          this.params.remark = "";
+          this.getDetail();
+        }
+      });
+    },
+  },
+
+  mounted() {
+    this.sn = this.$route.query.sn;
+    this.getDetail();
+  },
+};
+</script>
+<style lang="scss" >
+.ivu-col {
+  width: 100% !important;
+}
+.main-content {
+  min-height: 600px;
+  padding: 10px;
+}
+
+.div-flow-left {
+  width: 49%;
+  letter-spacing: normal;
+  display: inline-block;
+  border-right: solid #f5f5f5 1px;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+dl dt {
+  width: 100px;
+  text-align: right;
+}
+
+.div-express-log {
+  max-height: 300px;
+  border: solid 1px #e7e7e7;
+  background: #fafafa;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+.express-log {
+  margin-right: -10px;
+  margin: 5px;
+  padding: 10px;
+  list-style-type: none;
+
+  .time {
+    width: 30%;
+    display: inline-block;
+    float: left;
+  }
+
+  .detail {
+    width: 60%;
+    margin-left: 30px;
+    display: inline-block;
+  }
+
+  li {
+    line-height: 30px;
+  }
+}
+
+.layui-layer-wrap {
+  dl {
+    border-top: solid 1px #f5f5f5;
+    margin-top: -1px;
+    overflow: hidden;
+
+    dt {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 1% 8px 0;
+      color: #999;
+    }
+
+    dd {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 0 8px 8px;
+      border-left: solid 1px #f5f5f5;
+
+      .text-box {
+        line-height: 40px;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.div-img {
+  width: 130px;
+  height: 130px;
+  text-align: center;
+  float: left;
+}
+
+.div-flow-center {
+  width: 2%;
+  display: inline-block;
+}
+
+.div-flow-right {
+  width: 49%;
+  vertical-align: top;
+  word-spacing: normal;
+  display: inline-block;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.complain-img {
+  width: 120px;
+  height: 120px;
+  text-align: center;
+}
+</style>
diff --git a/manager/src/views/order/after-order/orderComplaint.vue b/manager/src/views/order/after-order/orderComplaint.vue
new file mode 100644
index 00000000..75f9d299
--- /dev/null
+++ b/manager/src/views/order/after-order/orderComplaint.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  placeholder="请输入订单编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="状态" prop="status">
+                <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="NEW">新投诉</Option>
+                  <Option value="CANCEL">已撤销</Option>
+                  <Option value="WAIT_APPEAL">待申诉</Option>
+                  <Option value="COMMUNICATION">对话中</Option>
+                  <Option value="WAIT_ARBITRATION">等待仲裁</Option>
+                  <Option value="COMPLETE">已完成</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="评价内容">
+          <span v-if="content == ''">暂无评价</span>
+          <span v-else>{{content}}</span>
+        </FormItem>
+        <FormItem label="评价图片">
+          <upload-pic-thumb
+                            v-model="image"
+                            :disable="true"
+                            :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+        <FormItem label="回复内容" prop="reply">
+          <Input v-if="replyStatus == false"
+            v-model="form.reply"
+            type="textarea"
+            maxlength="200"
+            :rows="4"
+            clearable
+            style="width:260px"
+          />
+          <span v-else>
+            {{form.reply}}
+          </span>
+        </FormItem>
+        <FormItem label="回复图片" prop="replyImage">
+          <upload-pic-thumb v-if="replyStatus == false"
+            v-model="form.replyImage"
+            :limit="5"
+          ></upload-pic-thumb>
+          <upload-pic-thumb v-else
+            v-model="form.replyImage"
+            :disable="true"
+             :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit" >回复
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+  import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+  export default {
+    name: "orderComplaint",
+    components: {
+      uploadPicThumb
+    },
+    data() {
+      return {
+        image:[],//评价图片
+        replyStatus:false,//回复状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        loading: true, // 表单加载状态
+        content: "",//评价内容
+        drop: false,
+        dropDownIcon: "ios-arrow-down",
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        selectDate: null,
+        form: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            title: "会员名称",
+            key: "memberName",
+            width: 200,
+            sortable: false,
+          },
+          {
+            title: "订单编号",
+            key: "orderSn",
+            minWidth: 120,
+            tooltip: true
+
+          },
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 170,
+            tooltip: true
+
+          },
+          {
+            title: "投诉主题",
+            key: "complainTopic",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "投诉时间",
+            key: "createTime",
+            width: 180,
+          },
+          {
+            title: "投诉状态",
+            key: "complainStatus",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.complainStatus == "NEW") {
+                return h('div', [h('span', { }, '新投诉'),]);
+              } else if (params.row.complainStatus == "CANCEL") {
+                return h('div', [h('span', { }, '已撤销'),]);
+              } else if (params.row.complainStatus == "WAIT_APPEAL") {
+                return h('div', [h('span', { }, '待申诉'),]);
+              } else if (params.row.complainStatus == "COMMUNICATION") {
+                return h('div', [h('span', { }, '对话中'),]);
+              }else if (params.row.complainStatus == "WAIT_ARBITRATION") {
+                return h('div', [h('span', { }, '等待仲裁'),]);
+              }else if (params.row.complainStatus == "COMPLETE") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 150,
+            render: (h, params) => {
+              if(params.row.complainStatus === "COMPLETE"){
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "info",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.detail(params.row);
+                        },
+                      },
+                    },
+                    "详情"
+                  ),
+                ]);
+              }else{
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "primary",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.detail(params.row);
+                        },
+                      },
+                    },
+                    "处理"
+                  ),
+                ]);
+              }
+
+            },
+          },
+
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    watch: {
+      $route(){
+        this.getDataList();
+      }
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      dropDown() {
+        if (this.drop) {
+          this.dropDownContent = "展开";
+          this.dropDownIcon = "ios-arrow-down";
+        } else {
+          this.dropDownContent = "收起";
+          this.dropDownIcon = "ios-arrow-up";
+        }
+        this.drop = !this.drop;
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.getOrderComplain(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //投诉详情
+      detail(v) {
+        let id = v.id;
+        this.$router.push({
+          name: "order-complaint-detail",
+          query: { id: id },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/after-order/orderComplaintDetail.vue b/manager/src/views/order/after-order/orderComplaintDetail.vue
new file mode 100644
index 00000000..28093035
--- /dev/null
+++ b/manager/src/views/order/after-order/orderComplaintDetail.vue
@@ -0,0 +1,459 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col style="width:100%;">
+      <Card>
+        <div class="main-content">
+          <div class="div-flow-left">
+            <div class="div-form-default">
+              <h3>投诉信息</h3>
+              <dl>
+                <dt>投诉商品</dt>
+                <dd>{{complaintInfo.goodsName}}</dd>
+              </dl>
+              <dl>
+                <dt>投诉状态</dt>
+                <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
+                <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
+                <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
+                <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
+                <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
+                <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
+              </dl>
+              <dl>
+                <dt>投诉时间</dt>
+                <dd>{{complaintInfo.createTime}}</dd>
+              </dl>
+              <dl>
+                <dt>投诉主题</dt>
+                <dd>{{complaintInfo.complainTopic}}</dd>
+              </dl>
+              <dl>
+                <dt>投诉内容</dt>
+                <dd>{{complaintInfo.content}}</dd>
+              </dl>
+              <dl>
+                <dt>投诉凭证</dt>
+                <dd v-if="images == ''">
+                  暂无投诉凭证
+                </dd>
+                <dd v-else>
+                  <div class="div-img" v-for="(item, index) in images">
+                    <img class="complain-img" :src=item>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="complaintInfo.appealContent">
+              <h3>商家申诉信息</h3>
+              <dl>
+                <dt>申诉时间</dt>
+                <dd>{{complaintInfo.appealTime}}</dd>
+              </dl>
+              <dl>
+                <dt>申诉内容</dt>
+                <dd>{{complaintInfo.appealContent}}</dd>
+              </dl>
+              <dl>
+                <dt>申诉凭证</dt>
+                <dd v-if="complaintInfo.appealImagesList.length == 0">
+                  暂无申诉凭证
+                </dd>
+                <dd v-else>
+                  <div class="div-img" v-for="(item, index) in complaintInfo.appealImagesList">
+                    <img class="complain-img" :src="item">
+                  </div>
+                </dd>
+              </dl>
+            </div>
+              <div class="div-form-default">
+                <h3>对话详情</h3>
+                <dl>
+                  <dt>对话记录</dt>
+                  <dd>
+                    <div class="div-content">
+                      <p v-for="(item, index) in complaintInfo.orderComplaintCommunications">
+                        <span v-if="item.owner == 'STORE'">商家[{{ item.createTime }}]</span>
+                        <span v-if="item.owner == 'BUYER'">买家[{{ item.createTime }}]</span>
+                        <span v-if="item.owner == 'PLATFORM'">平台[{{ item.createTime }}]</span>
+                        {{ item.content }}
+                      </p>
+                    </div>
+
+                  </dd>
+                </dl>
+                <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
+                  <dt>发送对话</dt>
+                  <dd>
+                    <Input
+                      v-model="params.content"
+                      type="textarea"
+                      maxlength="200"
+                      :rows="4"
+                      clearable
+                      style="width:260px"
+                    />
+                  </dd>
+                </dl>
+                <dl v-if="complaintInfo.complainStatus != 'COMPLETE'">
+                  <dt></dt>
+                  <dd>
+                    <div style="text-align: right;width: 45%;margin-top: 10px">
+                      <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                        回复
+                      </Button>
+                      <Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
+                        返回列表
+                      </Button>
+                    </div>
+                  </dd>
+                </dl>
+              </div>
+            <div class="div-form-default" v-if="complaintInfo.complainStatus == 'COMPLETE'">
+              <h3>仲裁结果</h3>
+              <dl>
+                <dt>仲裁意见</dt>
+                <dd>
+                  {{complaintInfo.arbitrationResult}}
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="complaintInfo.complainStatus != 'COMPLETE'">
+              <h3>平台仲裁</h3>
+              <dl v-if="arbitrationResultShow == true">
+                <dt>仲裁</dt>
+                <dd>
+                  <Input v-model="arbitrationParams.arbitrationResult" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                </dd>
+              </dl>
+              <dl>
+                <dt></dt>
+                <dd style="text-align:right;display:flex; justify-content: space-between;">
+                  <Button type="primary" ghost :loading="submitLoading" v-if="arbitrationResultShow == false" @click="arbitrationHandle">
+                    直接仲裁结束投诉流程
+                  </Button>
+                  <Button :loading="submitLoading" v-if="complaintInfo.complainStatus == 'NEW'" @click="handleStoreComplaint">
+                    交由商家申诉
+                  </Button>
+                  <Button type="primary" :loading="submitLoading" v-if="arbitrationResultShow == true" @click="arbitrationHandleSubmit">
+                    提交仲裁
+                  </Button>
+                </dd>
+              </dl>
+            </div>
+          </div>
+          <div class="div-flow-center">
+
+          </div>
+          <div class="div-flow-right">
+            <div class="div-form-default">
+              <h3>相关商品交易信息</h3>
+              <dl>
+                <dt>
+                  <img :src="complaintInfo.goodsImage" height="60px">
+                </dt>
+                <dd>
+                  <a>{{complaintInfo.goodsName}}</a><br>
+                  <span>￥{{complaintInfo.goodsPrice}} * {{complaintInfo.num}}(数量)</span>
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default">
+              <h3>订单相关信息</h3>
+              <dl>
+                <dt>
+                  订单编号
+                </dt>
+                <dd>
+                  {{complaintInfo.orderSn}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  下单时间
+                </dt>
+                <dd>
+                  {{complaintInfo.createTime}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  订单金额
+                </dt>
+                <dd>
+                  {{complaintInfo.orderPrice}}
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default">
+              <h3>收件人信息</h3>
+              <dl>
+                <dt>
+                  收货人
+                </dt>
+                <dd>
+                  {{complaintInfo.consigneeName}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货地址
+                </dt>
+                <dd>
+                  {{complaintInfo.consigneeAddressPath}}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货人手机
+                </dt>
+                <dd>
+                  {{complaintInfo.consigneeMobile}}
+                </dd>
+              </dl>
+            </div>
+
+          </div>
+        </div>
+
+      </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+export default {
+  name: "orderComplaint",
+  components: {
+    uploadPicThumb,
+  },
+  data() {
+    return {
+      id: 0,
+      complaintInfo: "",
+      images: [], //会员申诉图片
+      appealImages: [], //商家申诉的图片
+      submitLoading: false, // 添加或编辑提交状态
+      //管理端回复内容
+      params: {
+        content: "",
+        complainId: "",
+      },
+      //仲裁结果
+      arbitrationParams: {
+        arbitrationResult: "",
+      },
+      //是否显示仲裁框
+      arbitrationResultShow: false,
+    };
+  },
+  methods: {
+    // 交给商家申诉
+    handleStoreComplaint() {
+      API_Order.storeComplain({
+        complainStatus: "WAIT_APPEAL",
+        complainStatus: "WAIT_APPEAL",
+        complainId: this.complaintInfo.id,
+      }).then((res) => {
+        if (res.success) {
+          this.$Message.success("操作成功");
+          this.getDetail();
+        }
+      });
+    },
+    init() {
+      this.getDataList();
+    },
+    getDetail() {
+      this.loading = true;
+      API_Order.getOrderComplainDetail(this.id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.complaintInfo = res.result;
+          this.images = (res.result.images || "").split(",");
+          this.appealImages = (res.result.appealImages || "").split(",");
+        }
+      });
+    },
+    //返回列表
+    returnDataList() {
+      this.$router.push({
+        name: "orderComplaint",
+      });
+    },
+    //仲裁
+    arbitrationHandle() {
+      this.arbitrationResultShow = true;
+    },
+    //仲裁结果提交
+    arbitrationHandleSubmit() {
+      if (this.arbitrationParams.arbitrationResult == "") {
+        this.$Message.error("请填写仲裁内容");
+        return;
+      }
+      API_Order.orderComplete(this.id, this.arbitrationParams).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("仲裁成功");
+          this.arbitrationParams.arbitrationResult = "";
+          this.getDetail();
+        }
+      });
+      this.arbitrationResultShow = true;
+    },
+    //回复
+    handleSubmit() {
+      if (this.params.content == "") {
+        this.$Message.error("请填写对话内容");
+        return;
+      }
+      this.params.complainId = this.id;
+      API_Order.addOrderCommunication(this.params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("对话成功");
+          this.params.content = "";
+          this.getDetail();
+        }
+      });
+    },
+  },
+  mounted() {
+    this.id = this.$route.query.id;
+    this.getDetail();
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+.main-content {
+  min-height: 600px;
+  padding: 10px;
+}
+
+.div-flow-left {
+  width: 49%;
+  letter-spacing: normal;
+  display: inline-block;
+  border-right: solid #f5f5f5 1px;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.div-img {
+  width: 130px;
+  height: 130px;
+  text-align: center;
+  float: left;
+}
+
+.div-flow-center {
+  width: 2%;
+  display: inline-block;
+}
+
+.div-flow-right {
+  width: 49%;
+  vertical-align: top;
+  word-spacing: normal;
+  display: inline-block;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.complain-img {
+  width: 120px;
+  height: 120px;
+  text-align: center;
+}
+
+.div-content {
+  overflow-y: auto;
+  overflow-x: auto;
+  height: 150px;
+}
+</style>
diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue
new file mode 100644
index 00000000..bbb3dae1
--- /dev/null
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -0,0 +1,217 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="sn">
+                <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px"/>
+              </Form-item>
+              <Form-item label="付款状态" prop="orderStatus">
+                <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="支付时间">
+                <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable
+                            @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                   @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+                  size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+
+export default {
+  name: "paymentLog",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      drop: false,
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        sn: "",
+        payStatus: "",
+      },
+      columns: [
+        {
+          title: "订单/交易编号",
+          key: "sn",
+          minWidth: 180,
+          tooltip: true,
+        },
+        {
+          title: "支付方式",
+          key: "paymentMethod",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.paymentMethod === "WECHAT") {
+              return h("div", [h("span", {}, "微信")]);
+            } else if (params.row.paymentMethod === "ALIPAY") {
+              return h("div", [h("span", {}, "支付宝")]);
+            } else if (params.row.paymentMethod === "WALLET") {
+              return h("div", [h("span", {}, "余额支付")]);
+            } else if (params.row.paymentMethod === "BANK_TRANSFER") {
+              return h("div", [h("span", {}, "银行转帐")]);
+            }
+          },
+        },
+        {
+          title: "第三方流水",
+          key: "receivableNo",
+          minWidth: 130,
+        },
+        {
+          title: "客户端",
+          key: "clientType",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.clientType === "WECHAT_MP") {
+              return h("div", [h("span", {}, "小程序")]);
+            } else if (params.row.clientType === "APP") {
+              return h("div", [h("span", {}, "APP")]);
+            } else if (params.row.clientType === "PC") {
+              return h("div", [h("span", {}, "PC网页")]);
+            } else if (params.row.clientType === "H5") {
+              return h("div", [h("span", {}, "移动端")]);
+            }
+          },
+        },
+        {
+          title: "支付时间",
+          key: "paymentTime",
+          width: 200,
+        },
+        {
+          title: "订单金额",
+          fixed: "right",
+          key: "flowPrice",
+          minWidth: 80,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "支付状态",
+          key: "payStatus",
+          width: 95,
+          fixed: "right",
+          render: (h, params) => {
+            if (params.row.payStatus == "PAID") {
+              return h("div", [h("span", {}, "已付款")]);
+            } else {
+              return h("div", [h("span", {}, "未付款")]);
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      API_Order.paymentLog(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    }
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue
new file mode 100644
index 00000000..5324dda6
--- /dev/null
+++ b/manager/src/views/order/flow/refundLog.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="orderSn">
+                <Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px"/>
+              </Form-item>
+              <Form-item label="退款状态" prop="orderStatus">
+                <Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="false">未退款</Option>
+                  <Option value="true">已退款</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="退款时间">
+                <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable
+                            @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                   @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                  @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+                  size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+
+export default {
+  name: "paymentLog",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      drop: false,
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderSn: "",
+        isRefund: "",
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      columns: [
+        {
+          title: "售后单号",
+          key: "afterSaleNo",
+          minWidth: 150,
+          tooltip: true,
+        },
+        {
+          title: "订单号",
+          key: "orderSn",
+          minWidth: 150,
+          tooltip: true,
+        },
+        {
+          title: "第三方付款流水",
+          key: "paymentReceivableNo",
+          minWidth: 150,
+          tooltip: true
+        },
+        {
+          title: "第三方退款流水",
+          key: "receivableNo",
+          minWidth: 130,
+          tooltip: true
+        },
+        {
+          title: "退款金额",
+          key: "totalAmount",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.totalAmount, "￥")
+            );
+          },
+        },
+        {
+          title: "申请时间",
+          key: "createTime",
+          minWidth: 200,
+          tooltip: true
+        },
+        {
+          title: "退款状态",
+          key: "isRefund",
+          fixed: "right",
+          width: 95,
+          render: (h, params) => {
+            if (params.row.isRefund == "1") {
+              return h("div", [h("span", {}, "已退款")]);
+            } else {
+              return h("div", [h("span", {}, "未退款")]);
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      API_Order.refundLog(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    }
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
new file mode 100644
index 00000000..fff4f6c5
--- /dev/null
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -0,0 +1,337 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  placeholder="请输入订单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="buyerName">
+                <Input
+                  type="text"
+                  v-model="searchForm.buyerName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单状态" prop="orderStatus">
+                <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="NEW">新订单</Option>
+                  <Option value="CONFIRM">已确认</Option>
+                  <Option value="STOCK_LOCK">库存锁定</Option>
+                  <Option value="ERROR">出库失败</Option>
+                  <Option value="WAIT_PINTUAN">待成团</Option>
+                  <Option value="PAID">待发货</Option>
+                  <Option value="DELIVERED">已发货</Option>
+                  <Option value="COMPLETE">已完成</Option>
+                  <Option value="TAKE">待核验</Option>
+                  <Option value="CANCELLED">已取消</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="下单时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    name: "orderList",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        drop: false,
+        dropDownIcon: "ios-arrow-down",
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          orderType: "FICTITIOUS",
+          orderSn: "",
+          buyerName: "",
+          orderStatus: ""
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "订单号",
+            key: "sn",
+            minWidth: 230,
+            tooltip: true
+          },
+          {
+            title: "下单时间",
+            key: "createTime",
+            width: 200,
+            sortable: true,
+            sortType: "desc",
+          },
+          {
+            title: "订单来源",
+            key: "clientType",
+            width: 95,
+          },
+          {
+            title: "买家名称",
+            key: "memberName",
+            width: 130,
+          },
+          {
+            title: "订单金额",
+            key: "flowPrice",
+            minWidth: 120,
+            sortable: true,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+              );
+            },
+          },
+
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            width:95,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', { }, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', { }, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', { }, '待发货'),]);
+              } else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', { }, '已发货'),]);
+              }else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', { }, '待核验'),]);
+              }else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', { }, '已取消'),]);
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small",
+                    },
+                    attrs: {
+                      disabled: params.row.orderStatus == "UNPAID" ? false : true,
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.confirmPrice(params.row);
+                      },
+                    },
+                  },
+                  "收款"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      dropDown() {
+        if (this.drop) {
+          this.dropDownContent = "展开";
+          this.dropDownIcon = "ios-arrow-down";
+        } else {
+          this.dropDownContent = "收起";
+          this.dropDownIcon = "ios-arrow-up";
+        }
+        this.drop = !this.drop;
+      },
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.getOrderList(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //确认收款
+      confirmPrice(v) {
+        this.$Modal.confirm({
+          title: "确认收款",
+          content: "您确定要收款吗？",
+          loading: true,
+          onOk: () => {
+            API_Order.orderPay(v.sn).then(res => {
+              if(res.success){
+                this.$Message.success("收款成功")
+                this.getDataList()
+              }
+              this.$Modal.remove();
+            })
+          },
+        });
+
+      },
+
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "order-detail",
+          query: {sn: sn},
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
new file mode 100644
index 00000000..2c1a4fc5
--- /dev/null
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -0,0 +1,775 @@
+<template>
+  <div class="search">
+    <div>
+      <Col>
+        <div >
+          <Card style="height: 60px">
+            <div style="">
+              <Button
+                v-if="allowOperation.editPrice"
+                @click="modifyPrice"
+                type="primary"
+                >调整价格</Button
+              >
+              <Button
+                v-if="allowOperation.editConsignee"
+                @click="editAddress"
+                type="primary"
+                >修改收货地址</Button
+              >
+              <Button
+                v-if="allowOperation.cancel"
+                @click="orderCancel"
+                type="primary"
+                >订单取消</Button
+              >
+              <Button @click="orderLog" type="primary"
+                >订单日志</Button
+              >
+            </div>
+          </Card>
+          <Card style="height: 400px">
+            <div style="width: 30%; float: left; margin-left: 20px">
+              <div class="div-item">
+                <div class="div-item-left">订单号：</div>
+                <div class="div-item-right">{{ orderInfo.order.sn }}</div>
+              </div>
+              <div class="div-item">
+                <div class="div-item-left">订单来源：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.order.clientType }}
+                </div>
+              </div>
+
+              <div class="div-item">
+                <div class="div-item-left">订单状态：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.orderStatusValue }}
+                </div>
+              </div>
+
+              <div class="div-item">
+                <div class="div-item-left">下单时间：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.order.createTime }}
+                </div>
+              </div>
+            </div>
+            <div style="width: 30%; float: left; margin-left: 20px">
+              <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+                <div class="div-item-left">发票信息：</div>
+                <div class="div-item-right">暂无发票信息</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票抬头：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+                <div class="div-item-left">发票税号：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票内容：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票金额：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">是否开票：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+              </div>
+            </div>
+            <div style="width: 36%; float: left">
+              <div class="div-item">
+                <div class="div-item-left">收货信息：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.order.consigneeName }}
+                  {{ orderInfo.order.consigneeMobile }}
+                  {{ orderInfo.order.consigneeAddressPath }}
+                  {{ orderInfo.order.consigneeDetail }}
+                </div>
+              </div>
+              <div class="div-item">
+                <div class="div-item-left">支付方式：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.paymentMethodValue }}
+                </div>
+              </div>
+
+              <div class="div-item">
+                <div class="div-item-left">买家留言：</div>
+                <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+                <div class="div-item-left">发票信息：</div>
+                <div class="div-item-right">暂无发票信息</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票抬头：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+                <div class="div-item-left">发票税号：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票内容：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">发票金额：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+              </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">是否开票：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+              </div>
+
+              <div class="div-item">
+                <div class="div-item-left">配送方式：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.deliveryMethodValue }}
+                </div>
+              </div>
+            </div>
+          </Card>
+        </div>
+      </Col>
+      <Card>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+          <!-- 商品栏目格式化 -->
+          <template slot="goodsSlot" slot-scope="scope">
+            <div style="margin-top: 5px; height: 80px; display: flex">
+              <div style="">
+                <img
+                  :src="scope.row.image"
+                  style="height: 60px; margin-top: 1px; width: 60px"
+                />
+              </div>
+
+              <div style="margin-left: 13px">
+                <div class="div-zoom">
+                  <a>{{ scope.row.goodsName }}</a>
+                </div>
+                <div>
+                  <span v-for="(item, key) in JSON.parse(scope.row.specs)">
+                    <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
+                     {{key}} : {{item}}
+                    </span>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </template>
+        </Table>
+        <div class="goods-total">
+          <ul>
+            <li>
+              <span class="label">商品总额：</span>
+              <span class="txt"
+                >{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')  }}</span
+              >
+            </li>
+            <li>
+              <span class="label">优惠金额：</span>
+              <span class="txt"> {{ orderInfo.order.discountPrice | unitPrice('￥')}} </span>
+            </li>
+            <li>
+              <span class="label">运费：</span>
+              <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
+            </li>
+            <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
+              <span class="label">使用积分：</span>
+              <span class="txt">{{
+                orderInfo.order.priceDetailDTO.payPoint
+              }}</span>
+            </li>
+
+            <li>
+              <span class="label">应付金额：</span>
+              <span class="txt flowPrice"
+                >¥{{ orderInfo.order.priceDetailDTO.flowPrice }}</span
+              >
+            </li>
+          </ul>
+        </div>
+      </Card>
+    </div>
+
+    <Modal v-model="modal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>修改金额</span>
+      </p>
+      <div>
+        <Form
+          ref="modifyPriceForm"
+          :model="modifyPriceForm"
+          label-position="left"
+          :label-width="100"
+          :rules="modifyPriceValidate"
+        >
+          <FormItem label="订单金额" prop="price">
+            <Input
+              v-model="modifyPriceForm.price"
+              size="large"
+              number
+              maxlength="9"
+              ><span slot="append">元</span></Input
+            >
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="modifyPriceSubmit"
+          >调整</Button
+        >
+      </div>
+    </Modal>
+    <!-- 订单取消模态框 -->
+    <Modal v-model="orderCancelModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>订单取消</span>
+      </p>
+      <div>
+        <Form
+          ref="orderCancelForm"
+          :model="orderCancelForm"
+          label-position="left"
+          :label-width="100"
+          :rules="orderCancelValidate"
+        >
+          <FormItem label="取消原因" prop="reason">
+            <Input
+              v-model="orderCancelForm.reason"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 5 }"
+              placeholder="请输入取消原因"
+            ></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="orderCancelSubmit"
+          >取消</Button
+        >
+      </div>
+    </Modal>
+    <!--收件地址弹出框-->
+    <Modal v-model="addressModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>修改收件信息</span>
+      </p>
+      <div>
+        <Form
+          ref="addressForm"
+          :model="addressForm"
+          label-position="left"
+          :label-width="100"
+          :rules="addressRule"
+        >
+          <FormItem label="收件人" prop="consigneeName">
+            <Input
+              v-model="addressForm.consigneeName"
+              size="large"
+              maxlength="20"
+            ></Input>
+          </FormItem>
+          <FormItem label="联系方式" prop="consigneeMobile">
+            <Input
+              v-model="addressForm.consigneeMobile"
+              size="large"
+              maxlength="11"
+            ></Input>
+          </FormItem>
+          <FormItem label="地址信息" prop="consigneeAddressPath">
+            <Input
+              v-model="region"
+              disabled
+              style="width: 305px"
+              v-if="showRegion == false"
+            />
+            <Button
+              v-if="showRegion == false"
+              @click="regionClick"
+              :loading="submitLoading"
+              type="primary"
+              icon="ios-create-outline"
+              style="margin-left: 8px"
+              >修改
+            </Button>
+            <region
+              style="width: 400px"
+              @selected="selectedRegion"
+              v-if="showRegion == true"
+            />
+          </FormItem>
+          <FormItem label="详细地址" prop="consigneeDetail">
+            <Input
+              v-model="addressForm.consigneeDetail"
+              size="large"
+              maxlength="50"
+            ></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="editAddressSubmit">修改</Button
+        >
+      </div>
+    </Modal>
+    <!-- 订单日志 -->
+    <Modal v-model="orderLogModal" width="60">
+      <p slot="header">
+        <span>订单日志</span>
+      </p>
+      <div class="order-log-div">
+        <Table
+          :loading="loading"
+          border
+          :columns="orderLogColumns"
+          :data="orderInfo.orderLogs"
+          ref="table"
+          sortable="custom"
+        ></Table>
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="handelCancel">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import * as RegExp from "@/libs/RegExp.js";
+import region from "@/views/lili-components/region";
+
+export default {
+  name: "orderList",
+  components: {
+    region,
+  },
+  data() {
+    return {
+      submitLoading: false, // 添加或编辑提交状态
+      region: [], //地区
+      regionId: [], //地区id
+      showRegion: false,
+      orderLogInfo: [], //订单日志数据
+      orderLogModal: false, //弹出调整价格框
+      checkedLogistics: [], //选中的物流公司集合
+      allowOperation: {}, //订单可才做选项
+      sn: "", //订单编号
+      orderInfo: {
+        order: {
+          priceDetailDTO: {},
+        },
+      },
+      modal: false, //弹出调整价格框
+      searchForm: {
+        pageNumber: 1, // 当前页数
+        pageSize: 100, // 页面大小
+        orderSn: "", //订单sn
+      },
+      //调整价格表单
+      modifyPriceForm: {
+        price: 0,
+      },
+      //订单取消表单
+      orderCancelForm: {
+        reason: "",
+      },
+      //弹出订单取消框
+      orderCancelModal: false,
+      //订单发货
+      orderDeliveryForm: {
+        logisticsNo: "", //发货单号
+        logisticsId: "", //物流公司
+      },
+      //验证要调整的订单金额
+      modifyPriceValidate: {
+        reason: [
+          { required: true, message: "请输入大于0小于99999的合法金额" },
+          {
+            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
+            message: "请输入大于0小于9999的合法金额",
+            trigger: "change",
+          },
+        ],
+      },
+
+      //验证取消订单原因
+      orderCancelValidate: {
+        reason: [
+          { required: true, message: "取消原因不能为空", trigger: "blur" },
+        ],
+      },
+      addressModal: false, //弹出修改收件信息框
+      //收件地址表单
+      addressForm: {
+        consigneeName: "",
+        consigneeMobile: "",
+        consigneeDetail: "",
+        consigneeAddressPath: "",
+        consigneeAddressIdPath: "",
+      },
+      orderDeliverFormValidate: {
+        logisticsNo: [
+          { required: true, message: "发货单号不能为空", trigger: "change" },
+        ],
+        logisticsId: [
+          { required: true, message: "请选择物流公司", trigger: "blur" },
+        ],
+      },
+      addressRule: {
+        consigneeName: [
+          { required: true, message: "收货人姓名不能为空", trigger: "blur" },
+        ],
+        consigneeMobile: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+          {
+            pattern: RegExp.mobile,
+            trigger: "blur",
+            message: "请输入正确的手机号",
+          },
+        ],
+        consigneeDetail: [
+          { required: true, message: "详细地址不能为空", trigger: "blur" },
+        ],
+      },
+
+      columns: [
+        {
+          title: "商品",
+          key: "goodsName",
+          minWidth: 200,
+          slot: "goodsSlot",
+        },
+        {
+          title: "优惠",
+          key: "num",
+          minWidth: 100,
+          render: (h, params) => {
+            let resultText = "";
+            if (params.row.promotionType) {
+              let type = params.row.promotionType.split(",");
+              if (type.indexOf("PINTUAN") != -1) {
+                resultText += "拼团 ";
+              }
+              if (type.indexOf("SECKILL") != -1) {
+                resultText += "秒杀 ";
+              }
+              if (type.indexOf("COUPON") != -1) {
+                resultText += "优惠券 ";
+              }
+              if (type.indexOf("FULL_DISCOUNT") != -1) {
+                resultText += "满减 ";
+              }
+              if (type.indexOf("POINTS_GOODS") != -1) {
+                resultText += "积分商品 ";
+              }
+            }
+            if (resultText === "") {
+              resultText = "暂无未参与任何促销";
+            }
+            return h("div", resultText);
+          },
+        },
+        {
+          title: "单价",
+          key: "goodsPrice",
+          minWidth: 100,
+          render: (h, params) => {
+            if (!params.row.goodsPrice) {
+              return h("div", this.$options.filters.unitPrice(0, "￥"));
+            }
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.goodsPrice, "￥")
+            );
+          },
+        },
+
+        {
+          title: "数量",
+          key: "num",
+          minWidth: 80,
+        },
+        {
+          title: "小计",
+          key: "flowPrice",
+          minWidth: 100,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+      ],
+      data: [], // 表单数据
+      orderLogColumns: [
+        {
+          title: "操作者",
+          key: "operatorName",
+          minWidth: 120,
+        },
+        {
+          title: "操作类型",
+          key: "operatorType",
+          minWidth: 100,
+        },
+        {
+          title: "时间",
+          key: "createTime",
+          width: 180
+        },
+        {
+          title: "日志",
+          key: "message",
+          tooltip: true,
+          minWidth: 200,
+
+        },
+      ],
+    };
+  },
+  watch: {
+    $route(to, from) {
+      this.$router.go(0);
+    },
+  },
+  methods: {
+    //修改地址
+    regionClick() {
+      this.showRegion = true;
+      this.regionId = "";
+    },
+    getDataList() {
+      this.loading = true;
+      API_Order.orderDetail(this.sn).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.orderInfo = res.result;
+          this.allowOperation = res.result.allowOperationVO;
+          this.data = res.result.orderItems;
+        }
+      });
+    },
+    modifyPrice() {
+      //默认要修改的金额为订单总金额
+      this.modifyPriceForm.price = this.orderInfo.order.flowPrice;
+      this.modal = true;
+    },
+    //修改订单金额提交
+    modifyPriceSubmit() {
+      this.$refs.modifyPriceForm.validate((valid) => {
+        if (valid) {
+          API_Order.updateOrderPrice(this.sn, this.modifyPriceForm).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("修改订单金额成功");
+                this.modal = false;
+                this.getDataList();
+              }
+            }
+          );
+        }
+      });
+    },
+    // 选中的地址
+    selectedRegion(val) {
+      this.region = val[1];
+      this.regionId = val[0];
+    },
+    //订单取消
+    orderCancel() {
+      this.orderCancelModal = true;
+    },
+    //订单取消提交
+    orderCancelSubmit() {
+      this.$refs.orderCancelForm.validate((valid) => {
+        if (valid) {
+          API_Order.orderCancel(this.sn, this.orderCancelForm).then((res) => {
+            if (res.success) {
+              this.$Message.success("取消成功");
+              this.getDataList();
+            }
+            this.orderCancelModal = false;
+          });
+        }
+      });
+    },
+    //订单日志
+    orderLog() {
+      this.orderLogModal = true;
+    },
+    //订单日志取消
+    handelCancel() {
+      this.orderLogModal = false;
+    },
+    //弹出修改收货地址框
+    editAddress() {
+      this.addressModal = true;
+      this.showRegion = false;
+      this.region = this.orderInfo.order.consigneeAddressPath;
+      this.regionId = this.orderInfo.order.consigneeAddressIdPath;
+      this.addressForm.consigneeName = this.orderInfo.order.consigneeName;
+      this.addressForm.consigneeMobile = this.orderInfo.order.consigneeMobile;
+      this.addressForm.consigneeDetail = this.orderInfo.order.consigneeDetail;
+      this.addressForm.consigneeAddressPath = this.orderInfo.order.consigneeAddressPath;
+      this.addressForm.consigneeAddressIdPath = this.orderInfo.order.consigneeAddressIdPath;
+    },
+    //修改收货地址
+    editAddressSubmit() {
+      if (this.regionId == "") {
+        this.$Message.error("请选择地址");
+        return;
+      }
+      this.addressForm.consigneeAddressPath = this.region;
+      this.addressForm.consigneeAddressIdPath = this.regionId;
+      this.$refs.addressForm.validate((valid) => {
+        if (valid) {
+          API_Order.editOrderConsignee(this.sn, this.addressForm).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("收货地址修改成功");
+                this.addressModal = false;
+                this.getDataList();
+              }
+            }
+          );
+        }
+      });
+    },
+  },
+  mounted() {
+    this.sn = this.$route.query.sn;
+    this.getDataList();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.order-log-div {
+  line-height: 30px;
+  height: 500px;
+  overflow-y: scroll;
+}
+
+.flex-card {
+  display: flex;
+  height: 600px;
+}
+
+.card-item {
+  margin: 5px 0;
+}
+
+.flex-card-left {
+  flex: 4;
+  //background: #f8f8f8;
+}
+
+.flex-card-right {
+  flex: 6;
+}
+
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+
+  .select-clear {
+    margin-left: 10px;
+  }
+
+  .div-item {
+    line-height: 35px;
+    display: flex;
+
+    > .div-item-left {
+      width: 80px;
+    }
+
+    > .div-item-right {
+      flex: 1;
+      word-break: break-all;
+    }
+  }
+
+  .div-status-right {
+    margin-top: 20px;
+    margin-left: 30px;
+    font-size: 20px;
+  }
+
+  .page {
+    margin-top: 2vh;
+  }
+
+  button {
+    margin-left: 5px;
+  }
+
+  .goods-total {
+    padding: 20px;
+    height: 150px;
+    width: 100%;
+    ul {
+      margin-right: 10px;
+      display: block;
+      float: right;
+      list-style-type: none;
+      li {
+        text-align: -webkit-match-parent;
+      }
+    }
+    .label {
+      float: left;
+      width: 500px;
+      text-align: right;
+    }
+    .txt {
+      float: left;
+      width: 130px;
+      text-align: right;
+      font-family: verdana;
+    }
+    .flowPrice {
+      color: #cc0000;
+      font-size: 22px;
+    }
+  }
+}
+</style>
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
new file mode 100644
index 00000000..20b8644e
--- /dev/null
+++ b/manager/src/views/order/order/orderList.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="订单号" prop="orderSn">
+              <Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单号" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="会员名称" prop="buyerName">
+              <Input type="text" v-model="searchForm.buyerName" placeholder="请输入会员名称" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="订单状态" prop="orderStatus">
+              <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+                <Option value="UNPAID">未付款</Option>
+                <Option value="PAID">已付款</Option>
+                <Option value="UNDELIVERED">待发货</Option>
+                <Option value="DELIVERED">已发货</Option>
+                <Option value="COMPLETED">已完成</Option>
+                <Option value="TAKE">待核验</Option>
+                <Option value="CANCELLED">已取消</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="下单时间">
+              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+
+export default {
+  name: "orderList",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      drop: false,
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+        orderType: "",
+        orderSn: "",
+        buyerName: "",
+        orderStatus: "",
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "订单号",
+          key: "sn",
+          minWidth: 230,
+          tooltip: true,
+        },
+        {
+          title: "下单时间",
+          key: "createTime",
+          width: 200,
+        },
+        {
+          title: "订单来源",
+          key: "clientType",
+          width: 95,
+        },
+        {
+          title: "买家名称",
+          key: "memberName",
+          width: 130,
+        },
+        {
+          title: "订单金额",
+          key: "flowPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          width: 95,
+          render: (h, params) => {
+            if (params.row.orderStatus == "UNPAID") {
+              return h("div", [h("span", {}, "未付款")]);
+            } else if (params.row.orderStatus == "PAID") {
+              return h("div", [h("span", {}, "已付款")]);
+            } else if (params.row.orderStatus == "UNDELIVERED") {
+              return h("div", [h("span", {}, "待发货")]);
+            } else if (params.row.orderStatus == "DELIVERED") {
+              return h("div", [h("span", {}, "已发货")]);
+            } else if (params.row.orderStatus == "COMPLETED") {
+              return h("div", [h("span", {}, "已完成")]);
+            } else if (params.row.orderStatus == "TAKE") {
+              return h("div", [h("span", {}, "待核验")]);
+            } else if (params.row.orderStatus == "CANCELLED") {
+              return h("div", [h("span", {}, "已取消")]);
+            }
+          },
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 180,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  attrs: {
+                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.confirmPrice(params.row);
+                    },
+                  },
+                },
+                "收款"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      API_Order.getOrderList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //确认收款
+    confirmPrice(v) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
+        onOk: () => {
+          API_Order.orderPay(v.sn).then((res) => {
+            if (res.code === 200) {
+              this.$Message.success("收款成功");
+              this.getDataList();
+            } else {
+              this.$Message.error(res.message);
+            }
+          });
+        },
+      });
+    },
+
+    detail(v) {
+      let sn = v.sn;
+      this.$router.push({
+        name: "order-detail",
+        query: { sn: sn },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue
new file mode 100644
index 00000000..9f5e366e
--- /dev/null
+++ b/manager/src/views/order/receipt/receipt.vue
@@ -0,0 +1,327 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入订单编号"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="店铺名称" prop="storeName">
+                <Input
+                  type="text"
+                  v-model="searchForm.storeName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="发票抬头" prop="receiptTitle">
+                <Input
+                  type="text"
+                  v-model="searchForm.receiptTitle"
+                  clearable
+                  placeholder="请输入发票抬头"
+                  style="width: 200px"
+                />
+              </Form-item>
+
+              <Form-item label="状态" prop="receiptStatus">
+                <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="0">未开票</Option>
+                  <Option value="1">已开票</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+              <!-- 订单详情格式化 -->
+              <template slot="orderSlot" slot-scope="scope">
+                <a
+                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+  import { getShopListData } from "@/api/shops.js";
+  export default {
+    name: "receipt",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        drop: false,
+        dropDownIcon: "ios-arrow-down",
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          receiptStatus: "", // 起始时间
+        },
+        shopsData: [],
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        params: {
+          pageNumber: 1,
+          pageSize: 1,
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "订单号",
+            key: "orderSn",
+            minWidth: 120,
+            slot: "orderSlot",
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 90,
+            tooltip: true
+          },
+
+          {
+            title: "发票抬头",
+            key: "receiptTitle",
+            minWidth: 90,
+            tooltip: true
+          },
+          {
+            title: "纳税人识别号",
+            key: "taxpayerId",
+            minWidth: 100,
+            tooltip: true
+
+          },
+          {
+            title: "发票内容",
+            key: "receiptContent",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "发票金额",
+            key: "billPrice",
+            width: 90,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "发票状态",
+            key: "receiptStatus",
+            width: 90,
+            tooltip: true,
+            render: (h, params) => {
+              if(params.row.receiptStatus == 0){
+                return h(
+                  "div",
+                  "未开票"
+                );
+              }else{
+                return h(
+                  "div",
+                  "已开票"
+                );
+              }
+
+            },
+          },
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            width: 90,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', { }, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', { }, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', { }, '待发货'),]);
+              }else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', { }, '已发货'),]);
+              }else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', { }, '待核验'),]);
+              }else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', { }, '已取消'),]);
+              }
+            }
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getData();
+        this.getShopList();
+      },
+      handleReachBottom() {
+        setTimeout(() => {
+          if (this.params.pageNumber * this.params.pageSize <= this.total) {
+            this.params.pageNumber++;
+            this.getShopList();
+          }
+        }, 1500);
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getData();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getData();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getData();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getShopList() {
+        getShopListData(this.params).then((res) => {
+          if (res.success) {
+            /**
+             * 解决数据请求中，滚动栏会一直上下跳动
+             */
+            this.shopTotal = res.result.total;
+            this.shopsData.push(...res.result.records);
+          }
+        });
+      },
+      getData() {
+        this.loading = true;
+        API_Order.getReceiptPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //开发票
+      invoicing(params){
+        this.$Modal.confirm({
+          title: "确认开票",
+          content: "您确认已经开具发票 ?",
+          loading: true,
+          onOk: () => {
+            API_Order.invoicing(params.id).then((res) => {
+              if (res.success) {
+                this.$Message.success("开票成功");
+              }
+              this.$Modal.remove();
+              this.getData();
+            });
+
+
+          }
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+   @import "../../../styles/table-common.scss";
+</style>
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
new file mode 100644
index 00000000..f335d8de
--- /dev/null
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -0,0 +1,315 @@
+<template>
+    <div>
+        <div class="operation">
+            <Button @click="addParent" icon="md-add">添加一级分类</Button>
+        </div>
+        <tree-table
+                ref="treeTable"
+                size="default"
+                :loading="loading"
+                :data="tableData"
+                :columns="columns"
+                :border="true"
+                :show-index="false"
+                :is-fold="true"
+                :expand-type="false"
+                primary-key="id">
+            <template slot="action" slot-scope="scope">
+                <Button
+                        type="primary"
+                        @click="edit(scope.row)"
+                        size="small"
+                        icon="md-add"
+                        style="margin-right:5px"
+                >编辑
+                </Button>
+
+                <Button
+                        type="error"
+                        @click="remove(scope.row)"
+                        size="small"
+                        icon="md-add"
+                        style="margin-right:5px"
+                >删除
+                </Button>
+                &nbsp;
+                <Button
+                        v-show="scope.row.level != 2 "
+                        type="primary"
+                        @click="addChildren(scope.row)"
+                        size="small"
+                        icon="md-add"
+                        style="margin-right:5px"
+                >添加子分类
+                </Button>
+            </template>
+        </tree-table>
+
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+            <Form ref="form" :model="formAdd" :label-width="100" :rules="formValidate">
+                <div v-if="showParent">
+                    <FormItem label="上级分类" prop="parentId">
+                        {{parentTitle}}
+                        <Input v-model="formAdd.parentId" clearable style="width:100%;display:none"/>
+                    </FormItem>
+                </div>
+                <FormItem label="分类名称" prop="name">
+                    <Input v-model="formAdd.articleCategoryName" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="排序值" prop="sort" style="width:345px">
+                    <InputNumber v-model="formAdd.sort"></InputNumber>
+                </FormItem>
+            </Form>
+            <div slot="footer">
+                <Button type="text" @click="modalVisible=false">取消</Button>
+                <Button type="primary" :loading="submitLoading" @click="Submit">提交</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+<script>
+    import {
+        saveArticleCategory,
+        getArticleCategory,
+        delArticleCategory,
+        updateArticleCategory
+    } from "@/api/pages";
+    import TreeTable from "@/views/my-components/tree-table/Table/Table";
+    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+    export default {
+        name: "lili-components",
+        components: {
+            TreeTable,
+            uploadPicInput
+        },
+        data() {
+            return {
+                currView: "index",
+                loading: false,
+                brands: [], //品牌集合
+                Specifications: [], //规格集合
+                categoryId: "",
+                expandLevel: 1,
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                showParent: false, // 是否展示上级菜单
+                parentTitle: "", // 父级菜单名称
+                modalBrandTitle: "",
+                modalSpecTitle: "",
+                formAdd: { // 添加或编辑表单对象初始化数据
+                    parentId: "",
+                    name: "",
+                    sort: 1,
+                    level: 0,
+                },
+                enabledParam: {
+                    type: 0
+                },
+                brandForm: {},
+                specForm: {},
+                // 表单验证规则
+                formValidate: {},
+                columns: [
+                    {
+                        title: "分类名称",
+                        key: "articleCategoryName",
+                        witt: "100px",
+                    },
+                    {
+                        title: "排序",
+                        key: "sort",
+                        width: "100px",
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        headerAlign: "center",
+                        width: "400px",
+                        type: "template",
+                        template: "action",
+                    }
+                ],
+                tableData: []
+            };
+        },
+        methods: {
+            init() {
+                this.getAllList();
+                // this.getBrandList();
+                // this.getSpecList()
+            },
+            addChildren(v) {
+                this.modalType = 0;
+                this.modalTitle = "添加子分类";
+                this.formAdd.articleCategoryName = "";
+                this.parentTitle = v.articleCategoryName;
+                this.formAdd.level = eval(v.level + "+1");
+                this.showParent = true;
+                delete this.formAdd.id;
+                this.formAdd.parentId = v.id;
+                this.modalVisible = true;
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.formAdd.id = v.id;
+                this.formAdd.articleCategoryName = v.articleCategoryName;
+                this.formAdd.level = v.level;
+                this.formAdd.parentId = v.parentId;
+                this.showParent = false;
+                this.modalVisible = true;
+            },
+            addParent() {
+                this.modalType = 0;
+                this.modalTitle = "添加一级分类";
+                this.parentTitle = "顶级分类";
+                this.showParent = true;
+                this.$refs.form.resetFields();
+                delete this.formAdd.id;
+                this.formAdd.parentId = 0;
+                this.modalVisible = true;
+            },
+            Submit() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+
+
+
+                        this.submitLoading = true;
+                        if (this.modalType === 0) {
+                            // 添加 避免编辑后传入id等数据 记得删除
+                            delete this.formAdd.id;
+                            saveArticleCategory(this.formAdd).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("添加成功");
+
+
+
+                                    this.formAdd={}
+                                } else {
+                                    this.$Message.error(res.message);
+                                }
+                                this.getAllList();
+                                this.modalVisible = false;
+                            });
+                        } else {
+                            // 编辑
+                            updateArticleCategory(this.formAdd, this.formAdd.id).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("修改成功");
+                                } else {
+                                    this.$Message.error(res.message);
+                                }
+                                this.getAllList();
+                                this.modalVisible = false;
+                                this.$refs.form.resetFields();
+                            });
+                        }
+                    }
+                });
+            },
+            remove(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要删除 " + v.articleCategoryName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        delArticleCategory(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getAllList();
+                            }
+                        });
+                    }
+                });
+            },
+            getAllList() {
+                this.loading = true;
+                getArticleCategory().then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        // 仅展开指定级数 默认后台已展开所有
+                        let expandLevel = this.expandLevel;
+                        res.result.forEach(function (e) {
+                            if (expandLevel == 1) {
+                                if (e.level == 0) {
+                                    e.expand = false;
+                                }
+                                if (e.children && e.children.length > 0) {
+                                    e.children.forEach(function (c) {
+                                        if (c.level == 1) {
+                                            c.expand = false;
+                                        }
+                                        if (c.children && c.children.length > 0) {
+                                            c.children.forEach(function (b) {
+                                                if (b.level == 2) {
+                                                    b.expand = false;
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            } else if (expandLevel == 2) {
+                                if (e.level == 0) {
+                                    e.expand = true;
+                                }
+                                if (e.children && e.children.length > 0) {
+                                    e.children.forEach(function (c) {
+                                        if (c.level == 1) {
+                                            c.expand = false;
+                                        }
+                                        if (c.children && c.children.length > 0) {
+                                            c.children.forEach(function (b) {
+                                                if (b.level == 2) {
+                                                    b.expand = false;
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            } else if (expandLevel == 3) {
+                                if (e.level == 0) {
+                                    e.expand = true;
+                                }
+                                if (e.children && e.children.length > 0) {
+                                    e.children.forEach(function (c) {
+                                        if (c.level == 1) {
+                                            c.expand = true;
+                                        }
+                                        if (c.children && c.children.length > 0) {
+                                            c.children.forEach(function (b) {
+                                                if (b.level == 2) {
+                                                    b.expand = false;
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            }
+                        });
+                        this.tableData = res.result;
+                    }
+                });
+            },
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss" scoped>
+    .article {
+        font-size: 16px;
+        font-weight: 400;
+        margin: 12px 0;
+    }
+
+</style>
diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue
new file mode 100644
index 00000000..886e7482
--- /dev/null
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -0,0 +1,490 @@
+<template>
+
+  <div class="wrapper">
+    <Row>
+      <Col style=" height: 100%;" span="4">
+      <Card class="article-category">
+        <Tree :data="treeData" @on-select-change="handleSearchChange"></Tree>
+      </Card>
+      </Col>
+      <Col span="20">
+      <Card class="article-detail">
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" style="width:100%;" class="search-form">
+            <Form-item label="文章标题" prop="title">
+              <Input type="text" v-model="searchForm.title" placeholder="请输入文章标题" clearable style="width: 200px" />
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="operation padding-row">
+          <Button @click="add" type="primary" style="">添加</Button>
+        </Row>
+        <Row>
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+            <!-- 页面展示 -->
+            <template slot="openStatusSlot" slot-scope="scope">
+              <div>
+
+              </div>
+              <i-switch size="large" v-model="scope.row.openStatus" @on-change="changeSwitch(scope.row)">
+                <span slot="open">展示</span>
+                <span slot="close">隐藏</span>
+              </i-switch>
+            </template>
+          </Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator>
+
+          </Page>
+        </Row>
+
+          <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+              <FormItem label="文章标题" prop="title">
+                <Input v-model="form.title" clearable style="width: 40%" />
+              </FormItem>
+              <FormItem label="文章分类" prop="categoryId">
+                <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
+                  <Option :value="treeValue" style="display: none">{{
+                        treeValue
+                      }}
+                  </Option>
+                  <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
+                </Select>
+              </FormItem>
+              <FormItem label="文章排序" prop="sort">
+                <Input type="number" v-model="form.sort" clearable style="width: 10%" />
+              </FormItem>
+              <FormItem class="form-item-view-el" label="文章内容" prop="content">
+                <editor v-model="form.content"></editor>
+              </FormItem>
+              <FormItem label="是否展示" prop="openStatus">
+                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
+                  <span slot="open">展示</span>
+                  <span slot="close">隐藏</span>
+                </i-switch>
+              </FormItem>
+            </Form>
+            <div slot="footer">
+              <Button type="text" @click="modalVisible = false">取消</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+          </Modal>
+      </Card>
+      </Col>
+
+    </Row>
+
+  </div>
+</template>
+
+<script>
+import {
+  getArticleCategory,
+  saveArticle,
+  getArticle,
+  delArticle,
+  updateArticle,
+  seeArticle,
+  updateArticleStatus,
+} from "@/api/pages";
+import editor from "@/views/my-components/lili/editor";
+
+export default {
+  name: "article",
+  components: {
+    editor,
+  },
+  props: {
+    selected: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      selectedIndex: 99999,
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        categoryId: "",
+      },
+      searchTreeValue: "",
+      form: {
+        // 添加或编辑表单对象初始化数据
+        title: "",
+        categoryId: "",
+        sort: 1,
+        content: "",
+        id: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      list: [],
+      treeValue: "",
+      //树结构
+      treeData: [],
+      model2: "",
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "分类名称",
+          key: "articleCategoryName",
+          width: 150,
+        },
+        {
+          title: "文章标题",
+          key: "title",
+          minWidth: 200,
+          tooltip: true,
+        },
+        {
+          title: "是否显示",
+          key: "openStatus",
+          width: 100,
+          slot: "openStatusSlot",
+          /*render: (h, params) => {
+            if (params.row.openStatus == "CLOSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "隐藏",
+                  },
+                }),
+              ]);
+            } else if (params.row.openStatus == "OPEN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "展示",
+                  },
+                }),
+              ]);
+            }
+          },*/
+        },
+        {
+          title: "排序",
+          key: "sort",
+          width: 100,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+
+          width: 230,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: this.selectedIndex == params.index ? "primary" : "",
+                  },
+                  style: {
+                    marginRight: "5px",
+                    display: this.selected ? "" : "none",
+                  },
+                  on: {
+                    click: () => {
+                      this.selectedIndex = params.index;
+                      this.$emit("callbacked", params.row);
+                    },
+                  },
+                },
+                this.selectedIndex == params.index ? "已选" : "选择"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "info",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  watch: {
+    "searchForm.categoryId": {
+      handler() {
+        this.handleSearch();
+      },
+      deep: true,
+    },
+    "searchForm.title": {
+      handler() {
+        this.handleSearch();
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    init() {
+      this.getDataList();
+      this.getAllList(0);
+    },
+    handleSearchChange(data) {
+      let { value, title } = data[0];
+      this.list.push({
+        value,
+        title,
+      });
+      this.searchForm.categoryId = value;
+      this.searchTreeValue = title;
+    },
+    //是否展示事件
+    changeSwitch(v) {
+      let params = {
+        status: v.openStatus,
+      };
+      updateArticleStatus(v.id, params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+        }
+      });
+    },
+    handleCheckChange(data) {
+      let value = "";
+      let title = "";
+      this.list = [];
+      this.model2 = "";
+      data.forEach((item, index) => {
+        value += `${item.value},`;
+        title += `${item.title},`;
+      });
+      value = value.substring(0, value.length - 1);
+      title = title.substring(0, title.length - 1);
+      this.list.push({
+        value,
+        title,
+      });
+      this.form.categoryId = value;
+      this.treeValue = title;
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getAllList(parent_id) {
+      this.loading = true;
+      getArticleCategory(parent_id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.treeData = this.getTree(res.result);
+          this.treeData.unshift({
+            title: "全部",
+            level: 0,
+            children: [],
+            id: "0",
+            categoryId: 0
+          });
+        }
+      });
+    },
+    getTree(tree = []) {
+      let arr = [];
+      if (!!tree && tree.length !== 0) {
+        tree.forEach((item) => {
+          let obj = {};
+          obj.title = item.articleCategoryName;
+          obj.value = item.id;
+          obj.attr = item.articleCategoryName; // 其他你想要添加的属性
+          obj.expand = false;
+          obj.selected = false;
+          obj.children = this.getTree(item.children); // 递归调用
+          arr.push(obj);
+        });
+      }
+      return arr;
+    },
+    getDataList(val) {
+      if (val) this.form = {};
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getArticle(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.total = res.result.total;
+          //为了在是否展示一列展示开关 需要改一下数据类型，最终提交再次更改
+          this.data = [];
+          if (res.result.records.length > 0) {
+            res.result.records.forEach((item) => {
+              if (item.openStatus == "OPEN") {
+                item.openStatus = true;
+              } else {
+                item.openStatus = false;
+              }
+            })
+            this.data = res.result.records;
+          }
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+
+    handleSubmit() {
+      if (this.form.openStatus) {
+        this.form.openStatus = "OPEN";
+      } else {
+        this.form.openStatus = "CLOSE";
+      }
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            saveArticle(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            updateArticle(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加文章";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    edit(data) {
+      this.modalType = 1;
+      this.modalTitle = "编辑文章";
+      this.$refs.form.resetFields();
+
+      seeArticle(data.id).then((res) => {
+        if (res.result) {
+          this.modalVisible = true;
+          this.form.categoryId = res.result.categoryId;
+          this.treeValue = data.articleCategoryName;
+          this.form.id = data.id;
+          this.form.content = res.result.content;
+          this.form.title = res.result.title;
+          this.form.sort = res.result.sort;
+          if (res.result.openStatus == "OPEN") {
+            this.form.openStatus = true;
+          } else {
+            this.form.openStatus = false;
+          }
+        }
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delArticle(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/page/feedback/feedback.vue b/manager/src/views/page/feedback/feedback.vue
new file mode 100644
index 00000000..b37849f6
--- /dev/null
+++ b/manager/src/views/page/feedback/feedback.vue
@@ -0,0 +1,244 @@
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="pageNumber"
+          :total="total"
+          :page-size="pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <!-- 修改模态框 -->
+    <Modal v-model="formValidate" :title="modalTitle" @on-ok="" width="500">
+      <Form
+        ref="formValidate"
+        :model="form"
+        :label-width="80"
+      >
+        <FormItem label="用户名" prop="userName">
+          <span> {{form.userName}}</span>
+        </FormItem>
+        <FormItem label="手机号码" prop="mobile">
+          <span> {{form.mobile}}</span>
+        </FormItem>
+        <FormItem label="类型" prop="type">
+          <span v-if="form.type == 'FUNCTION'">功能建议</span>
+          <span v-if="form.type == 'OPTIMIZE'">优化反馈</span>
+          <span v-if="form.type == 'OTHER'">其他意见</span>
+        </FormItem>
+        <FormItem label="反馈内容" prop="context">
+          <Input style="width: 85%" v-model="form.context" type="textarea" disabled :autosize="{minRows: 3,maxRows: 5}"
+          ></Input>
+        </FormItem>
+        <FormItem label="相关材料" prop="images">
+          <div v-if="form.images == null">
+            暂无
+          </div>
+          <div v-else>
+            <span v-for="(item, index) in this.form.images.split(',')">
+              <Avatar shape="square" icon="ios-person" size="large" style="width: 80px;height: 90px;margin-right: 5px" :src="item"
+              />
+            </span>
+          </div>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="formValidate = false">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getMemberFeedback,
+    getMemberFeedbackDetail
+  } from "@/api/other";
+
+  export default {
+    name: "role-manage",
+    data() {
+      return {
+        loading: true,
+        modalType: 0, // 0 添加 1 编辑
+        form: {},
+        searchForm: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        modalTitle: "详细",
+        formValidate: false,
+        roleForm: {
+          name: "",
+          description: "",
+        },
+        images: [],
+        columns: [
+          {
+            type: "selection",
+            width: 60,
+            align: "center",
+          },
+          {
+            title: "会员名称",
+            key: "userName",
+            minWidth: 120,
+            tooltip: true
+
+          },
+          {
+            title: "手机号码",
+            key: "mobile",
+            minWidth: 120,
+            tooltip: true
+
+          },
+          {
+            title: "反馈内容",
+            key: "context",
+            minWidth: 380,
+            tooltip: true
+          },
+          {
+            title: "类型",
+            key: "type",
+            minWidth: 120,
+            render: (h, params) => {
+              if (params.row.type == "FUNCTION") {
+                return h('div', [h('span', {}, "功能建议")]);
+              } else if (params.row.type == "OPTIMIZE") {
+                return h('div', [h('span', {}, "优化反馈")]);
+              } else if (params.row.type == "OTHER") {
+                return h('div', [h('span', {}, "其他意见")]);
+              } else {
+                return h('div', [h('span', {}, "未知意见")]);
+              }
+            }
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            width: 170,
+            sortable: true,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 130,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                      type: "info"
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                )
+              ]);
+            },
+          },
+        ],
+        data: [],
+        pageNumber: 1,
+        pageSize: 10,
+        total: 0,
+        permData: [],
+        editRolePermId: "",
+        selectAllFlag: false,
+        depData: [],
+        dataType: 0,
+        editDepartments: [],
+
+        saveRoleWay: [], //用户保存用户点击的菜单
+      };
+    },
+    methods: {
+      init() {
+        this.getFeedback();
+      },
+
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getFeedback();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getFeedback();
+      },
+      changeSort(e) {
+        this.sortColumn = e.key;
+        this.sortType = e.order;
+        if (e.order == "normal") {
+          this.sortType = "";
+        }
+        this.getFeedback();
+      },
+
+      /**
+       * 查询意见反馈
+       */
+      getFeedback() {
+        this.loading = true;
+        getMemberFeedback(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+      /**
+       * 投诉建议详细
+       */
+      detail(v) {
+        getMemberFeedbackDetail(v.id).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$set(this, "form", res.result);
+            this.formValidate = true
+          }
+        });
+
+      }
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
diff --git a/manager/src/views/page/focus/mobileFocus.vue b/manager/src/views/page/focus/mobileFocus.vue
new file mode 100644
index 00000000..7b6d3c5d
--- /dev/null
+++ b/manager/src/views/page/focus/mobileFocus.vue
@@ -0,0 +1,477 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row class="operation">
+                        <Button @click="add" type="primary" icon="md-add">添加</Button>
+                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+                    </Row>
+                    <Row v-show="openTip">
+                        <Alert show-icon>
+                            已选择 <span class="select-count">{{selectCount}}</span> 项
+                            <a class="select-clear" @click="clearSelectAll">清空</a>
+                        </Alert>
+                    </Row>
+                    <Row>
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >        <FormItem label="名称" prop="name" >
+                <Input v-model="form.name" clearable style="width:100%"/>
+            </FormItem>
+                <FormItem label="图片" prop="url">
+                    <upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input>
+                </FormItem>
+                <FormItem label="操作类型" prop="operationType" >
+                    <Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px">
+                        <Option value="NONE">无操作</Option>
+                        <Option value="URL">链接地址</Option>
+                        <Option value="GOODS">商品序号</Option>
+                        <Option value="SHOP">店铺编号</Option>
+                        <Option value="KEYWORD">关键字</Option>
+                        <Option value="CATEGORY">商品分类</Option>
+                    </Select>
+                </FormItem>
+                <FormItem label="链接值" prop="sort" >
+                    <Input v-model="form.operationUrl" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="排序" prop="sort" >
+                    <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
+                </FormItem>
+            </Form>
+            <div slot="footer">
+                <Button type="text" @click="modalVisible=false">取消</Button>
+                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import {
+        getFocusData,
+        saveFocusData,
+        disableFocus,
+        enableFocus,
+        delFocus
+    } from "@/api/pages";
+    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+    export default {
+        name: "mobileFocus",
+        components: {
+            uploadPicInput
+        },
+        data() {
+            return {
+                openTip: true, // 显示提示
+                loading: true, // 表单加载状态
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                searchForm: { // 搜索框初始化对象
+                    clientType: "MOBILE", //客户端类型
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                },
+                form: { // 添加或编辑表单对象初始化数据
+                    name: "",
+                    operationType: "",
+                    operationUrl: "",
+                    url: "",
+                    sort: 0,
+                },
+                // 表单验证规则
+                formValidate: {
+                    name: [{ required: true, message: "不能为空", trigger: "blur" }],
+                },
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    // 表头
+                    {
+                        type: "selection",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        title: "名称",
+                        key: "name",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "状态",
+                        key: "status",
+                        minWidth: 100,
+                        sortable: false,
+                        render: (h, params) => {
+                            if (params.row.status == 'CLOSE') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "error",
+                                            text: "禁用"
+                                        }
+                                    })
+                                ]);
+                            } else if (params.row.status == 'OPEN') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "启用"
+                                        }
+                                    })
+                                ]);
+                            }
+                        }
+                    },
+                    {
+                        title: "图片",
+                        key: "url",
+                        minWidth: 120,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h("img", {
+                                attrs: {
+                                    src: params.row.url,
+                                    alt: "加载图片失败"
+                                },
+                                style: {
+                                    cursor: "pointer",
+                                    width: "80px",
+                                    height: "60px",
+                                    margin: "10px 0",
+                                    "object-fit": "contain"
+                                }
+                            });
+                        }
+                    },
+                    {
+                        title: "排序",
+                        key: "sort",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        width: 200,
+                        render: (h, params) => {
+                            let enableOrDisable = "";
+                            if (params.row.status == "CLOSE") {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.enable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "启用"
+                                );
+                            } else {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.disable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "禁用"
+                                );
+                            }
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "primary",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.edit(params.row);
+                                            }
+                                        }
+                                    },
+                                    "编辑"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.remove(params.row);
+                                            }
+                                        }
+                                    },
+                                    "删除"
+                                ),
+                                enableOrDisable,
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            getDataList() {
+                this.loading = true;
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getFocusData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                // 以下为模拟数据
+                //this.data = [
+                //];
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            enable(v){
+                this.$Modal.confirm({
+                    title: "确认启用",
+                    // 记得确认修改此处
+                    content: "您确认要确认启用 " + v.name + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        enableFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disable(v) {
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    // 记得确认修改此处
+                    content: "您确认要禁用 " + v.name + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        disableFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            handleSubmit() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.form.ClientType = "MOBILE"
+                        this.submitLoading = true;
+                        if (this.modalType === 0) {
+                            this.form.status = "OPEN"
+                            // 添加 避免编辑后传入id等数据 记得删除
+                            delete this.form.id;
+                            saveFocusData(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        } else {
+                            // 编辑
+                            saveFocusData(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+            add() {
+                this.modalType = 0;
+                this.modalTitle = "添加";
+                this.$refs.form.resetFields();
+                delete this.form.id;
+                this.modalVisible = true;
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.$refs.form.resetFields();
+                // 转换null为""
+                for (let attr in v) {
+                    if (v[attr] === null) {
+                        v[attr] = "";
+                    }
+                }
+                let str = JSON.stringify(v);
+                let data = JSON.parse(str);
+                this.form = data;
+                this.modalVisible = true;
+            },
+            remove(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要删除么?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        delFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disableAll() {
+                if (this.selectCount <= 0) {
+                    this.$Message.warning("您还未选择要禁用的数据");
+                    return;
+                }
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+                    loading: true,
+                    onOk: () => {
+                        let ids = "";
+                        this.selectList.forEach(function(e) {
+                            ids += e.id + ",";
+                        });
+                        ids = ids.substring(0, ids.length - 1);
+                        // 批量删除
+                        disableFocus(ids).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("禁用成功");
+                                this.clearSelectAll();
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+    // 建议引入通用样式 可删除下面样式代码
+    // @import "@/styles/table-common.scss";
+    .search {
+        .operation {
+            margin-bottom: 2vh;
+        }
+        .select-count {
+            font-weight: 600;
+            color: #40a9ff;
+        }
+        .select-clear {
+            margin-left: 10px;
+        }
+        .page {
+            margin-top: 2vh;
+        }
+        .drop-down {
+            margin-left: 5px;
+        }
+    }
+</style>
diff --git a/manager/src/views/page/focus/pcFocus.vue b/manager/src/views/page/focus/pcFocus.vue
new file mode 100644
index 00000000..8e4b495a
--- /dev/null
+++ b/manager/src/views/page/focus/pcFocus.vue
@@ -0,0 +1,477 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row class="operation">
+                        <Button @click="add" type="primary" icon="md-add">添加</Button>
+                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+                    </Row>
+                    <Row v-show="openTip">
+                        <Alert show-icon>
+                            已选择 <span class="select-count">{{selectCount}}</span> 项
+                            <a class="select-clear" @click="clearSelectAll">清空</a>
+                        </Alert>
+                    </Row>
+                    <Row>
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate" >        <FormItem label="名称" prop="name" >
+                <Input v-model="form.name" clearable style="width:100%"/>
+            </FormItem>
+                <FormItem label="图片" prop="url">
+                    <upload-pic-input v-model="form.url" style="width:100%"></upload-pic-input>
+                </FormItem>
+                <FormItem label="操作类型" prop="operationType" >
+                    <Select v-model="form.operationType" placeholder="请选择" clearable style="width: 200px">
+                        <Option value="NONE">无操作</Option>
+                        <Option value="URL">链接地址</Option>
+                        <Option value="GOODS">商品序号</Option>
+                        <Option value="SHOP">店铺编号</Option>
+                        <Option value="KEYWORD">关键字</Option>
+                        <Option value="CATEGORY">商品分类</Option>
+                    </Select>
+                </FormItem>
+                <FormItem label="链接值" prop="sort" >
+                    <Input v-model="form.operationUrl" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="排序" prop="sort" >
+                    <InputNumber :max="999" :min="0" v-model="form.sort"></InputNumber>
+                </FormItem>
+            </Form>
+            <div slot="footer">
+                <Button type="text" @click="modalVisible=false">取消</Button>
+                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import {
+        getFocusData,
+        saveFocusData,
+        disableFocus,
+        enableFocus,
+        delFocus
+    } from "@/api/pages";
+    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+    export default {
+        name: "pcFocus",
+        components: {
+            uploadPicInput
+        },
+        data() {
+            return {
+                openTip: true, // 显示提示
+                loading: true, // 表单加载状态
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                searchForm: { // 搜索框初始化对象
+                    clientType: "PC", //客户端类型
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                },
+                form: { // 添加或编辑表单对象初始化数据
+                    name: "",
+                    operationType: "",
+                    operationUrl: "",
+                    url: "",
+                    sort: 0,
+                },
+                // 表单验证规则
+                formValidate: {
+                    name: [{ required: true, message: "不能为空", trigger: "blur" }],
+                },
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    // 表头
+                    {
+                        type: "selection",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        title: "名称",
+                        key: "name",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "状态",
+                        key: "status",
+                        minWidth: 100,
+                        sortable: false,
+                        render: (h, params) => {
+                            if (params.row.status == 'CLOSE') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "error",
+                                            text: "禁用"
+                                        }
+                                    })
+                                ]);
+                            } else if (params.row.status == 'OPEN') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "启用"
+                                        }
+                                    })
+                                ]);
+                            }
+                        }
+                    },
+                    {
+                        title: "图片",
+                        key: "url",
+                        minWidth: 120,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h("img", {
+                                attrs: {
+                                    src: params.row.url,
+                                    alt: "加载图片失败"
+                                },
+                                style: {
+                                    cursor: "pointer",
+                                    width: "80px",
+                                    height: "60px",
+                                    margin: "10px 0",
+                                    "object-fit": "contain"
+                                }
+                            });
+                        }
+                    },
+                    {
+                        title: "排序",
+                        key: "sort",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        width: 200,
+                        render: (h, params) => {
+                            let enableOrDisable = "";
+                            if (params.row.status == "CLOSE") {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.enable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "启用"
+                                );
+                            } else {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.disable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "禁用"
+                                );
+                            }
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "primary",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.edit(params.row);
+                                            }
+                                        }
+                                    },
+                                    "编辑"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.remove(params.row);
+                                            }
+                                        }
+                                    },
+                                    "删除"
+                                ),
+                                enableOrDisable,
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            getDataList() {
+                this.loading = true;
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getFocusData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                // 以下为模拟数据
+                //this.data = [
+                //];
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            enable(v){
+                this.$Modal.confirm({
+                    title: "确认启用",
+                    // 记得确认修改此处
+                    content: "您确认要确认启用 " + v.name + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        enableFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disable(v) {
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    // 记得确认修改此处
+                    content: "您确认要禁用 " + v.name + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        disableFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            handleSubmit() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.form.ClientType = "PC"
+                        this.submitLoading = true;
+                        if (this.modalType === 0) {
+                            this.form.status = "OPEN"
+                            // 添加 避免编辑后传入id等数据 记得删除
+                            delete this.form.id;
+                            saveFocusData(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        } else {
+                            // 编辑
+                            saveFocusData(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+            add() {
+                this.modalType = 0;
+                this.modalTitle = "添加";
+                this.$refs.form.resetFields();
+                delete this.form.id;
+                this.modalVisible = true;
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.$refs.form.resetFields();
+                // 转换null为""
+                for (let attr in v) {
+                    if (v[attr] === null) {
+                        v[attr] = "";
+                    }
+                }
+                let str = JSON.stringify(v);
+                let data = JSON.parse(str);
+                this.form = data;
+                this.modalVisible = true;
+            },
+            remove(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要删除么?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        delFocus(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disableAll() {
+                if (this.selectCount <= 0) {
+                    this.$Message.warning("您还未选择要禁用的数据");
+                    return;
+                }
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+                    loading: true,
+                    onOk: () => {
+                        let ids = "";
+                        this.selectList.forEach(function(e) {
+                            ids += e.id + ",";
+                        });
+                        ids = ids.substring(0, ids.length - 1);
+                        // 批量删除
+                        disableFocus(ids).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("禁用成功");
+                                this.clearSelectAll();
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+    // 建议引入通用样式 可删除下面样式代码
+    // @import "@/styles/table-common.scss";
+    .search {
+        .operation {
+            margin-bottom: 2vh;
+        }
+        .select-count {
+            font-weight: 600;
+            color: #40a9ff;
+        }
+        .select-clear {
+            margin-left: 10px;
+        }
+        .page {
+            margin-top: 2vh;
+        }
+        .drop-down {
+            margin-left: 5px;
+        }
+    }
+</style>
diff --git a/manager/src/views/page/navigation/mobileNavigation.vue b/manager/src/views/page/navigation/mobileNavigation.vue
new file mode 100644
index 00000000..a2ef3dd9
--- /dev/null
+++ b/manager/src/views/page/navigation/mobileNavigation.vue
@@ -0,0 +1,467 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row class="operation">
+                        <Button @click="add" type="primary" icon="md-add">添加</Button>
+                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+                    </Row>
+                    <Row v-show="openTip">
+                        <Alert show-icon>
+                            已选择 <span class="select-count">{{selectCount}}</span> 项
+                            <a class="select-clear" @click="clearSelectAll">清空</a>
+                        </Alert>
+                    </Row>
+                    <Row>
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
+                              size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+                <FormItem label="导航栏名称" prop="navigationName">
+                    <Input v-model="form.navigationName" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="导航栏链接" prop="url">
+                    <Input v-model="form.url" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="品牌图标" prop="image">
+                    <upload-pic-input v-model="form.image" style="width:100%"></upload-pic-input>
+                </FormItem>
+            </Form>
+            <div slot="footer">
+                <Button type="text" @click="modalVisible=false">取消</Button>
+                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import {
+        save,
+        getNavigationData,
+        disableNavigation,
+        enableNavigation,
+        delNavigation,
+        update
+    } from "@/api/pages";
+    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+    export default {
+        name: "mobileNavigation",
+        components: {
+            uploadPicInput
+        },
+        data() {
+            return {
+                openTip: true, // 显示提示
+                loading: true, // 表单加载状态
+                type: "MOBILE",
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                searchForm: { // 搜索框初始化对象
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                },
+                form: { // 添加或编辑表单对象初始化数据
+                    navigationName: "",
+                    image: "",
+                    url: "",
+                },
+                // 表单验证规则
+                formValidate: {
+                    url: [{required: true, message: "导航栏url不能为空", trigger: "blur"}],
+                    navigationName: [{required: true, message: "导航栏不能为空", trigger: "blur"}],
+                },
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    // 表头
+                    {
+                        type: "selection",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        title: "导航名称",
+                        key: "navigationName",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "状态",
+                        key: "status",
+                        minWidth: 100,
+                        sortable: false,
+                        render: (h, params) => {
+                            if (params.row.status == 'CLOSE') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "error",
+                                            text: "禁用"
+                                        }
+                                    })
+                                ]);
+                            } else if (params.row.status == 'OPEN') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "启用"
+                                        }
+                                    })
+                                ]);
+                            }
+                        }
+                    },
+                    {
+                        title: "图片",
+                        key: "image",
+                        minWidth: 120,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h("img", {
+                                attrs: {
+                                    src: params.row.image,
+                                    alt: "加载图片失败"
+                                },
+                                style: {
+                                    cursor: "pointer",
+                                    width: "80px",
+                                    height: "60px",
+                                    margin: "10px 0",
+                                    "object-fit": "contain"
+                                }
+                            });
+                        }
+                    },
+                    {
+                        title: "排序",
+                        key: "sort",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        width: 250,
+                        render: (h, params) => {
+                            console.warn(params.status)
+                            let enableOrDisable = "";
+                            if (params.row.status == "CLOSE") {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.enable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "启用"
+                                );
+                            } else {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.disable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "禁用"
+                                );
+                            }
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "primary",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.edit(params.row);
+                                            }
+                                        }
+                                    },
+                                    "编辑"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.del(params.row);
+                                            }
+                                        }
+                                    },
+                                    "删除"
+                                ),
+                                enableOrDisable,
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            getDataList() {
+                this.searchForm.clientType = this.type
+                this.loading = true;
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getNavigationData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            handleSubmit() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.submitLoading = true;
+                        this.form.clientType = this.type
+                        if (this.modalType === 0) {
+                            // 添加 避免编辑后传入id等数据 记得删除
+                            delete this.form.id;
+                            save(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        } else {
+                            // 编辑
+                            update(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+            add() {
+                this.modalType = 0;
+                this.modalTitle = "添加";
+                this.$refs.form.resetFields();
+                delete this.form.id;
+                this.modalVisible = true;
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.$refs.form.resetFields();
+                // 转换null为""
+                for (let attr in v) {
+                    if (v[attr] === null) {
+                        v[attr] = "";
+                    }
+                }
+                let str = JSON.stringify(v);
+                let data = JSON.parse(str);
+                this.form = data;
+                this.modalVisible = true;
+            },
+            enable(v){
+                this.$Modal.confirm({
+                    title: "确认启用",
+                    // 记得确认修改此处
+                    content: "您确认要确认启用 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        enableNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disable(v) {
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    // 记得确认修改此处
+                    content: "您确认要禁用 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        disableNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disableAll() {
+                if (this.selectCount <= 0) {
+                    this.$Message.warning("您还未选择要禁用的数据");
+                    return;
+                }
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+                    loading: true,
+                    onOk: () => {
+                        let ids = "";
+                        this.selectList.forEach(function (e) {
+                            ids += e.id + ",";
+                        });
+                        ids = ids.substring(0, ids.length - 1);
+                        // 批量禁用
+                        disableNavigation(ids).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.clearSelectAll();
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            del(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要永久性删除 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        delNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+    // 建议引入通用样式 可删除下面样式代码
+    // @import "@/styles/table-common.scss";
+    .search {
+        .operation {
+            margin-bottom: 2vh;
+        }
+        .select-count {
+            font-weight: 600;
+            color: #40a9ff;
+        }
+        .select-clear {
+            margin-left: 10px;
+        }
+        .page {
+            margin-top: 2vh;
+        }
+        .drop-down {
+            margin-left: 5px;
+        }
+    }
+</style>
diff --git a/manager/src/views/page/navigation/pcNavigation.vue b/manager/src/views/page/navigation/pcNavigation.vue
new file mode 100644
index 00000000..ca9c7212
--- /dev/null
+++ b/manager/src/views/page/navigation/pcNavigation.vue
@@ -0,0 +1,467 @@
+<template>
+    <div class="search">
+        <Row>
+            <Col>
+                <Card>
+                    <Row class="operation">
+                        <Button @click="add" type="primary" icon="md-add">添加</Button>
+                        <Button @click="disableAll" icon="md-trash">批量禁用</Button>
+                        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+                        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+                    </Row>
+                    <Row v-show="openTip">
+                        <Alert show-icon>
+                            已选择 <span class="select-count">{{selectCount}}</span> 项
+                            <a class="select-clear" @click="clearSelectAll">清空</a>
+                        </Alert>
+                    </Row>
+                    <Row>
+                        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                               @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+                    </Row>
+                    <Row type="flex" justify="end" class="page">
+                        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                              @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
+                              size="small" show-total show-elevator show-sizer></Page>
+                    </Row>
+                </Card>
+            </Col>
+        </Row>
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+                <FormItem label="导航栏名称" prop="navigationName">
+                    <Input v-model="form.navigationName" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="导航栏链接" prop="url">
+                    <Input v-model="form.url" clearable style="width:100%"/>
+                </FormItem>
+                <FormItem label="品牌图标" prop="image">
+                    <upload-pic-input v-model="form.image" style="width:100%"></upload-pic-input>
+                </FormItem>
+            </Form>
+            <div slot="footer">
+                <Button type="text" @click="modalVisible=false">取消</Button>
+                <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import {
+        save,
+        getNavigationData,
+        disableNavigation,
+        enableNavigation,
+        delNavigation,
+        update
+    } from "@/api/pages";
+    import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+    export default {
+        name: "pcNavigation",
+        components: {
+            uploadPicInput
+        },
+        data() {
+            return {
+                openTip: true, // 显示提示
+                loading: true, // 表单加载状态
+                type: "PC",
+                modalType: 0, // 添加或编辑标识
+                modalVisible: false, // 添加或编辑显示
+                modalTitle: "", // 添加或编辑标题
+                searchForm: { // 搜索框初始化对象
+                    pageNumber: 1, // 当前页数
+                    pageSize: 10, // 页面大小
+                    sort: "createTime", // 默认排序字段
+                    order: "desc", // 默认排序方式
+                },
+                form: { // 添加或编辑表单对象初始化数据
+                    navigationName: "",
+                    image: "",
+                    url: "",
+                },
+                // 表单验证规则
+                formValidate: {
+                    url: [{required: true, message: "导航栏url不能为空", trigger: "blur"}],
+                    navigationName: [{required: true, message: "导航栏不能为空", trigger: "blur"}],
+                },
+                submitLoading: false, // 添加或编辑提交状态
+                selectList: [], // 多选数据
+                selectCount: 0, // 多选计数
+                columns: [
+                    // 表头
+                    {
+                        type: "selection",
+                        width: 60,
+                        align: "center"
+                    },
+                    {
+                        title: "导航名称",
+                        key: "navigationName",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "状态",
+                        key: "status",
+                        minWidth: 100,
+                        sortable: false,
+                        render: (h, params) => {
+                            if (params.row.status == 'CLOSE') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "error",
+                                            text: "禁用"
+                                        }
+                                    })
+                                ]);
+                            } else if (params.row.status == 'OPEN') {
+                                return h("div", [
+                                    h("Badge", {
+                                        props: {
+                                            status: "success",
+                                            text: "启用"
+                                        }
+                                    })
+                                ]);
+                            }
+                        }
+                    },
+                    {
+                        title: "图片",
+                        key: "image",
+                        minWidth: 120,
+                        sortable: false,
+                        render: (h, params) => {
+                            return h("img", {
+                                attrs: {
+                                    src: params.row.image,
+                                    alt: "加载图片失败"
+                                },
+                                style: {
+                                    cursor: "pointer",
+                                    width: "80px",
+                                    height: "60px",
+                                    margin: "10px 0",
+                                    "object-fit": "contain"
+                                }
+                            });
+                        }
+                    },
+                    {
+                        title: "排序",
+                        key: "sort",
+                        minWidth: 120,
+                        sortable: false,
+                    },
+                    {
+                        title: "操作",
+                        key: "action",
+                        align: "center",
+                        width: 250,
+                        render: (h, params) => {
+                            console.warn(params.status)
+                            let enableOrDisable = "";
+                            if (params.row.status == "CLOSE") {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "success",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.enable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "启用"
+                                );
+                            } else {
+                                enableOrDisable = h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.disable(params.row);
+                                            }
+                                        }
+                                    },
+                                    "禁用"
+                                );
+                            }
+                            return h("div", [
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "primary",
+                                            size: "small"
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.edit(params.row);
+                                            }
+                                        }
+                                    },
+                                    "编辑"
+                                ),
+                                h(
+                                    "Button",
+                                    {
+                                        props: {
+                                            type: "error",
+                                            size: "small",
+                                        },
+                                        style: {
+                                            marginRight: "5px"
+                                        },
+                                        on: {
+                                            click: () => {
+                                                this.del(params.row);
+                                            }
+                                        }
+                                    },
+                                    "删除"
+                                ),
+                                enableOrDisable,
+                            ]);
+                        }
+                    }
+                ],
+                data: [], // 表单数据
+                total: 0 // 表单数据总数
+            };
+        },
+        methods: {
+            init() {
+                this.getDataList();
+            },
+            changePage(v) {
+                this.searchForm.pageNumber = v;
+                this.getDataList();
+                this.clearSelectAll();
+            },
+            changePageSize(v) {
+                this.searchForm.pageSize = v;
+                this.getDataList();
+            },
+            handleSearch() {
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                this.getDataList();
+            },
+            handleReset() {
+                this.$refs.searchForm.resetFields();
+                this.searchForm.pageNumber = 1;
+                this.searchForm.pageSize = 10;
+                // 重新加载数据
+                this.getDataList();
+            },
+            changeSort(e) {
+                this.searchForm.sort = e.key;
+                this.searchForm.order = e.order;
+                if (e.order === "normal") {
+                    this.searchForm.order = "";
+                }
+                this.getDataList();
+            },
+            clearSelectAll() {
+                this.$refs.table.selectAll(false);
+            },
+            changeSelect(e) {
+                this.selectList = e;
+                this.selectCount = e.length;
+            },
+            getDataList() {
+                this.searchForm.clientType = this.type
+                this.loading = true;
+                // 带多条件搜索参数获取表单数据 请自行修改接口
+                getNavigationData(this.searchForm).then(res => {
+                    this.loading = false;
+                    if (res.success) {
+                        this.data = res.result.records;
+                        this.total = res.result.total;
+                    }
+                });
+                this.total = this.data.length;
+                this.loading = false;
+            },
+            handleSubmit() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.submitLoading = true;
+                        this.form.clientType = this.type
+                        if (this.modalType === 0) {
+                            // 添加 避免编辑后传入id等数据 记得删除
+                            delete this.form.id;
+                            save(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        } else {
+                            // 编辑
+                            update(this.form).then(res => {
+                                this.submitLoading = false;
+                                if (res.success) {
+                                    this.$Message.success("操作成功");
+                                    this.getDataList();
+                                    this.modalVisible = false;
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+            add() {
+                this.modalType = 0;
+                this.modalTitle = "添加";
+                this.$refs.form.resetFields();
+                delete this.form.id;
+                this.modalVisible = true;
+            },
+            edit(v) {
+                this.modalType = 1;
+                this.modalTitle = "编辑";
+                this.$refs.form.resetFields();
+                // 转换null为""
+                for (let attr in v) {
+                    if (v[attr] === null) {
+                        v[attr] = "";
+                    }
+                }
+                let str = JSON.stringify(v);
+                let data = JSON.parse(str);
+                this.form = data;
+                this.modalVisible = true;
+            },
+            enable(v){
+                this.$Modal.confirm({
+                    title: "确认启用",
+                    // 记得确认修改此处
+                    content: "您确认要确认启用 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        enableNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disable(v) {
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    // 记得确认修改此处
+                    content: "您确认要禁用 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        disableNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            disableAll() {
+                if (this.selectCount <= 0) {
+                    this.$Message.warning("您还未选择要禁用的数据");
+                    return;
+                }
+                this.$Modal.confirm({
+                    title: "确认禁用",
+                    content: "您确认要禁用所选的 " + this.selectCount + " 条数据?",
+                    loading: true,
+                    onOk: () => {
+                        let ids = "";
+                        this.selectList.forEach(function (e) {
+                            ids += e.id + ",";
+                        });
+                        ids = ids.substring(0, ids.length - 1);
+                        // 批量禁用
+                        disableNavigation(ids).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.clearSelectAll();
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            },
+            del(v) {
+                this.$Modal.confirm({
+                    title: "确认删除",
+                    // 记得确认修改此处
+                    content: "您确认要永久性删除 " + v.navigationName + " ?",
+                    loading: true,
+                    onOk: () => {
+                        // 删除
+                        delNavigation(v.id).then(res => {
+                            this.$Modal.remove();
+                            if (res.success) {
+                                this.$Message.success("操作成功");
+                                this.getDataList();
+                            }
+                        });
+                    }
+                });
+            }
+        },
+
+        mounted() {
+            this.init();
+        }
+    };
+</script>
+<style lang="scss">
+    // 建议引入通用样式 可删除下面样式代码
+    // @import "@/styles/table-common.scss";
+    .search {
+        .operation {
+            margin-bottom: 2vh;
+        }
+        .select-count {
+            font-weight: 600;
+            color: #40a9ff;
+        }
+        .select-clear {
+            margin-left: 10px;
+        }
+        .page {
+            margin-top: 2vh;
+        }
+        .drop-down {
+            margin-left: 5px;
+        }
+    }
+</style>
diff --git a/manager/src/views/personal-center/personal-center.scss b/manager/src/views/personal-center/personal-center.scss
new file mode 100644
index 00000000..f4a29cb9
--- /dev/null
+++ b/manager/src/views/personal-center/personal-center.scss
@@ -0,0 +1,65 @@
+.own-space {
+  .own-space-new {
+    .ivu-card-body {
+      padding: 16px 16px 16px 0px;
+    }
+  }
+
+  .own-wrap {
+    display: flex;
+
+    .title {
+      font-size: 20px;
+      color: rgba(0, 0, 0, .85);
+      line-height: 28px;
+      font-weight: 500;
+      margin-bottom: 12px;
+    }
+
+    .safe {
+      width: 100%;
+
+      .item {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding-top: 14px;
+        padding-bottom: 14px;
+        border-bottom: 1px solid #e8e8e8;
+
+        .title {
+          color: rgba(0, 0, 0, .65);
+          margin-bottom: 4px;
+          font-size: 14px;
+          line-height: 22px;
+        }
+
+        .desc {
+          color: rgba(0, 0, 0, .45);
+          font-size: 14px;
+          line-height: 22px;
+
+          .red {
+            color: #ed3f14;
+          }
+
+          .middle {
+            color: #faad14;
+          }
+
+          .green {
+            color: #52c41a;
+          }
+        }
+      }
+    }
+  }
+}
+
+/deep/ .upload-list {
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
diff --git a/manager/src/views/personal-center/personal-center.vue b/manager/src/views/personal-center/personal-center.vue
new file mode 100644
index 00000000..35114205
--- /dev/null
+++ b/manager/src/views/personal-center/personal-center.vue
@@ -0,0 +1,179 @@
+<style lang="scss" scoped>
+@import "./personal-center.scss";
+</style>
+
+<template>
+  <div class="own-space">
+    <Card class="own-space-new">
+      <div class="own-wrap">
+        <div style="width:240px">
+          <Menu :active-name="activeName" theme="light" @on-select="changeMenu">
+            <MenuItem name="基本信息">基本信息</MenuItem>
+            <MenuItem name="安全设置">安全设置</MenuItem>
+          </Menu>
+        </div>
+        <div style="padding: 8px 40px;width:100%">
+          <div class="title">{{ currMenu }}</div>
+          <div>
+            <div v-show="currMenu=='基本信息'">
+              <Form ref="userForm" :model="userForm" :label-width="90" label-position="left">
+                <FormItem label="用户头像：">
+                  <upload-pic-thumb
+                    v-model="userForm.avatar"
+                    :multiple="false"
+                  ></upload-pic-thumb>
+                </FormItem>
+
+                <FormItem label="用户名：">
+                  {{ userForm.memberName }}
+                </FormItem>
+                <FormItem label="昵称：" prop="nickName">
+                  <Input v-model="userForm.nickName" style="width: 250px"/>
+                </FormItem>
+                <FormItem>
+                  <Button
+                    type="primary"
+                    style="width: 100px;margin-right:5px"
+                    :loading="saveLoading"
+                    @click="saveEdit"
+                  >保存
+                  </Button>
+                </FormItem>
+              </Form>
+            </div>
+            <div v-show="currMenu=='安全设置'" class="safe">
+              <div class="item">
+                <div>
+                  <div class="title">账户密码</div>
+                </div>
+                <div>
+                  <a @click="changePassword">修改</a>
+                </div>
+              </div>
+              <!-- #TODO 这块目前好像没有这个功能 -->
+              <!-- <div class="item">
+                <div>
+                  <div class="title">绑定手机</div>
+                  <div class="desc">
+                    <span v-if="userForm.mobile">已绑定手机：{{ userForm.mobile }}</span>
+                    <span v-else>未绑定手机号</span>
+                  </div>
+                </div>
+              </div>
+              <div class="item">
+                <div>
+                  <div class="title">绑定邮箱</div>
+                  <div class="desc">
+                    <span v-if="userForm.email">已绑定邮箱：{{ userForm.email }}</span>
+                    <span v-else>未绑定邮箱</span>
+                  </div>
+                </div>
+              </div> -->
+            </div>
+          </div>
+        </div>
+      </div>
+    </Card>
+
+  </div>
+</template>
+
+<script>
+import {
+  userInfo,
+  userInfoEdit,
+} from "@/api/index";
+import CountDownButton from "@/views/my-components/lili/count-down-button";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+import Cookies from "js-cookie";
+import util from "@/libs/util";
+
+export default {
+  components: {
+    uploadPicThumb,
+    CountDownButton
+  },
+  name: "personal-enter",
+  data() {
+    return {
+      activeName: "基本信息",
+      userForm: {
+        avatar: "",
+        nickname: ""
+      },
+      codeError: "",
+      sending: false,
+      jumping: false,
+      currMenu: "基本信息",
+      dictSex: this.$store.state.dict.sex
+    };
+  },
+  methods: {
+    init() {
+      let v = JSON.parse(Cookies.get("userInfo"));
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] == null) {
+          v[attr] = "";
+        }
+      }
+      let userInfo = JSON.parse(JSON.stringify(v));
+      this.userForm = userInfo;
+      console.log(userInfo)
+    },
+    changePassword() {
+      util.openNewPage(this, "change-password");
+      this.$router.push({
+        name: "change_password"
+      });
+    },
+    changeMenu(v) {
+      this.currMenu = v;
+    },
+    saveEdit() {
+      this.saveLoading = true;
+      let params = this.userForm;
+      userInfoEdit(params).then(res => {
+        this.saveLoading = false;
+        if (res.success) {
+          this.$Message.success("保存成功");
+          // 更新用户信息
+          Cookies.set("userInfo", this.userForm);
+          // 更新头像
+          this.$store.commit("setAvatarPath", this.userForm.avatar);
+
+          setTimeout(()=>{
+            this.$router.go(0)
+          },500)
+
+        }
+      });
+    },
+    updateUserInfo() {
+      // 更新用户信息
+      userInfo().then(res => {
+        if (res.success) {
+          // 避免超过大小限制
+          delete res.result.permissions;
+          if (this.getStore("saveLogin")) {
+            // 保存7天
+            Cookies.set("userInfo", JSON.stringify(res.result), {
+              expires: 7
+            });
+          } else {
+            Cookies.set("userInfo", JSON.stringify(res.result));
+          }
+          this.setStore("userInfo", res.result);
+        }
+      });
+    },
+    changeMessage(v) {
+      this.setStore("messageOpen", v);
+    }
+  },
+  mounted() {
+    let type = this.$route.query.type;
+    this.init();
+  }
+};
+</script>
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
new file mode 100644
index 00000000..5f4ab8fa
--- /dev/null
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -0,0 +1,467 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form" >
+          <Form-item label="活动名称" prop="couponName">
+            <Input
+              type="text"
+              v-model="searchForm.couponName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll" >批量下架</Button>
+        <!-- <Button @click="upAll" >批量上架</Button> -->
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="action">
+            <!-- <Button
+              type="info"
+              size="small"
+              style="margin-right: 10px"
+              @click="receiveInfo(row)"
+              >查看</Button
+            > -->
+            <Button
+              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+              type="primary"
+              size="small"
+              style="margin-right: 10px"
+              @click="edit(row)"
+              >编辑</Button
+            >
+            <Button
+              v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
+              type="error"
+              size="small"
+              style="margin-right: 10px"
+              @click="remove(row)"
+              >下架</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  getPlatformCouponList,
+  deletePlatformCoupon,
+  updatePlatformCouponStatus,
+} from "@/api/promotion";
+
+export default {
+  name: "coupon",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        promotionName: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        promotionName: [
+          { required: true, message: "不能为空", trigger: "blur" },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+          fixed: "left",
+        },
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+          fixed: "left",
+        },
+        {
+          title: "优惠券名称",
+          key: "couponName",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "面额",
+          key: "price",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.price) {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.price, "￥")
+              );
+            } else {
+              return h("div");
+            }
+          },
+        },
+        {
+          title: "折扣",
+          key: "couponDiscount",
+          minWidth: 60
+        },
+        {
+          title: "总数量",
+          key: "publishNum",
+          width: 100
+        },
+        {
+          title: "领取数量",
+          key: "receivedNum",
+          width: 100,
+        },
+        {
+          title: "优惠券类型",
+          key: "couponType",
+          width: 120,
+          render: (h, params) => {
+            let text = "未知";
+            if (params.row.couponType === "DISCOUNT") {
+              text = "打折";
+            } else if (params.row.couponType === "PRICE") {
+              text = "减免现金";
+            }
+            return h("div", [text]);
+          },
+        },
+        {
+          title: "品类描述",
+          key: "scopeType",
+          width: 100,
+          render: (h, params) => {
+            let text = "未知";
+            if (params.row.scopeType == "ALL") {
+              text = "全品类";
+            } else if (params.row.scopeType == "PORTION_GOODS_CATEGORY") {
+              text = "商品分类";
+            } else if (params.row.scopeType == "PORTION_SHOP_CATEGORY") {
+              text = "店铺分类";
+            } else if (params.row.scopeType == "PORTION_GOODS") {
+              text = "指定商品";
+            }
+            return h("div", [text]);
+          },
+        },
+        {
+          title: "开始时间",
+          key: "startTime",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          minWidth: 90,
+          fixed: "right",
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "red";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          fixed: "right",
+          minWidth: 130
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath == "/promotion/manager-coupon") {
+        this.init();
+      }
+    },
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    add() {
+      this.$router.push({ name: "add-platform-coupon" });
+    },
+    /** 跳转至领取详情页面 */
+    receiveInfo(v) {
+      this.$router.push({ name: "member-receive-coupon", query: { id: v.id } });
+    },
+    info(v) {
+      this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getPlatformCouponList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            this.postRequest("/coupon/insertOrUpdate", this.form).then(
+              (res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              }
+            );
+          } else {
+            // 编辑
+            this.postRequest("/coupon/insertOrUpdate", this.form).then(
+              (res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("操作成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              }
+            );
+          }
+        }
+      });
+    },
+    edit(v) {
+      this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认下架",
+        // 记得确认修改此处
+        content: "确认要下架此优惠券么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          updatePlatformCouponStatus({ couponIds: v.id, promotionStatus: "CLOSE" })
+            .then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("优惠券已作废");
+                this.getDataList();
+              }
+            })
+            .catch(() => {
+              this.$Modal;
+            });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要下架的优惠券");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认下架",
+        content: "您确认要下架所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            couponIds: ids.toString(),
+            promotionStatus: "CLOSE",
+          };
+          // 批量删除
+          updatePlatformCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    upAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("请选择要上架的优惠券");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认上架",
+        content: "您确认要上架所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            couponIds: ids.toString(),
+            promotionStatus: "START",
+          };
+          // 批量上架
+          updatePlatformCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/promotion/coupon/couponInfo.vue b/manager/src/views/promotion/coupon/couponInfo.vue
new file mode 100644
index 00000000..8e852976
--- /dev/null
+++ b/manager/src/views/promotion/coupon/couponInfo.vue
@@ -0,0 +1,246 @@
+<template>
+  <div>
+    <div class="content-goods-publish">
+      <Form ref="form" :model="form" :label-width="130">
+        <div class="base-info-item">
+          <h4>平台券活动详情</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称">
+              <span class="goods-category-name">{{ form.promotionName }}</span>
+            </FormItem>
+            <FormItem label="活动类型">
+              <span class="goods-category-name">{{
+                getCouponType(form.couponType)
+              }}</span>
+            </FormItem>
+            <FormItem label="面额">
+              <span class="goods-category-name"> ￥{{ form.price }}</span>
+            </FormItem>
+            <FormItem label="活动说明">
+              <span class="goods-category-name">{{ form.description }}</span>
+            </FormItem>
+            <FormItem label="发放总数">
+              <span class="goods-category-name">{{ form.publishNum }}</span>
+            </FormItem>
+            <FormItem label="领取限制">
+              <span class="goods-category-name">{{ form.limitNum }}</span>
+            </FormItem>
+            <FormItem label="活动开始时间">
+              <span class="goods-category-name">{{ form.startTime }}</span>
+            </FormItem>
+            <FormItem label="消费限额">
+              <span class="goods-category-name">{{
+                form.consumptionLimit
+              }}</span>
+            </FormItem>
+            <FormItem label="使用有效期">
+              <span class="goods-category-name">{{ form.startTime }} 至 {{ form.endTime }}</span>
+            </FormItem>
+            <FormItem label="适用品类范围">
+              <span class="goods-category-name">{{
+                getScopeType(form.scopeType)
+              }}</span>
+            </FormItem>
+            <FormItem label="品类范围描述">
+              <span class="goods-category-name">{{ form.couponName }}</span>
+            </FormItem>
+            <FormItem label="状态">
+              <span class="goods-category-name">{{
+                getStatus(form.status)
+              }}</span>
+            </FormItem>
+            <FormItem label="优惠券类型">
+              <span class="goods-category-name">{{
+                getType(form.getType)
+              }}</span>
+            </FormItem>
+            <FormItem label="活动创建时间">
+              <span class="goods-category-name">{{ form.createTime }}</span>
+            </FormItem>
+            <FormItem label="活动最后更新时间">
+              <span class="goods-category-name">{{ form.updateTime }}</span>
+            </FormItem>
+            <FormItem label="更新管理员名称">
+              <span class="goods-category-name">{{ form.updateBy }}</span>
+            </FormItem>
+            <FormItem label="已发放数量">
+              <span class="goods-category-name">{{ form.receivedNum }}</span>
+            </FormItem>
+            <FormItem label="已使用数量">
+              <span class="goods-category-name">{{ form.usedNum }}</span>
+            </FormItem>
+          </div>
+          <h4>适用品类范围</h4>
+          <div>
+            <Row>
+              <Table :loading="loading" border :columns="columns1" :data="data1" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+                size="small" show-total show-elevator show-sizer></Page>
+            </Row>
+          </div>
+        </div>
+      </Form>
+    </div>
+
+    <div class="footer">
+      <Button type="primary" @click="back">返回活动列表</Button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getPlatformCoupon } from "@/api/promotion";
+
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+import editor from "@/views/my-components/lili/editor";
+
+export default {
+  name: "addCoupon",
+  components: {
+    uploadPicThumb,
+    editor,
+  },
+  data() {
+    return {
+      maxHeight: "240px",
+      modalType: 0,
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+      categoryId: 0,
+      loading: false, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        /** 店铺承担比例 */
+        sellerCommission: 0,
+        /** 发行数量 */
+        publishNum: 1,
+        /** 运费承担者 */
+        scopeType: "ALL",
+        /** 消费限额 */
+        consumptionLimit: "",
+        /** 限领数量 */
+        limitNum: 1,
+        /** 活动类型 */
+        couponType: "",
+        /** 优惠券名称 */
+        couponName: "",
+        /** 已被使用数量 */
+        usedNum: 0,
+        /** 已被领取的数量 */
+        receivedNum: 0,
+      },
+      id: this.$route.query.id,
+      columns1: [
+        {
+          title: "一级类目",
+          key: "name",
+        },
+        {
+          title: "二级类目",
+          key: "age",
+        },
+        {
+          title: "三级类目",
+          key: "address",
+        },
+      ],
+      data1: [
+        {
+          name: "王小明",
+          age: 18,
+          address: "北京市朝阳区芍药居",
+        },
+        {
+          name: "张小刚",
+          age: 25,
+          address: "北京市海淀区西二旗",
+        },
+        {
+          name: "李小红",
+          age: 30,
+          address: "上海市浦东新区世纪大道",
+        },
+        {
+          name: "周小伟",
+          age: 26,
+          address: "深圳市南山区深南大道",
+        },
+      ],
+      submitLoading: false, // 添加或编辑提交状态
+    };
+  },
+  mounted() {
+    // 如果id不为空则查询信息
+    if (this.id) {
+      this.getCoupon();
+      this.modalType = 1;
+    }
+  },
+  methods: {
+    getCouponType(value) {
+      switch (value) {
+        case "POINT":
+          return "打折";
+        case "PRICE":
+          return "减免现金";
+      }
+    },
+    /** 获取状态 */
+    getStatus(value) {
+      switch (value) {
+        case "NEW":
+          return "新建";
+        case "START":
+          return "开始";
+        case "LOWER":
+          return "结束";
+        case "CANCEL":
+          return "作废";
+      }
+    },
+    /** 关联范围类型 */
+    getScopeType(value) {
+      switch (value) {
+        case "PORTION_CATEGORY":
+          return "部分商品分类";
+        case "PORTION_GOODS":
+          return "指定商品";
+        case "ALL":
+          return "全品类";
+      }
+    },
+    /** 优惠券类型 */
+    getType(value) {
+      switch (value) {
+        case "FREE":
+          return "免费获取";
+        case "ACTIVITY":
+          return "活动获取";
+      }
+    },
+
+    getCoupon() {
+      getPlatformCoupon(this.id).then((res) => {
+        this.form = res.result;
+      });
+    },
+    back() {
+      this.$store.commit("removeTag", "platform-coupon-info");
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "couponPublish.scss";
+</style>
+
diff --git a/manager/src/views/promotion/coupon/couponPublish.scss b/manager/src/views/promotion/coupon/couponPublish.scss
new file mode 100644
index 00000000..a4eb33ed
--- /dev/null
+++ b/manager/src/views/promotion/coupon/couponPublish.scss
@@ -0,0 +1,257 @@
+/*选择商品品类*/
+.content-goods-publish {
+  padding: 15px;
+  margin: 0 auto;
+  text-align: center;
+  border: 1px solid #ddd;
+  background: none repeat 0 0 #fff;
+  height: 100%;
+  margin-bottom: 20px;
+
+  /*商品品类*/
+  .goods-category {
+    text-align: left;
+    padding: 10px;
+    background: #fafafa;
+    border: 1px solid #e6e6e6;
+
+    ul {
+      padding: 8px 4px 8px 8px;
+      list-style: none;
+      width: 300px;
+      background: none repeat 0 0 #fff;
+      border: 1px solid #e6e6e6;
+      display: inline-block;
+      letter-spacing: normal;
+      margin-right: 15px;
+      vertical-align: top;
+      word-spacing: normal;
+
+      li {
+        line-height: 20px;
+        padding: 5px;
+        cursor: pointer;
+        color: #333;
+        font-size: 12px;
+        display: flex;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  /** 当前品类被选中的样式 */
+  .activeClass {
+    background-color: #d9edf7;
+    border: 1px solid #bce8f1;
+    color: #3a87ad;
+  }
+
+  /*!*当前选择的商品品类文字*!*/
+  .current-goods-category {
+    text-align: left;
+    padding: 10px;
+    width: 100%;
+    border: 1px solid #fbeed5;
+    color: #c09853;
+    background-color: #fcf8e3;
+    margin: 10px auto;
+    padding: 8px 35px 8px 14px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    font-weight: bold;
+  }
+}
+
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    color: gray;
+    text-align: left;
+  }
+}
+
+div.base-info-item {
+
+  h4 {
+    margin-bottom: 10px;
+    padding: 0 10px;
+    border: 1px solid #ddd;
+    background-color: #f8f8f8;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+    line-height: 40px;
+    text-align: left;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 80px;
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+  /deep/ .el-collapse-item__header {
+    text-align: left;
+    background-color: #f8f8f8;
+    padding: 0 10px;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+  }
+
+  .el-form-item {
+    margin-left: 5%;
+    width: 25%;
+  }
+
+  /deep/ .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 12%;
+    text-align: left;
+    color: #999;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding: 10px 0;
+    text-align: left;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 88.7%;
+  padding: 10px;
+  background-color: #ffc;
+  position: fixed;
+  bottom: 0px;
+  left: 10%;
+  text-align: center;
+  z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.step-view {
+  width: 33%;
+  height: 40px;
+  font-size: 19px;
+  text-align: center;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+}
+
+.page {
+  margin-top: 2vh;
+  margin-bottom: 5vh;
+}
diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue
new file mode 100644
index 00000000..32953a03
--- /dev/null
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -0,0 +1,566 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="优惠券名称" prop="couponName">
+              <Input type="text" v-model="form.couponName" placeholder="优惠券名称" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="优惠券类型" prop="couponType">
+              <Select v-model="form.couponType" style="width: 260px">
+                <Option value="DISCOUNT">打折</Option>
+                <Option value="PRICE">减免现金</Option>
+              </Select>
+            </FormItem>
+            <FormItem label="折扣" prop="couponDiscount" v-if="form.couponType == 'DISCOUNT'">
+              <Input type="number" v-model="form.couponDiscount" placeholder="折扣" clearable style="width: 260px" />
+              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
+            </FormItem>
+            <FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
+              <Input type="text" v-model="form.price" placeholder="面额" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="活动类型" prop="getType">
+              <Select v-model="form.getType" style="width: 260px">
+                <Option value="FREE">免费领取</Option>
+                <Option value="ACTIVITY">活动赠送</Option>
+              </Select>
+            </FormItem>
+
+            <FormItem label="店铺承担比例" prop="storeCommission">
+              <Input v-model="form.storeCommission" placeholder="店铺承担比例" style="width: 260px">
+              <span slot="append">%</span>
+              </Input>
+              <span class="describe">店铺承担比例，输入0-100之间数值</span>
+            </FormItem>
+            <FormItem label="发放数量" prop="publishNum">
+              <Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
+            </FormItem>
+          </div>
+          <h4>使用限制</h4>
+          <div class="form-item-view">
+            <FormItem label="消费门槛" prop="consumeThreshold">
+              <Input type="text" v-model="form.consumeThreshold" placeholder="消费门槛" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="领取限制" prop="couponLimitNum">
+              <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="有效期" prop="startTime">
+              <DatePicker type="datetime" v-model="form.startTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" clearable style="width: 200px">
+              </DatePicker>
+              -
+              <DatePicker type="datetime" v-model="form.endTime" format="yyyy-MM-dd HH:mm:ss" :options="options" placeholder="请选择" clearable style="width: 200px">
+              </DatePicker>
+            </FormItem>
+            <FormItem label="使用范围" prop="scopeType">
+              <RadioGroup v-model="form.scopeType">
+                <Radio label="ALL">全品类</Radio>
+                <Radio label="PORTION_GOODS">指定商品</Radio>
+                <Radio label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>
+              </RadioGroup>
+            </FormItem>
+
+            <FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
+              <div style="display: flex; margin-bottom: 10px">
+                <Button type="primary" @click="$refs.skuSelect.open('goods')">选择商品</Button>
+                <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
+              </div>
+              <Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
+                <template slot-scope="{ row }" slot="QRCode">
+                  <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
+                </template>
+              </Table>
+            </FormItem>
+
+            <FormItem v-if="form.scopeType == 'PORTION_GOODS_CATEGORY'">
+
+              <Cascader @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;" v-model="form.scopeIdGoods"></Cascader>
+
+            </FormItem>
+
+            <FormItem label="范围描述" prop="description">
+              <Input v-model="form.description" type="textarea" :rows="4" maxlength="50" show-word-limit clearable style="width: 260px" />
+            </FormItem>
+            <div>
+              <Button type="text" @click="closeCurrentPage">返回</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+  </div>
+</template>
+
+<script>
+import {
+  savePlatformCoupon,
+  getPlatformCoupon,
+  editPlatformCoupon,
+} from "@/api/promotion";
+import { getCategoryTree } from "@/api/goods";
+import { regular } from "@/utils";
+import skuSelect from "@/views/lili-dialog";
+
+export default {
+  name: "addCoupon",
+  components: {
+    skuSelect,
+  },
+  data() {
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("面额不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("面额设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("消费门槛不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("消费门槛设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const isLtEndDate = (rule, value, callback) => {
+      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    const isGtStartDate = (rule, value, callback) => {
+      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    return {
+      arrScopeId: [],
+      maxHeight: "240px",
+      modalType: 0,
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+      categoryId: 0,
+      form: {
+        /** 店铺承担比例 */
+        storeCommission: 0,
+        /** 发行数量 */
+        publishNum: 1,
+        /** 运费承担者 */
+        scopeType: "ALL",
+        /** 限领数量 */
+        couponLimitNum: 1,
+        /** 活动类型 */
+        couponType: "PRICE",
+        /** 优惠券名称 */
+        couponName: "",
+        getType: "FREE",
+        promotionGoodsList: [],
+        scopeIdGoods: [],
+      },
+      id: this.$route.query.id,
+      submitLoading: false, // 添加或编辑提交状态
+      selectedGoods: [], // 已选商品列表，便于删除
+      goodsCategoryList: [], // 商品分类列表
+      shopCategoryList: [], // 店铺分类列表
+      cascaderProps: {
+        multiple: true,
+        label: "name",
+        value: "id",
+      }, // 级联选择器配置项
+      formRule: {
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        couponName: [{ required: true, message: "优惠券名称不能为空" }],
+        couponLimitNum: [{ required: true, message: "领取限制不能为空" }],
+        price: [
+          { required: true, message: "请输入面额" },
+          { validator: checkPrice },
+        ],
+        consumeThreshold: [
+          { required: true, message: "请输入消费门槛" },
+          { validator: checkWeight },
+        ],
+        startTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择开始时间",
+          },
+          {
+            trigger: "change",
+            message: "开始时间要小于结束时间",
+            validator: isLtEndDate,
+          },
+        ],
+        endTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择结束时间",
+          },
+          {
+            trigger: "change",
+            message: "结束时间要大于开始时间",
+            validator: isGtStartDate,
+          },
+        ],
+        couponDiscount: [
+          { required: true, message: "请输入折扣" },
+          {
+            pattern: regular.discount,
+            message: "请输入0-10的数字,可有一位小数",
+          },
+        ],
+        storeCommission: [
+          { required: true, message: "请输入店铺承担比例" },
+          { pattern: regular.rate, message: "请输入0-100的正整数" },
+        ],
+        publishNum: [
+          { required: true, message: "请输入发放数量" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        couponLimitNum: [
+          { required: true, message: "请输入领取限制" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        description: [{ required: true, message: "请输入范围描述" }],
+      },
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 40,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          minWidth: 50,
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "Button",
+              {
+                props: {
+                  size: "small",
+                  type: "error",
+                  ghost: true,
+                },
+                on: {
+                  click: () => {
+                    this.delGoods(params.index);
+                  },
+                },
+              },
+              "删除"
+            );
+          },
+        },
+      ],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  async mounted() {
+    await this.getCagetoryList();
+    // 如果id不为空则查询信息
+    if (this.id) {
+      this.getCoupon();
+      this.modalType = 1;
+    }
+  },
+  methods: {
+    getCoupon() {
+      getPlatformCoupon(this.id).then((res) => {
+        let data = res.result;
+        if (!data.promotionGoodsList) data.promotionGoodsList = [];
+        if (data.scopeType == "PORTION_GOODS_CATEGORY") {
+          let prevCascader = data.scopeId.split(",");
+          // console.log(prevCascader);
+          function next(params, prev) {
+            for (let i = 0; i < params.length; i++) {
+              const item = params[i];
+              console.log(item);
+              if (item.children) {
+                next(item.children, [...prev, item]);
+              } else {
+                if (prevCascader.includes(item.id)) {
+                  prevCascader = prevCascader.map((key) => {
+                    if (key === item.id) {
+                      let result = prev.map((item) => item.id);
+
+                      return [...result, item.id];
+                    } else {
+                      return key;
+                    }
+                  });
+                } else {
+                  i === params.length - 1 && (prev = []);
+                }
+              }
+            }
+          }
+          next(this.goodsCategoryList, []);
+          data.scopeIdGoods = prevCascader;
+        }
+        this.form = data;
+      });
+    },
+    /** 保存平台优惠券 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const params = JSON.parse(JSON.stringify(this.form));
+          const strat = this.$options.filters.unixToDate(
+            this.form.startTime / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.endTime / 1000
+          );
+          let scopeId = [];
+          params.startTime = strat;
+          params.endTime = end;
+
+          if (
+            params.scopeType == "PORTION_GOODS" &&
+            (!params.promotionGoodsList ||
+              params.promotionGoodsList.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择指定商品" });
+            return;
+          }
+
+          if (
+            params.scopeType == "PORTION_GOODS_CATEGORY" &&
+            (!params.scopeIdGoods || params.scopeIdGoods.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择商品分类" });
+            return;
+          }
+
+          if (params.scopeType == "PORTION_GOODS") {
+            //指定商品
+            params.promotionGoodsList.forEach((item) => {
+              scopeId.push(item.skuId);
+            });
+            params.scopeId = scopeId.toString();
+          } else if (params.scopeType == "ALL") {
+            delete params.promotionGoodsList;
+          } else if (params.scopeType == "PORTION_GOODS_CATEGORY") {
+            //部分商品分类
+            scopeId = this.filterCategoryId(params.scopeIdGoods, []);
+            params.scopeId = scopeId.toString();
+            delete params.promotionGoodsList;
+          }
+          delete params.scopeIdGoods;
+
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+
+            savePlatformCoupon(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("优惠券发送成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            delete params.consumeLimit;
+            delete params.updateTime;
+
+            editPlatformCoupon(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("优惠券修改成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add-platform-coupon");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+    changeSelect(e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+    delSelectGoods() {
+      // 多选删除商品
+      if (this.selectedGoods.length <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选商品吗?",
+        onOk: () => {
+          let ids = [];
+          this.selectedGoods.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+            (item) => {
+              return !ids.includes(item.id);
+            }
+          );
+        },
+      });
+    },
+    delGoods(index) {
+      // 删除商品
+      this.form.promotionGoodsList.splice(index, 1);
+    },
+    selectedGoodsData(item) {
+      // 回显已选商品
+      let ids = [];
+      let list = [];
+      this.form.promotionGoodsList.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            sellerName: e.sellerName,
+            skuId: e.id,
+          });
+        }
+      });
+      this.form.promotionGoodsList.push(...list);
+    },
+    getGoodsCategory(e) {
+      // 获取级联选择器商品分类id
+      console.log(e);
+    },
+
+    async getCagetoryList() {
+      // 获取全部商品分类
+      let data = await getCategoryTree();
+      this.goodsCategoryList = this.filterCategory(data.result);
+      // 过滤出可显示的值
+
+      this.goodsCategoryList = this.goodsCategoryList.map((item) => {
+        if (item.children) {
+          item.children = item.children.map((child) => {
+            if (child.children) {
+              child.children = child.children.map((son) => {
+                return {
+                  value: son.id,
+                  label: son.name,
+                };
+              });
+              return {
+                value: child.id,
+                label: child.name,
+                children: child.children,
+              };
+            } else {
+              return {
+                value: child.id,
+                label: child.name,
+              };
+            }
+          });
+        }
+        return { value: item.id, label: item.name, children: item.children };
+      });
+    },
+    filterCategory(list) {
+      // 递归删除空children
+      list.forEach((item) => {
+        if (item.children.length == 0) {
+          delete item.children;
+        } else {
+          this.filterCategory(item.children);
+        }
+      });
+
+      return list;
+    },
+    filterCategoryId(list, idArr) {
+      // 递归获取分类id
+      list.forEach((e) => {
+        if (e instanceof Array) {
+          this.filterCategoryId(e, idArr);
+        } else {
+          if (!idArr.includes(e)) idArr.push(e);
+        }
+      });
+      return idArr;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scpoed>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+</style>
+
diff --git a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
new file mode 100644
index 00000000..21edb3d7
--- /dev/null
+++ b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
@@ -0,0 +1,257 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+              <template slot-scope="{ row }" slot="rangeTime">
+                <div>{{ row.startTime }} ~ {{ row.endTime }}</div>
+              </template>
+              <template slot-scope="{ row }" slot="action">
+                <Button
+                  type="error"
+                  ghost
+                  size="small"
+                  :disabled="row.memberCouponStatus != 'NEW'"
+                  @click="remove(row)"
+                  >作废</Button
+                >
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import {
+  getMemberReceiveCouponList,
+  deleteMemberReceiveCoupon,
+} from "@/api/promotion";
+
+export default {
+  name: "memberReceiveCoupon",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      id: this.$route.query.id,
+
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      columns: [
+        // 表头
+        {
+          title: "优惠券编号",
+          key: "couponId",
+          minWidth: 120,
+        },
+        {
+          title: "面额",
+          key: "price",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "消费门槛",
+          key: "consumeThreshold",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.consumeThreshold, "￥")
+            );
+          },
+        },
+        {
+          title: "有效期",
+          slot: "rangeTime",
+          minWidth: 120
+        },
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 120
+        },
+        {
+          title: "适用范围",
+          key: "couponType",
+          minWidth: 50,
+          render: (h, params) => {
+            let text = "未知";
+            if (params.row.scopeType == "ALL") {
+              text = "全品类";
+            } else if (params.row.scopeType == "PORTION_CATEGORY") {
+              text = "部分商品分类";
+            } else if (params.row.scopeType == "PORTION_GOODS") {
+              text = "指定商品";
+            }
+            return h("div", [text]);
+          },
+        },
+        {
+          title: "会员名称",
+          key: "memberName",
+        },
+        {
+          title: "状态",
+          key: "memberCouponStatus",
+          minWidth: 50,
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.memberCouponStatus == "NEW") {
+              text = "未使用";
+              color = "default";
+            } else if (params.row.memberCouponStatus == "USED") {
+              text = "已使用";
+              color = "green";
+            } else if (params.row.memberCouponStatus == "EXPIRE") {
+              text = "已过期";
+              color = "red";
+            } else if (params.row.memberCouponStatus == "CLOSED") {
+              text = "已作废";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 100,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+    },
+    /** 查询单个优惠券领取详情 */
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getMemberReceiveCouponList(this.id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    /** 作废优惠券 */
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认作废",
+        content: "您确认要作废此优惠券?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deleteMemberReceiveCoupon(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("作废成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/promotion/fullCut/full-cut.vue b/manager/src/views/promotion/fullCut/full-cut.vue
new file mode 100644
index 00000000..f8723b09
--- /dev/null
+++ b/manager/src/views/promotion/fullCut/full-cut.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="full-cut">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="活动名称" prop="promotionName">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="padding-row">
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+          <template slot-scope="{ row }" slot="applyEndTime">
+            {{ unixDate(row.applyEndTime) }}
+          </template>
+          <template slot-scope="{ row }" slot="promotionType">
+            {{ row.isFullMinus ? "满减" : "满折" }}
+          </template>
+          <template slot-scope="{ row }" slot="hours">
+            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+              item
+            }}</Tag>
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <div>
+              <Button type="success" size="small" @click="view(row)"
+                >查看</Button
+              >&nbsp;
+            </div>
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page operation">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+<script>
+import { getFullDiscountList } from "@/api/promotion.js";
+
+export default {
+  data() {
+    return {
+      loading: false, // 表单加载状态
+      searchForm: {
+        pageNumber: 0,
+        pageSize: 10,
+        sort: "startTime",
+        order: "desc",
+      },
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "开始时间",
+          key: "startTime",
+          width: 170,
+        },
+        {
+          title: "结束时间",
+          key: "endTime",
+          width: 170,
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 60,
+        },
+        {
+          title: "活动类型",
+          slot: "promotionType",
+          minWidth: 60,
+        },
+        {
+          title: "活动状态",
+          key: "promotionStatus",
+          minWidth: 60,
+          render: (h, params) => {
+            let text = "未知",
+              color = "default";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 100,
+        },
+      ],
+      data: [], // 列表数据
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      // 改变页数
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      // 改变页码
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      // 搜索
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      getFullDiscountList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    view(row) {
+      // 查看
+      this.$router.push({ name: "full-cut-detail", query: { id: row.id } });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/promotion/fullCut/fullCutDetail.vue b/manager/src/views/promotion/fullCut/fullCutDetail.vue
new file mode 100644
index 00000000..a69afe3f
--- /dev/null
+++ b/manager/src/views/promotion/fullCut/fullCutDetail.vue
@@ -0,0 +1,319 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input
+                type="text"
+                v-model="form.promotionName"
+                disabled
+                placeholder="活动名称"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="活动时间" prop="rangeTime">
+              <DatePicker
+                type="datetimerange"
+                v-model="form.rangeTime"
+                disabled
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                style="width: 320px"
+              >
+              </DatePicker>
+            </FormItem>
+            <FormItem label="活动描述" prop="description">
+              <Input
+                v-model="form.description"
+                disabled
+                type="textarea"
+                :rows="4"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+          </div>
+
+          <h4>优惠设置</h4>
+          <div class="form-item-view">
+            <FormItem label="优惠门槛" prop="fullMoney">
+              <Input
+                type="text"
+                v-model="form.fullMoney"
+                disabled
+                placeholder="优惠门槛"
+                clearable
+                style="width: 260px"
+              />
+              <span class="describe">消费达到当前金额可以参与优惠</span>
+            </FormItem>
+            <FormItem label="优惠方式">
+              <RadioGroup v-model="form.discountType">
+                <Radio label="isFullMinus" disabled>减现金</Radio>
+                <Radio label="isFullRate" disabled>打折</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem
+              v-if="form.discountType == 'isFullMinus'"
+              label="优惠金额"
+              prop="fullMinus"
+            >
+              <Input
+                type="text"
+                disabled
+                v-model="form.fullMinus"
+                placeholder="优惠金额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem
+              v-if="form.discountType == 'isFullRate'"
+              label="优惠折扣"
+              prop="fullRate"
+            >
+              <Input
+                type="text"
+                v-model="form.fullRate"
+                placeholder="优惠折扣"
+                disabled
+                clearable
+                style="width: 260px"
+              />
+              <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
+            </FormItem>
+            <FormItem label="额外赠送">
+              <Checkbox v-model="form.isFreeFreight" disabled>免邮费</Checkbox
+              >&nbsp;
+              <Checkbox v-model="form.isCoupon" disabled>送优惠券</Checkbox
+              >&nbsp;
+              <Checkbox v-model="form.isGift" disabled>送赠品</Checkbox>&nbsp;
+              <Checkbox v-model="form.isPoint" disabled>送积分</Checkbox>
+            </FormItem>
+            <FormItem v-if="form.isCoupon" label="赠送优惠券" prop="couponId">
+              <Select
+                v-model="form.couponId"
+                filterable
+                :remote-method="getCouponList"
+                placeholder="输入优惠券名称搜索"
+                disabled
+                :loading="couponLoading"
+                style="width: 260px"
+              >
+                <Option
+                  v-for="item in couponList"
+                  :value="item.id"
+                  :key="item.id"
+                  >{{ item.couponName }}</Option
+                >
+              </Select>
+            </FormItem>
+            <FormItem v-if="form.isGift" label="赠品" prop="giftId">
+              <Select
+                v-model="form.giftId"
+                filterable
+                :remote-method="getGiftList"
+                placeholder="输入赠品名称搜索"
+                disabled
+                :loading="giftLoading"
+                style="width: 260px"
+              >
+                <Option
+                  v-for="item in giftList"
+                  :value="item.id"
+                  :key="item.id"
+                  >{{ item.goodsName }}</Option
+                >
+              </Select>
+            </FormItem>
+            <FormItem v-if="form.isPoint" label="赠积分" prop="point">
+              <Input
+                v-model="form.point"
+                type="number"
+                disabled
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="使用范围" prop="scopeType">
+              <RadioGroup v-model="form.scopeType">
+                <Radio label="ALL" disabled>全品类</Radio>
+                <Radio label="PORTION_GOODS" disabled>指定商品</Radio>
+              </RadioGroup>
+            </FormItem>
+
+            <FormItem
+              style="width: 100%"
+              v-if="form.scopeType == 'PORTION_GOODS'"
+            >
+              <Table
+                border
+                :columns="columns"
+                :data="form.promotionGoodsList"
+                @on-selection-change="changeSelect"
+              >
+                <template slot-scope="{ row }" slot="QRCode">
+                  <img
+                    :src="row.QRCode || '../../../assets/lili.png'"
+                    width="50px"
+                    height="50px"
+                    alt=""
+                  />
+                </template>
+              </Table>
+            </FormItem>
+
+            <div>
+              <Button @click="$router.push({ name: 'fullCut' })">返回</Button>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getPlatformCouponList, getFullDiscountById } from "@/api/promotion";
+import { getGoodsSkuData } from "@/api/goods";
+export default {
+  name: "addFullCut",
+  data() {
+    return {
+      form: {
+        discountType: "isFullMinus",
+        scopeType: "ALL",
+        promotionGoodsList: [],
+      },
+      id: this.$route.query.id,
+      couponList: [],
+      giftList: [],
+      giftLoading: false,
+      couponList: false,
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 40,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+        {
+          title: "商品二维码",
+          slot: "QRCode",
+        },
+      ],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  async mounted() {
+    if (this.id) {
+      this.getDetail();
+    }
+    this.getCouponList();
+    this.getGiftList();
+  },
+  methods: {
+    getDetail() {
+      // 获取活动详情
+      getFullDiscountById(this.id).then((res) => {
+        let data = res.result;
+        if (!data.promotionGoodsList) {
+          data.promotionGoodsList = [];
+          data.scopeType = "ALL";
+        } else {
+          data.scopeType = "PORTION_GOODS";
+        }
+        if (data.isFullMinus) {
+          data.discountType = "isFullMinus";
+          delete data.isFullMinus;
+        } else {
+          data.discountType = "isFullMinus";
+          delete data.isFullRate;
+        }
+        data.rangeTime = [];
+        data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
+
+        this.form = data;
+      });
+    },
+    getCouponList(query) {
+      // 优惠券列表
+      let params = {
+        pageSize: 10,
+        pageNumber: 0,
+        couponName: query,
+      };
+      this.couponLoading = true;
+      getPlatformCouponList(params).then((res) => {
+        this.couponLoading = false;
+        if (res.success) {
+          this.couponList = res.result.records;
+        }
+      });
+    },
+    getGiftList(query) {
+      // 赠品列表
+      let params = {
+        pageSize: 10,
+        pageNumber: 1,
+        goodsName: query,
+      };
+      this.giftLoading = true;
+      getGoodsSkuData(params).then((res) => {
+        this.giftLoading = false;
+        if (res.success) {
+          this.giftList = res.result.records;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+</style>
+
diff --git a/manager/src/views/promotion/pintuan/pintuan.vue b/manager/src/views/promotion/pintuan/pintuan.vue
new file mode 100644
index 00000000..de0f82a3
--- /dev/null
+++ b/manager/src/views/promotion/pintuan/pintuan.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row v-show="openSearch">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="活动名称" prop="promotionName">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn"
+            >搜索</Button
+          >
+        </Form>
+      </Row>
+      <Row class="padding-row">
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+        >
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              type="info"
+              size="small"
+              @click="view(row)"
+              style="margin-right: 5px"
+              >查看</Button
+            >
+            <Button
+              type="error"
+              size="small"
+              :disabled="
+                row.promotionStatus == 'END' || row.promotionStatus == 'CLOSE'
+              "
+              @click="close(row)"
+              >关闭
+            </Button>
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getPintuanList, closePintuan } from "@/api/promotion";
+
+export default {
+  name: "pintuan",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      openSearch: true,
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime",
+        order: "desc", // 默认排序方式
+      },
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 150,
+          tooltip: true,
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          width: 110,
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: { color: color },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "所属店铺",
+          key: "storeName",
+          minWidth: 120,
+          tooltip: true,
+        },
+
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          width: 180
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          width: 180
+        },
+
+        {
+          fixed: "right",
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 200,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      getPintuanList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    view(v) {
+      this.$router.push({ name: "pintuan-goods", query: { id: v.id } });
+    },
+    close(v) {
+      this.$Modal.confirm({
+        title: "确认关闭",
+        // 记得确认修改此处
+        content: "您确认要关闭此拼团活动?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          closePintuan(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+.ivu-form-item{
+  margin-bottom: 0  !important;
+}
+</style>
diff --git a/manager/src/views/promotion/pintuan/pintuanGoods.vue b/manager/src/views/promotion/pintuan/pintuanGoods.vue
new file mode 100644
index 00000000..ba64295a
--- /dev/null
+++ b/manager/src/views/promotion/pintuan/pintuanGoods.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="pintuan-goods">
+    <Card>
+      <h4>活动详情</h4>
+      <Table
+        style="margin: 10px 0"
+        border
+        :columns="columns"
+        :data="data"
+      ></Table>
+
+      <h4>商品信息</h4>
+      <Row class="operation">
+        <Table
+          :loading="loading"
+          border
+          :columns="goodsColumns"
+          :data="goodsData"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="goodsName">
+            <span>{{ row.goodsName }}</span>
+          </template>
+          <template slot-scope="{ row }" slot="QRCode">
+            <Button @click="toBuyerGoods(row)" type="info">商品链接地址</Button>
+            <Button
+              v-if="row.QRCode != null"
+              type="success"
+              @click="viewImg(row.QRCode)"
+              >查看二维码</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page operation">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <Modal title="查看图片" v-model="visible">
+      <img
+        :src="showImg"
+        v-if="visible"
+        style="width: 200px; height: 200px; margin-left: 130px"
+      />
+    </Modal>
+  </div>
+</template>
+<script>
+import { getPintuanGoodsList, getPintuanDetail } from "@/api/promotion.js";
+import config from "@/config";
+
+const buyerUrl =
+  process.env.NODE_ENV === "development"
+    ? config.api_dev.buyer
+    : config.api_prod.buyer;
+
+export default {
+  data() {
+    return {
+      visible: false,
+      showImg: "",
+      openSearch: true, // 显示搜索
+      openTip: true, // 显示提示
+      loading: false, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          minWidth: 120
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          minWidth: 120
+        },
+        {
+          title: "成团人数",
+          key: "requiredNum",
+        },
+        {
+          title: "限购数量",
+          key: "limitNum",
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          minWidth: 100,
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+      ],
+      goodsColumns: [
+        {
+          title: "商品名称",
+          slot: "goodsName",
+          minWidth: 120,
+        },
+
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+
+        {
+          title: "拼团价格",
+          key: "price",
+          minWidth: 50,
+          render: (h, params) => {
+          return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+
+      ],
+      goodsData: [],
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+      this.getPintuanMsg();
+    },
+
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+
+    handleReset() {
+      // 重置
+      this.searchForm.pageNumber = 0;
+      this.searchForm.promotionName = "";
+      this.selectDate = null;
+      // 重新加载数据
+      this.getDataList();
+    },
+
+    getDataList() {
+      this.loading = true;
+      this.searchForm.pintuanId = this.$route.query.id;
+
+      getPintuanGoodsList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.goodsData = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+
+    getPintuanMsg() {
+      // 获取拼团详情
+      getPintuanDetail(this.$route.query.id).then((res) => {
+        if (res.success) this.data.push(res.result);
+      });
+    },
+
+    toBuyerGoods(row) {
+      window.open(
+        buyerUrl +
+          "/pages/product/product?id=" +
+          row.skuId +
+          "&goodsId=" +
+          row.goodsId
+      );
+    },
+    viewImg(img) {
+      this.showImg = img;
+      this.visible = true;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.operation {
+  margin-bottom: 10px;
+}
+h4 {
+  margin: 20px 0;
+  padding: 0 10px;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  text-align: left;
+  border-left: 3px solid red;
+}
+</style>
diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
new file mode 100644
index 00000000..369b968e
--- /dev/null
+++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
@@ -0,0 +1,458 @@
+<template>
+  <div class="wrapper">
+    <Card>
+      <Form ref="form" :model="form" :rules="formRule">
+        <div class="base-info-item">
+          <h4>添加积分商品</h4>
+          <div class="form-item-view">
+            <FormItem astyle="width: 100%">
+              <div style="display: flex; margin-bottom: 10px">
+                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                  >选择商品</Button
+                >
+                <Button
+                  type="error"
+                  ghost
+                  style="margin-left: 10px"
+                  @click="delSelectGoods"
+                  >批量删除</Button
+                >
+              </div>
+              <Table
+                border
+                :columns="columns"
+                :data="form.promotionGoodsList"
+                @on-selection-change="changeSelect"
+              >
+                <template slot-scope="{ row }" slot="skuId">
+                  <div>{{ row.skuId }}</div>
+                </template>
+
+                <template slot-scope="{ row, index }" slot="settlementPrice">
+                  <Input
+                    type="number"
+                    v-model="row.settlementPrice"
+                    @input="
+                      pointsGoodsList[index].settlementPrice =
+                        row.settlementPrice
+                    "
+                  />
+                </template>
+
+                <template
+                  slot-scope="{ row, index }"
+                  slot="pointsGoodsCategory"
+                >
+                  <Select
+                    v-model="pointsGoodsList[index].pointsGoodsCategoryId"
+                    transfer="true"
+                    label-in-value="true"
+                    @on-change="
+                      (val) => {
+                        changeCategory(val, index);
+                      }
+                    "
+                  >
+                    <Option
+                      v-for="item in categoryList"
+                      :value="item.id"
+                      :key="item.id"
+                      >{{ item.name }}</Option
+                    >
+                  </Select>
+                </template>
+
+                <template slot-scope="{ row, index }" slot="activeStock">
+                  <Input
+                    type="number"
+                    v-model="row.activeStock"
+                    @input="
+                      pointsGoodsList[index].activeStock = row.activeStock
+                    "
+                  />
+                </template>
+
+                <template slot-scope="{ row, index }" slot="points">
+                  <Input
+                    type="number"
+                    v-model="row.points"
+                    @input="pointsGoodsList[index].points = row.points"
+                  />
+                </template>
+              </Table>
+            </FormItem>
+
+            <FormItem label="兑换时间" prop="time">
+              <DatePicker
+                type="datetime"
+                v-model="form.startTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+              -
+              <DatePicker
+                type="datetime"
+                v-model="form.endTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                :options="options"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+            </FormItem>
+            <div>
+              <Button type="text" @click="closeCurrentPage">返回</Button>
+              <Button
+                type="primary"
+                :loading="submitLoading"
+                @click="handleSubmit"
+                >提交</Button
+              >
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+
+<script>
+import { addPointsGoods, getPointsGoodsCategoryList } from "@/api/promotion";
+import { regular } from "@/utils";
+import skuSelect from "@/views/lili-dialog";
+export default {
+  name: "addPoinsGoods",
+  components: {
+    skuSelect,
+  },
+  data() {
+    const isLtEndDate = (rule, value, callback) => {
+      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    const isGtStartDate = (rule, value, callback) => {
+      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    return {
+      maxHeight: "240px",
+      modalType: 0,
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+      categoryId: 0,
+      form: {
+        /** 店铺承担比例 */
+        sellerCommission: 0,
+        /** 发行数量 */
+        publishNum: 1,
+        /** 运费承担者 */
+        scopeType: "ALL",
+        /** 限领数量 */
+        couponLimitNum: 1,
+        /** 活动类型 */
+        couponType: "PRICE",
+        /** 优惠券名称 */
+        couponName: "",
+        getType: "FREE",
+        promotionGoodsList: [],
+      },
+      pointsGoodsList: [],
+      categoryList: [],
+      submitLoading: false, // 添加或编辑提交状态
+      selectedGoods: [], // 已选商品列表，便于删除
+      formRule: {
+        startTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择开始时间",
+          },
+          {
+            trigger: "change",
+            message: "开始时间要小于结束时间",
+            validator: isLtEndDate,
+          },
+        ],
+        endTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择结束时间",
+          },
+          {
+            trigger: "change",
+            message: "结束时间要大于开始时间",
+            validator: isGtStartDate,
+          },
+        ],
+        discount: [
+          { required: true, message: "请输入折扣" },
+          {
+            pattern: regular.discount,
+            message: "请输入0-10的数字,可有一位小数",
+          },
+        ],
+        sellerCommission: [
+          { required: true, message: "请输入店铺承担比例" },
+          { pattern: regular.rate, message: "请输入0-100的正整数" },
+        ],
+        publishNum: [
+          { required: true, message: "请输入发放数量" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        couponLimitNum: [
+          { required: true, message: "请输入领取限制" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        description: [{ required: true, message: "请输入范围描述" }],
+      },
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "SKU编码",
+          slot: "skuId",
+          minWidth: 120,
+        },
+        {
+          title: "店铺名称",
+          key: "sellerName",
+          minWidth: 60,
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 40,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 20,
+        },
+        {
+          title: "结算价格",
+          slot: "settlementPrice",
+          minWidth: 40,
+        },
+        {
+          title: "分类",
+          slot: "pointsGoodsCategory",
+          minWidth: 60,
+        },
+        {
+          title: "活动库存",
+          slot: "activeStock",
+          minWidth: 40,
+        },
+        {
+          title: "兑换积分",
+          slot: "points",
+          minWidth: 40,
+        },
+        {
+          title: "操作",
+          key: "action",
+          minWidth: 50,
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "Button",
+              {
+                props: {
+                  size: "small",
+                  type: "error",
+                  ghost: true,
+                },
+                on: {
+                  click: () => {
+                    this.delGoods(params.index);
+                  },
+                },
+              },
+              "删除"
+            );
+          },
+        },
+      ],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  async mounted() {
+    await this.getCategory();
+  },
+  methods: {
+    async getCategory() {
+      let res = await getPointsGoodsCategoryList();
+      this.categoryList = res.result.records;
+    },
+    /** 保存平台优惠券 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let params = this.pointsGoodsList;
+          const start = this.$options.filters.unixToDate(
+            this.form.startTime / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.endTime / 1000
+          );
+
+          if (!params || params.length == 0) {
+            this.$Modal.warning({ title: "提示", content: "请选择指定商品" });
+            return;
+          }
+
+          this.submitLoading = true;
+          params = params.map((j) => {
+            j.startTime = start;
+            j.endTime = end;
+            return j;
+          });
+          addPointsGoods(params).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("积分商品创建成功");
+              this.closeCurrentPage();
+            }
+          });
+        }
+      });
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add-poonts-goods");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+    changeCategory(val, index) {
+      this.pointsGoodsList[index].pointsGoodsCategoryName = val.label;
+    },
+    changeSelect(e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+    delSelectGoods() {
+      // 多选删除商品
+      if (this.pointsGoodsList.length <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选商品吗?",
+        onOk: () => {
+          let ids = [];
+          this.selectedGoods.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+            (item) => {
+              return !ids.includes(item.id);
+            }
+          );
+          this.pointsGoodsList = this.pointsGoodsList.filter((item) => {
+            return !ids.includes(item.id);
+          });
+        },
+      });
+    },
+    delGoods(index) {
+      // 删除商品
+      this.form.promotionGoodsList.splice(index, 1);
+      this.pointsGoodsList.splice(index, 1);
+    },
+    selectedGoodsData(item) {
+      // 回显已选商品
+      let ids = [];
+      let list = [];
+      this.form.promotionGoodsList.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            sellerName: e.sellerName,
+            skuId: e.id,
+            ...e,
+          });
+          this.pointsGoodsList.push({
+            settlementPrice: 0,
+            pointsGoodsCategoryId: 0,
+            pointsGoodsCategoryName: "",
+            activeStock: 0,
+            points: 0,
+            goodsSku: {
+              ...e,
+            },
+            skuId: e.id,
+          });
+        }
+      });
+      this.form.promotionGoodsList.push(...list);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scpoed>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+.wrapper{
+  min-height: 800px;
+}
+</style>
+
diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
new file mode 100644
index 00000000..f190404a
--- /dev/null
+++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
@@ -0,0 +1,374 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>积分商品信息</h4>
+          <div class="form-item-view">
+            <FormItem label="商品名称" prop="goodsName">
+              <div>{{ form.goodsSku.goodsName }}</div>
+            </FormItem>
+            <FormItem label="SKU编码" prop="skuId">
+              <div>{{ form.goodsSku.id }}</div>
+            </FormItem>
+            <FormItem label="店铺名称" prop="sellerName">
+              <div>{{ form.goodsSku.sellerName }}</div>
+            </FormItem>
+            <FormItem label="商品价格" prop="goodsPrice">
+              <div>{{ form.goodsSku.price }}</div>
+            </FormItem>
+            <FormItem label="库存" prop="quantity">
+              <div>{{ form.goodsSku.quantity }}</div>
+            </FormItem>
+            <FormItem label="结算价格" prop="settlementPrice">
+              <Input
+                type="num"
+                v-model="form.settlementPrice"
+                placeholder="请填写结算价格"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="分类" prop="pointsGoodsCategoryId">
+              <Select
+                v-model="form.pointsGoodsCategoryId"
+                label-in-value="true"
+                @on-change="
+                  (val) => {
+                    changeCategory(val, index);
+                  }
+                "
+              >
+                <Option
+                  v-for="item in categoryList"
+                  :value="item.id"
+                  :key="item.id"
+                  >{{ item.name }}</Option
+                >
+              </Select>
+            </FormItem>
+            <FormItem label="活动库存" prop="activeStock">
+              <Input
+                type="number"
+                v-model="form.activeStock"
+                placeholder="请填写活动库存"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="兑换积分" prop="points">
+              <Input
+                type="number"
+                v-model="form.points"
+                placeholder="请填写兑换积分"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="活动开始时间" prop="startTime">
+              <DatePicker
+                type="datetime"
+                v-model="form.startTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                :options="options"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+              -
+              <DatePicker
+                type="datetime"
+                v-model="form.endTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                :options="options"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+            </FormItem>
+          </div>
+          <div class="footer">
+            <Button @click="closeCurrentPage" style="margin-right: 5px"
+              >返回</Button
+            >
+            <Button
+              type="primary"
+              :loading="submitLoading"
+              @click="handleSubmit"
+              >保存</Button
+            >
+          </div>
+        </div>
+      </Form>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  updatePointsGoods,
+  getPointsGoodsById,
+  getPointsGoodsCategoryList,
+} from "@/api/promotion";
+import { format } from "date-fns";
+
+export default {
+  name: "addCoupon",
+  data() {
+    return {
+      maxHeight: "240px",
+      modalType: 0,
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+      categoryId: 0,
+      form: {
+        /** 活动名称 */
+        promotionName: "",
+        /** 报名截止时间 */
+        applyEndTime: "",
+        /** 活动开始时间 */
+        startTime: "",
+        /** 抢购时间段 */
+        seckillPeriod: [],
+        /** 申请规则 */
+        seckillRule: "",
+        goodsSku: {},
+        promotionStatus: "NEW",
+      },
+      categoryList: [],
+      id: this.$route.query.id,
+      periodTime: 0,
+      submitLoading: false, // 添加或编辑提交状态
+
+      formRule: {
+        settlementPrice: [{ required: true, message: "请填写结算价格" }],
+        pointsGoodsCategoryId: [
+          { required: true, message: "请选择积分商品分类" },
+        ],
+        points: [{ required: true, message: "请填写兑换积分" }],
+        startTime: [{ required: true, message: "请填写活动开始时间" }],
+      },
+    };
+  },
+  async mounted() {
+    await this.getCategory();
+    // 如果id不为空则查询信息
+    if (this.id) {
+      this.getData();
+      this.modalType = 1;
+    }
+  },
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "edit-points-goods");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+    getData() {
+      getPointsGoodsById(this.id).then((res) => {
+        if (res.success) {
+          let data = res.result;
+          this.form = data;
+        }
+      });
+    },
+    async getCategory() {
+      let res = await getPointsGoodsCategoryList();
+      this.categoryList = res.result.records;
+    },
+    /** 保存平台优惠券 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const start = this.$options.filters.unixToDate(
+            this.form.startTime / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.endTime / 1000
+          );
+          this.form.startTime = start;
+          this.form.endTime = end;
+          this.submitLoading = true;
+          updatePointsGoods(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("积分商品修改成功");
+              this.closeCurrentPage();
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    color: gray;
+    text-align: left;
+  }
+}
+
+/*平铺*/
+div.base-info-item > div {
+  margin-left: 5%;
+}
+
+div.base-info-item {
+  margin-bottom: 10px;
+
+  h4 {
+    margin-bottom: 10px;
+    padding: 0 10px;
+    border: 1px solid #ddd;
+    background-color: #f8f8f8;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+    line-height: 40px;
+    text-align: left;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 80px;
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 100%;
+  padding: 10px;
+  background-color: #ffc;
+  position: fixed;
+  bottom: 0px;
+  right: 0;
+  text-align: center;
+  z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.step-view {
+  width: 33%;
+  height: 40px;
+  font-size: 19px;
+  text-align: center;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+}
+
+.page {
+  margin-top: 2vh;
+  margin-bottom: 5vh;
+}
+</style>
diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
new file mode 100644
index 00000000..c1c148bb
--- /dev/null
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="商品名称">
+            <Input
+              type="text"
+              v-model="searchForm.goodsName"
+              placeholder="请输入商品名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="积分区间">
+            <Input
+              type="text"
+              v-model="searchForm.pointsS"
+              placeholder="请输入开始区间"
+              clearable
+              style="width: 200px"
+            />
+            -
+            <Input
+              type="text"
+              v-model="searchForm.pointsE"
+              placeholder="请输入结束区间"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="状态">
+            <Select v-model="searchForm.promotionStatus" style="width: 200px">
+              <Option
+                v-for="item in statusList"
+                :value="item.value"
+                :key="item.value"
+                >{{ item.label }}</Option
+              >
+            </Select>
+          </Form-item>
+          <Form-item label="SKU编码">
+            <Input
+              type="text"
+              v-model="searchForm.skuId"
+              placeholder="请输入SKU编码"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
+
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+        >
+          <template slot-scope="{ row }" slot="goodsName">
+            <div class="div-zoom" >
+              <a>{{ row.goodsSku.goodsName }}</a>
+            </div>
+          </template>
+          <template slot-scope="{ row }" slot="price">
+            <div>{{ row.goodsSku.price | unitPrice("￥") }}</div>
+          </template>
+          <template slot-scope="{ row }" slot="settlementPrice">
+            <div>{{ row.settlementPrice | unitPrice("￥") }}</div>
+          </template>
+          <template slot-scope="{ row }" slot="quantity">
+            <div>{{ row.goodsSku.quantity }}</div>
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              v-if="row.promotionStatus == 'NEW'"
+              type="info"
+              size="small"
+              @click="edit(row.id)"
+              style="margin-right: 5px"
+              >编辑</Button
+            >
+            <Button
+              v-if="row.promotionStatus == 'START'"
+              type="warning"
+              size="small"
+              @click="statusChanged(row.id, 'CLOSE')"
+              style="margin-right: 5px"
+              >停用</Button
+            >
+            <Button
+              v-if="row.promotionStatus == 'CLOSE'"
+              type="warning"
+              size="small"
+              @click="statusChanged(row.id, 'START')"
+              style="margin-right: 5px"
+              >启用</Button
+            >
+            <Button type="error" size="small" @click="close(row.id)"
+              >删除</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  getPointsGoodsList,
+  editPointsGoodsStatus,
+  deletePointsGoodsStatus,
+} from "@/api/promotion";
+export default {
+  name: "pointsGoods",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        order: "desc", // 默认排序方式
+      },
+      statusList: [
+        { label: "未开始", value: "NEW" },
+        { label: "已开始", value: "START" },
+        { label: "已结束", value: "END" },
+        { label: "已关闭", value: "CLOSE" },
+      ],
+      columns: [
+        {
+          title: "商品名称",
+          slot: "goodsName",
+          minWidth: 120,
+          tooltip: true,
+        },
+        {
+          title: "市场价",
+          slot: "price",
+          minWidth: 60,
+        },
+        {
+          title: "结算价",
+          slot: "settlementPrice",
+          minWidth: 60,
+        },
+        {
+          title: "分类",
+          key: "pointsGoodsCategoryName",
+          minWidth: 60,
+        },
+        {
+          title: "库存数量",
+          slot: "quantity",
+          minWidth: 60,
+        },
+        {
+          title: "活动剩余库存",
+          key: "activeStock",
+          minWidth:90,
+        },
+        {
+          title: "兑换积分",
+          key: "points",
+          minWidth: 60,
+        },
+        {
+          title: "所属店铺",
+          key: "storeName",
+          minWidth: 60,
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          minWidth: 140,
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          minWidth: 140,
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          minWidth: 60,
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [h("Tag", { props: { color: color } }, text)]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 150,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    addPointsGoods() {
+      this.$router.push({ name: "add-points-goods" });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      if (this.searchForm.pointsS !== "") {
+        this.searchForm.points =
+          this.searchForm.pointsS +
+          "_" +
+          (this.searchForm.pointsE ? this.searchForm.pointsE : "");
+      }
+
+      this.getDataList();
+    },
+
+    getDataList() {
+      this.loading = true;
+      getPointsGoodsList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    edit(id) {
+      this.$router.push({ name: "edit-points-goods", query: { id: id } });
+    },
+    statusChanged(id, status) {
+      let text = "";
+      if (status == "START") {
+        text = "开启";
+      } else if (status == "CLOSE") {
+        text = "关闭";
+      }
+      this.$Modal.confirm({
+        title: "确认" + text,
+        content: "您确认要" + text + "此积分商品?",
+        loading: true,
+        onOk: () => {
+          editPointsGoodsStatus(id, {
+            promotionStatus: status,
+          }).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success(text + "成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    close(id) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除此积分商品?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deletePointsGoodsStatus(id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue b/manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue
new file mode 100644
index 00000000..356927d0
--- /dev/null
+++ b/manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue
@@ -0,0 +1,217 @@
+<template>
+  <div>
+    <div class="operation">
+      <Button @click="addParent" icon="md-add">添加积分商品分类</Button>
+      <Button icon="md-refresh" @click="refresh">刷新</Button>
+    </div>
+    <tree-table
+      ref="treeTable"
+      size="default"
+      :loading="loading"
+      :data="tableData"
+      :columns="columns"
+      :border="true"
+      :show-index="false"
+      :is-fold="true"
+      :expand-type="false"
+      primary-key="id"
+    >
+      <template slot="action" slot-scope="scope">
+        <Dropdown transfer="true" trigger="click">
+          <Button type="primary" size="small">
+            操作
+            <Icon type="ios-arrow-down"></Icon>
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
+            <DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </template>
+    </tree-table>
+
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="form"
+        :model="formAdd"
+        :label-width="100"
+        :rules="formValidate"
+      >
+        <FormItem label="分类名称" prop="name">
+          <Input v-model="formAdd.name" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="排序值" prop="sortOrder">
+          <Input v-model="formAdd.sortOrder" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="Submit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import {
+  getPointsGoodsCategoryList,
+  addPointsGoodsCategory,
+  updatePointsGoodsCategory,
+  deletePointsGoodsCategoryById,
+} from "@/api/promotion";
+import TreeTable from "@/views/my-components/tree-table/Table/Table";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+export default {
+  name: "pointsGoodsCategory",
+  components: {
+    TreeTable,
+    uploadPicInput,
+  },
+  data() {
+    return {
+      currView: "index",
+      loading: false,
+      selectCount: 0,
+      categoryId: "",
+      expandLevel: 1,
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      showParent: false, // 是否展示上级菜单
+      parentTitle: "", // 父级菜单名称
+      formAdd: {
+        // 添加或编辑表单对象初始化数据
+        parentId: 0,
+        name: "",
+        deleteFlag: 0,
+        level: 0,
+      },
+      // 表单验证规则
+      formValidate: {
+        name: [{ required: true, message: "商品分类名称不能为空" }],
+      },
+      columns: [
+        {
+          title: "分类名称",
+          key: "name",
+          minWidth: "120px",
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          headerAlign: "center",
+          width: "400px",
+          type: "template",
+          template: "action",
+        },
+      ],
+      tableData: [],
+    };
+  },
+  methods: {
+    init() {
+      this.getAllList();
+    },
+    refresh() {
+      this.loading = true;
+      let that = this;
+      setTimeout(function () {
+        that.loading = false;
+      }, 1000);
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.formAdd.id = v.id;
+      this.formAdd.name = v.name;
+      this.formAdd.sortOrder = v.sortOrder;
+      this.showParent = false;
+      this.modalVisible = true;
+    },
+    addParent() {
+      this.modalType = 0;
+      this.modalTitle = "添加积分商品分类";
+      this.parentTitle = "顶级分类";
+      this.showParent = true;
+      this.$refs.form.resetFields();
+      delete this.formAdd.id;
+      this.formAdd.parentId = 0;
+      this.modalVisible = true;
+    },
+    Submit() {
+      this.$refs.form.validate((valid) => {
+        console.log(valid);
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.formAdd.id;
+            addPointsGoodsCategory(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加成功");
+                this.getAllList();
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          } else {
+            // 编辑
+            updatePointsGoodsCategory(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+                this.getAllList();
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          }
+        }
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deletePointsGoodsCategoryById(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList();
+            }
+          });
+        },
+      });
+    },
+    getAllList() {
+      this.loading = true;
+      getPointsGoodsCategoryList().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.tableData = res.result.records;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+
+</style>
diff --git a/manager/src/views/promotion/seckill/addSeckill.scss b/manager/src/views/promotion/seckill/addSeckill.scss
new file mode 100644
index 00000000..9ade9445
--- /dev/null
+++ b/manager/src/views/promotion/seckill/addSeckill.scss
@@ -0,0 +1,264 @@
+/*选择商品品类*/
+.content-goods-publish {
+  padding: 15px;
+  margin: 0 auto;
+  text-align: center;
+  border: 1px solid #ddd;
+  background: none repeat 0 0 #fff;
+  height: 100%;
+  margin-bottom: 20px;
+
+  /*商品品类*/
+  .goods-category {
+    text-align: left;
+    padding: 10px;
+    background: #fafafa;
+    border: 1px solid #e6e6e6;
+
+    ul {
+      padding: 8px 4px 8px 8px;
+      list-style: none;
+      width: 300px;
+      background: none repeat 0 0 #fff;
+      border: 1px solid #e6e6e6;
+      display: inline-block;
+      letter-spacing: normal;
+      margin-right: 15px;
+      vertical-align: top;
+      word-spacing: normal;
+
+      li {
+        line-height: 20px;
+        padding: 5px;
+        cursor: pointer;
+        color: #333;
+        font-size: 12px;
+        display: flex;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  /** 当前品类被选中的样式 */
+  .activeClass {
+    background-color: #d9edf7;
+    border: 1px solid #bce8f1;
+    color: #3a87ad;
+  }
+
+  /*!*当前选择的商品品类文字*!*/
+  .current-goods-category {
+    text-align: left;
+    padding: 10px;
+    width: 100%;
+    border: 1px solid #fbeed5;
+    color: #c09853;
+    background-color: #fcf8e3;
+    margin: 10px auto;
+    padding: 8px 35px 8px 14px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    font-weight: bold;
+  }
+}
+
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    color: gray;
+    text-align: left;
+  }
+}
+
+getGoodsCategoryLevelList
+
+/*平铺*/
+div.base-info-item>div {
+  margin-left: 5%;
+}
+
+div.base-info-item {
+
+  h4 {
+    margin-bottom: 10px;
+    padding: 0 10px;
+    border: 1px solid #ddd;
+    background-color: #f8f8f8;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+    line-height: 40px;
+    text-align: left;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 80px;
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+  /deep/ .el-collapse-item__header {
+    text-align: left;
+    background-color: #f8f8f8;
+    padding: 0 10px;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+  }
+
+  .el-form-item {
+    margin-left: 5%;
+    width: 25%;
+  }
+
+  /deep/ .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 12%;
+    text-align: left;
+    color: #999;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding: 10px 0;
+    text-align: left;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 88.7%;
+  padding: 10px;
+  background-color: #ffc;
+  position: fixed;
+  bottom: 0px;
+  left: 10%;
+  text-align: center;
+  z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.step-view {
+  width: 33%;
+  height: 40px;
+  font-size: 19px;
+  text-align: center;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+}
+
+.page {
+  margin-top: 2vh;
+  margin-bottom: 5vh;
+}
diff --git a/manager/src/views/promotion/seckill/addSeckill.vue b/manager/src/views/promotion/seckill/addSeckill.vue
new file mode 100644
index 00000000..7bcc8615
--- /dev/null
+++ b/manager/src/views/promotion/seckill/addSeckill.vue
@@ -0,0 +1,222 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input
+                type="text"
+                v-model="form.promotionName"
+                placeholder="请填写活动名称"
+                clearable
+                :disabled="form.promotionStatus != 'NEW'"
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="报名截止时间" prop="applyEndTime">
+              <DatePicker
+                type="datetime"
+                v-model="form.applyEndTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                clearable
+                :disabled="form.promotionStatus != 'NEW'"
+                style="width: 200px"
+              >
+              </DatePicker>
+            </FormItem>
+            <FormItem label="活动开始时间" prop="startTime">
+              <DatePicker
+                type="datetime"
+                v-model="form.startTime"
+                :disabled="form.promotionStatus != 'NEW'"
+                format="yyyy-MM-dd"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+            </FormItem>
+            <FormItem label="抢购时间段" prop="seckillPeriod">
+              <Tag
+                v-for="item in form.seckillPeriod"
+                :key="item"
+                :name="item"
+                closable
+                style="marrgin-left: 10px"
+                @on-close="removePeriodTime"
+                >{{ item >= 10 ? item : "0" + item }}:00</Tag
+              >
+              <InputNumber
+                :max="23"
+                :min="0"
+                v-model="periodTime"
+                v-show="showAddPeriod"
+                @on-blur="addPeriodTime"
+              ></InputNumber>
+              <Button
+                type="default"
+                @click="addPeriod"
+                v-if="form.promotionStatus == 'NEW'"
+                >添加时间段</Button
+              >
+            </FormItem>
+            <FormItem label="申请规则" prop="seckillRule">
+              <Input
+                type="text"
+                v-model="form.seckillRule"
+                placeholder="申请规则"
+                clearable
+                :disabled="form.promotionStatus != 'NEW'"
+                style="width: 260px"
+              />
+            </FormItem>
+          </div>
+          <div class="foot-btn">
+            <Button @click="closeCurrentPage" style="margin-right: 5px">返回</Button>
+            <Button
+              type="primary"
+              :loading="submitLoading"
+              v-if="form.promotionStatus == 'NEW'"
+              @click="handleSubmit"
+              >提交</Button
+            >
+          </div>
+        </div>
+      </Form>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { saveSeckill, updateSeckill, seckillDetail } from "@/api/promotion";
+
+export default {
+  name: "addSeckill",
+  data() {
+    return {
+      maxHeight: "240px",
+      modalType: 0,
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+      categoryId: 0,
+      form: {
+        /** 活动名称 */
+        promotionName: "",
+        /** 报名截止时间 */
+        applyEndTime: "",
+        /** 活动开始时间 */
+        startTime: "",
+        /** 抢购时间段 */
+        seckillPeriod: [],
+        /** 申请规则 */
+        seckillRule: "",
+        promotionStatus: "NEW",
+      },
+      id: this.$route.query.id,
+      periodTime: null,
+      showAddPeriod: false,
+      submitLoading: false, // 添加或编辑提交状态
+
+      formRule: {
+        promotionName: [{ required: true, message: "请填写活动名称" }],
+        applyEndTime: [{ required: true, message: "请填写报名截止时间" }],
+        seckillPeriod: [{ required: true, message: "请填写抢购时间段" }],
+        startTime: [{ required: true, message: "请填写活动开始时间" }],
+        seckillRule: [{ required: true, message: "请输入申请规则" }],
+      },
+    };
+  },
+  mounted() {
+    // 如果id不为空则查询信息
+    if (this.id) {
+      this.getData();
+      this.modalType = 1;
+    }
+  },
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "manager-seckill-add");
+      localStorage.pageOpenedList = JSON.stringify(this.$store.state.app.pageOpenedList);
+      this.$router.go(-1);
+    },
+    getData() {
+      seckillDetail(this.id).then((res) => {
+        if (res.success) {
+          let data = res.result;
+          data.seckillPeriod = res.result.hours.split(",");
+          this.form = data;
+        }
+      });
+    },
+    addPeriod() {
+      this.addPeriodTime();
+      this.showAddPeriod = true;
+    },
+    addPeriodTime() {
+      this.showAddPeriod = false;
+      if (
+        this.periodTime !== null &&
+        !this.form.seckillPeriod.includes(this.periodTime)
+      ) {
+        this.form.seckillPeriod.push(this.periodTime);
+      }
+    },
+    removePeriodTime(event, name) {
+      this.form.seckillPeriod = this.form.seckillPeriod.filter((i) => i !== name);
+    },
+    handleSelectLink(item, index) {
+      // 调起选择链接弹窗
+      if (item) this.selectedNav = item;
+      this.$refs.liliDialog.open('link')
+    },
+    changeScope(val) {
+      if (val === "PORTION_GOODS") {
+        this.handleSelectLink();
+      }
+    },
+    /** 保存平台优惠券 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          this.form.hours = this.form.seckillPeriod.toString();
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            saveSeckill(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res && res.success) {
+                this.$Message.success("限时抢购活动添加成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            delete this.form.createTime;
+            delete this.form.updateTime;
+            delete this.form.endTime;
+            // 编辑
+            updateSeckill(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res && res.success) {
+                this.$Message.success("限时抢购活动修改成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "addSeckill.scss";
+.ivu-form-item{
+  margin-bottom: 30px;
+}
+</style>
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
new file mode 100644
index 00000000..43015173
--- /dev/null
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="seckill">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="活动名称" prop="promotionName">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+
+          <Button
+            @click="handleSearch"
+            type="primary"
+            icon="ios-search"
+            class="search-btn"
+            >搜索</Button
+          >
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button type="primary" @click="add">添加活动</Button>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          class="page"
+        >
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              type="info"
+              size="small"
+              class="mr_5"
+              v-if="row.promotionStatus == 'NEW'"
+              @click="edit(row)"
+              >编辑</Button
+            >
+            &nbsp;
+            <Button
+              type="info"
+              size="small"
+              class="mr_5"
+              v-else
+              @click="manage(row)"
+              >查看</Button
+            >
+            &nbsp;
+            <Button
+              type="primary"
+              size="small"
+              class="mr_5"
+              v-if="row.promotionStatus == 'NEW'"
+              @click="manage(row)"
+              >管理</Button
+            >
+            &nbsp;
+            <!-- <Button type="success" size="small" class="mr_5" v-if="row.promotionStatus == 'NEW' || row.promotionStatus == 'END'" @click="upper(row)">上架</Button>   -->
+            <Button
+              type="error"
+              size="small"
+              v-if="
+                row.promotionStatus == 'START' || row.promotionStatus == 'NEW'
+              "
+              class="mr_5"
+              @click="off(row)"
+              >下架</Button
+            >
+            &nbsp;
+            <Button
+              type="error"
+              size="small"
+              v-if="row.promotionStatus == 'CLOSE'"
+              ghost
+              @click="expire(row)"
+              >删除</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getSeckillList, delSeckill, closeSeckill } from "@/api/promotion";
+export default {
+  name: "seckill",
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime",
+        order: "desc", // 默认排序方式
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 130,
+          tooltip: true,
+        },
+
+        {
+          title: "开始时间",
+          key: "startTime",
+          width: 180,
+        },
+        {
+          title: "申请截止时间",
+          key: "applyEndTime",
+          width: 180,
+        },
+
+        {
+          title: "活动状态",
+          key: "promotionStatus",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.promotionStatus == "NEW") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "新建",
+                  },
+                }),
+              ]);
+            } else if (params.row.promotionStatus == "START") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "开始",
+                  },
+                }),
+              ]);
+            } else if (params.row.promotionStatus == "END") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "结束",
+                  },
+                }),
+              ]);
+            } else if (params.row.promotionStatus == "CLOSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "废弃",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+
+        {
+          title: "申请规则",
+          key: "seckillRule",
+          minWidth: 120,
+          tooltip: true,
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 250,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    add() {
+      // 添加
+      this.$router.push({ name: "manager-seckill-add" });
+    },
+    edit(v) {
+      // 编辑
+      this.$router.push({ name: "manager-seckill-add", query: { id: v.id } });
+    },
+    manage(v) {
+      // 管理
+      this.$router.push({ name: "seckill-goods", query: { id: v.id } });
+    },
+
+    off(v) {
+      // 下架
+      this.$Modal.confirm({
+        title: "提示",
+        content: "您确定要下架该活动吗？",
+        onOk: () => {
+          closeSeckill(v.id).then((res) => {
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    expire(v) {
+      // 作废
+      this.$Modal.confirm({
+        title: "提示",
+        content: "您确定要作废该活动吗？",
+        onOk: () => {
+          delSeckill(v.id).then((res) => {
+            if (res.success) {
+              this.$Message.success("作废成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      // 带多条件搜索参数获取表单数据
+      getSeckillList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/promotion/seckill/seckillGoods.vue b/manager/src/views/promotion/seckill/seckillGoods.vue
new file mode 100644
index 00000000..485bcef0
--- /dev/null
+++ b/manager/src/views/promotion/seckill/seckillGoods.vue
@@ -0,0 +1,479 @@
+<template>
+  <div class="seckill-goods">
+    <Card>
+      <Table border :columns="columns" :data="data">
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{ item }}</Tag>
+        </template>
+      </Table>
+
+      <Row class="operation">
+        <Button @click="auditAll">批量审核</Button>
+        <Button
+          type="dashed"
+          @click="
+            () => {
+              openTip = !openTip;
+            }
+          "
+        >{{ openTip ? "关闭提示" : "开启提示" }}
+        </Button
+        >
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Row class="operation">
+        <Table
+          :loading="loading"
+          border
+          :columns="goodsColumns"
+          :data="goodsList"
+          ref="table"
+          sortable="custom"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="originalPrice">
+            <div>{{ row.originalPrice | unitPrice("￥") }}</div>
+          </template>
+
+          <template slot-scope="{ row }" slot="quantity">
+            <div>{{ row.quantity }}</div>
+          </template>
+
+          <template slot-scope="{ row }" slot="price">
+            <div>{{ row.price | unitPrice("￥") }}</div>
+          </template>
+
+          <template slot-scope="{ row }" slot="promotionApplyStatus">
+            <Badge
+              status="success"
+              v-if="row.promotionApplyStatus == 'PASS'"
+              :text="promotionApplyStatus(row.promotionApplyStatus)"
+            />
+            <Badge
+              status="blue"
+              v-if="row.promotionApplyStatus == 'APPLY'"
+              :text="promotionApplyStatus(row.promotionApplyStatus)"
+            />
+            <Badge
+              status="error"
+              v-if="row.promotionApplyStatus == 'REFUSE'"
+              :text="promotionApplyStatus(row.promotionApplyStatus)"
+            />
+            <span
+              v-if="row.promotionApplyStatus == 'REFUSE'"
+              @click="showReason(row.failReason)"
+              class="reason"
+            >（拒绝原因）</span
+            >
+          </template>
+          <template slot-scope="{ row }" slot="time">
+            <Tag>{{ row.timeLine + ":00" }}</Tag>
+          </template>
+          <template slot-scope="{ row }" slot="QRCode">
+            <img
+              v-if="row.QRCode"
+              :src="row.QRCode || '../../../assets/lili.png'"
+              width="50px"
+              height="50px"
+              alt=""
+            />
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              type="success"
+              size="small"
+              style="margin-right: 10px"
+              :disabled="row.promotionApplyStatus != 'APPLY'"
+              @click="pass(row)"
+            >通过
+            </Button
+            >
+            <Button
+              type="error"
+              size="small"
+              :disabled="row.promotionApplyStatus != 'APPLY'"
+              @click="refuse(row)"
+            >拒绝
+            </Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+    <Modal v-model="showModal" title="审核商品">
+      <Form ref="form" :model="params" :rules="rules">
+        <FormItem label="审核状态">
+          <RadioGroup v-model="params.applyStatus">
+            <Radio label="PASS">通过</Radio>
+            <Radio label="REFUSE">拒绝</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem
+          label="拒绝原因"
+          prop="failReason"
+          v-if="params.applyStatus == 'REFUSE'"
+        >
+          <Input
+            type="textarea"
+            v-model="params.failReason"
+            maxlength="50"
+            style="width: 260px"
+            show-word-limit
+          />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button size="small" @click="showModal = false">取消</Button>
+        <Button
+          size="small"
+          type="primary"
+          :loading="submitLoading"
+          @click="sureAudit"
+        >确定
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+  import {
+    seckillGoodsList,
+    seckillDetail,
+    auditApplySeckill,
+  } from "@/api/promotion.js";
+
+  export default {
+    data() {
+      return {
+        promotionStatus: "",
+        showModal: false,
+        openTip: true,
+        loading: false, // 表单加载状态
+        submitLoading: false,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 0, // 当前页数
+          pageSize: 100, // 页面大小
+        },
+        total: 0,
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        data: [], // 表单数据
+        columns: [
+          {
+            title: "活动名称",
+            key: "promotionName",
+            minWidth: 120,
+          },
+          {
+            title: "活动开始时间",
+            key: "startTime",
+          },
+          {
+            title: "报名截止时间",
+            slot: "applyEndTime",
+          },
+          {
+            title: "时间场次",
+            slot: "hours",
+          },
+          {
+            title: "活动状态",
+            key: "promotionStatus",
+            minWidth: 80,
+            sortable: false,
+            render: (h, params) => {
+              if (params.row.promotionStatus == "NEW") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "新建",
+                    },
+                  }),
+                ]);
+              } else if (params.row.promotionStatus == "START") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "success",
+                      text: "开始",
+                    },
+                  }),
+                ]);
+              } else if (params.row.promotionStatus == "END") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "结束",
+                    },
+                  }),
+                ]);
+              } else if (params.row.promotionStatus == "CLOSE") {
+                return h("div", [
+                  h("Badge", {
+                    props: {
+                      status: "error",
+                      text: "废弃",
+                    },
+                  }),
+                ]);
+              }
+            },
+          },
+        ],
+        goodsColumns: [
+          {type: "selection", width: 60, align: "center"},
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "商品价格",
+            slot: "originalPrice",
+            width: 110,
+          },
+          {
+            title: "库存",
+            slot: "quantity",
+            minWidth: 30,
+            width: 90
+          },
+          {
+            title: "活动价格",
+            slot: "price",
+            width: 100,
+          },
+          {
+            title: "商家名称",
+            key: "storeName",
+            minWidth: 100,
+            tooltip: true
+
+          },
+          {
+            title: "活动场次",
+            width: 100,
+            slot: "time",
+          },
+          {
+            title: "状态",
+            slot: "promotionApplyStatus",
+            minWidth: 30,
+            width: 90,
+          },
+
+          {
+            title: "操作",
+            slot: "action",
+            width: 150,
+            align: "center",
+          },
+        ],
+        goodsList: [],
+        params: {
+          seckillId: this.$route.query.id,
+          applyStatus: "PASS",
+          failReason: "",
+          ids: "",
+        },
+        rules: {
+          failReason: [{required: true, message: "请输入拒绝原因"}],
+        },
+      };
+    },
+    methods: {
+      init() {
+        this.getSeckillMsg();
+      },
+
+      changePage(v) {
+        this.searchForm.pageNumber = v - 1;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+
+      changeSelect(e) {
+        // 获取选择数据
+        this.selectList = e;
+        this.selectCount = e.length;
+        let ids = [];
+        this.selectList.forEach((item) => {
+          ids.push(e.id);
+        });
+        this.params.ids = ids.toString();
+      },
+
+      getDataList() {
+        // 获取商品详情
+        this.loading = true;
+        this.searchForm.seckillId = this.$route.query.id;
+        seckillGoodsList(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success && res.result) {
+            this.goodsList = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+
+      getSeckillMsg() {
+        // 获取活动详情
+        seckillDetail(this.$route.query.id).then((res) => {
+          if (res.success && res.result) {
+            this.data = [];
+            this.data.push(res.result);
+            this.promotionStatus = res.result.promotionStatus;
+            this.getDataList();
+          }
+        });
+      },
+      delGoods(index) {
+        // 删除商品
+        this.goodsList.list.splice(index, 1);
+      },
+
+      unixDate(time) {
+        // 处理报名截止时间
+        return this.$options.filters.unixToDate(new Date(time) / 1000);
+      },
+      unixHours(item) {
+        // 处理小时场次
+        let hourArr = item.split(",");
+        for (let i = 0; i < hourArr.length; i++) {
+          hourArr[i] += ":00";
+        }
+        return hourArr;
+      },
+      promotionApplyStatus(key) {
+        switch (key) {
+          case "APPLY":
+            return "申请";
+            break;
+          case "PASS":
+            return "通过";
+            break;
+          case "REFUSE":
+            return "拒绝";
+            break;
+        }
+      },
+      pass(row) {
+        // 通过
+        let params = {
+          seckillId: this.$route.query.id,
+          applyStatus: "PASS",
+          failReason: "",
+          ids: row.id,
+        };
+        auditApplySeckill(params).then((res) => {
+          if (res && res.success) {
+            this.$Message.success("已通过该商品审核");
+            this.getDataList();
+          }
+        });
+      },
+      refuse(row) {
+        // 拒绝
+        this.params.applyStatus = "REFUSE";
+        this.selectList.push(row);
+        this.showModal = true;
+      },
+      auditAll() {
+        // 批量审核
+        if (this.selectCount <= 0) {
+          this.$Message.warning("您还未选择要审核的商品");
+          return;
+        }
+        this.showModal = true;
+      },
+      sureAudit() {
+        this.selectCount = this.selectList.length;
+        // 批量审核
+        if (this.selectCount <= 0) {
+          this.$Message.warning("您还未选择要审核的商品");
+          return;
+        }
+        this.params.ids = this.selectList
+          .filter((i) => i.promotionApplyStatus === "APPLY")
+          .map((i) => i.id);
+        if (this.params.ids.length <= 0) {
+          this.$Message.warning("当前没有可审核的商品");
+          return;
+        }
+        if (
+          this.params.applyStatus == "REFUSE" &&
+          this.params.failReason === ""
+        ) {
+          this.$Message.warning("审核拒绝理由不能为空");
+          return;
+        }
+        this.submitLoading = true;
+        auditApplySeckill(this.params).then((res) => {
+          this.submitLoading = false;
+          if (res.success) {
+            this.showModal = false;
+            this.$Message.success("审核成功");
+            this.selectList = [];
+            this.getDataList();
+          }
+        });
+      },
+      showReason(reason) {
+        this.$Modal.info({
+          title: "拒绝原因",
+          content: reason,
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  .operation {
+    margin: 10px 0;
+  }
+
+  .reason {
+    cursor: pointer;
+    color: #2d8cf0;
+    font-size: 12px;
+  }
+</style>
diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue
new file mode 100644
index 00000000..1e34f4fa
--- /dev/null
+++ b/manager/src/views/region/index.vue
@@ -0,0 +1,365 @@
+<template>
+  <Card>
+    <Row class="operation">
+      <Button @click="asyncRegion"  :loading="asyncLoading" type="primary" icon="md-add"
+        >同步数据</Button
+      >
+    </Row>
+    <div class="flex">
+      <Spin size="large" fix v-if="spinShow"></Spin>
+      <Tree
+        class="tree"
+        :data="data"
+        :load-data="loadData"
+        expand-node
+        @on-select-change="changeTree"
+      ></Tree>
+      <div class="form">
+        <Form
+          ref="formValidate"
+          :model="formValidate"
+          :rules="ruleValidate"
+          :label-width="100"
+        >
+          <FormItem v-if="formValidate.adCode" prop="adCode" label="区域编码">
+            <Input v-model="formValidate.adCode" />
+          </FormItem>
+          <FormItem label="城市代码" prop="cityCode">
+            <Input v-model="formValidate.cityCode" />
+          </FormItem>
+          <FormItem label="行政区划级别" prop="cityCode">
+            <RadioGroup v-model="formValidate.level">
+              <Radio disabled label="country">国家</Radio>
+              <Radio disabled label="province">省份</Radio>
+              <Radio disabled label="city">市</Radio>
+              <Radio disabled label="district">区县</Radio>
+              <Radio disabled label="street">街道</Radio>
+            </RadioGroup>
+          </FormItem>
+
+          <FormItem label="经纬度" prop="center">
+            <Input v-model="formValidate.center" />
+          </FormItem>
+          <FormItem label="名称" prop="name">
+            <Input v-model="formValidate.name" />
+          </FormItem>
+          <FormItem label="排序" prop="orderNum">
+            <Input v-model="formValidate.orderNum" />
+          </FormItem>
+
+          <div class="button-list">
+            <Button type="default" @click="handleUpdate('formValidate')"
+              >修改</Button
+            >
+            <Button type="primary" ghost @click="handleInsert()">添加</Button>
+            <Button type="error" @click="handleDel('formValidate')"
+              >删除</Button
+            >
+          </div>
+        </Form>
+      </div>
+    </div>
+
+    <Modal v-model="modalFlag" title="添加" @on-ok="submit">
+      <Form ref="addValidate" :model="addValidate" :label-width="100">
+        <FormItem label="父级">
+          <Input disabled v-model="addValidate.parentName" />
+        </FormItem>
+        <FormItem prop="adCode" label="区域编码">
+          <Input v-model="addValidate.adCode" />
+        </FormItem>
+        <FormItem label="城市代码" prop="cityCode">
+          <Input v-model="addValidate.cityCode" />
+        </FormItem>
+
+        <FormItem label="经纬度" prop="center">
+          <Input v-model="addValidate.center" />
+        </FormItem>
+        <FormItem label="名称" prop="name">
+          <Input v-model="addValidate.name" />
+        </FormItem>
+        <FormItem label="排序" prop="orderNum">
+          <Input v-model="addValidate.orderNum" />
+        </FormItem>
+      </Form>
+    </Modal>
+  </Card>
+</template>
+<script>
+import {
+  getChildRegion,
+  updateRegion,
+  getRegionDetail,
+  delRegion,
+  asyncRegion,
+  addRegion,
+} from "@/api/index";
+export default {
+  data() {
+    return {
+      asyncLoading:false,
+      num: 10,
+      modalFlag: false,
+      spinShow: false,
+      timerNum: 10,
+      data: [],
+      id: 0,
+      addValidate: {
+        parentName: "无父级",
+      },
+      formValidate: {
+        adCode: "",
+        cityCode: "",
+        center: "",
+        name: "",
+        orderNum: "",
+        level: "",
+      },
+      ruleValidate: {
+        adCode: [
+          {
+            required: true,
+            message: "区域编码不能为空",
+            trigger: "blur",
+          },
+        ],
+
+        center: [
+          {
+            required: true,
+            message: "经纬度不能为空",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: "名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    submit() {
+      delete this.addValidate.children;
+      addRegion(this.addValidate).then((res) => {
+        if (res.success) {
+          this.$Message.success("添加成功!请稍后查看");
+        }
+      });
+    },
+
+    // 添加
+    handleInsert() {
+      if (!this.formValidate.parentId) {
+        this.$Message.error("请选择要添加的数据");
+        return false;
+      }
+      this.addValidate = JSON.parse(JSON.stringify(this.formValidate));
+
+      let level = ["country", "province", "city", "district", "street"];
+
+      let child;
+      level.forEach((item, index) => {
+        if (this.addValidate.level == item) {
+          if (index == level.length - 1) {
+            child = level[index - 1];
+          } else {
+            child = level[index + 1];
+          }
+        }
+      });
+
+      this.addValidate.level = child;
+
+      this.addValidate.parentId = this.formValidate.id;
+      this.addValidate.parentName = this.formValidate.name;
+
+      delete this.addValidate.id;
+      delete this.addValidate.createBy;
+      delete this.addValidate.createTime;
+      delete this.addValidate.updateBy;
+      delete this.addValidate.updateTime;
+      delete this.addValidate.selected;
+
+      this.addValidate.name = "";
+      this.addValidate.center = "";
+      this.modalFlag = true;
+    },
+
+    handleDel() {
+      this.$Modal.confirm({
+        title: "确定删除？",
+        content: "删除后店铺以及用户地区绑定数据将全部错乱",
+        onOk: () => {
+          delRegion(this.formValidate.id).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功!,请稍后查看数据");
+            }
+          });
+        },
+      });
+    },
+
+    // 修改
+    handleUpdate(name) {
+      delete this.formValidate.createBy;
+      delete this.formValidate.createTime;
+      delete this.formValidate.updateBy;
+      delete this.formValidate.updateTime;
+      delete this.formValidate.selected;
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          this.formValidate.adCode
+            ? this.formValidate.adCode
+            : (this.formValidate.adCode = "");
+          updateRegion(this.formValidate.id, this.formValidate).then((res) => {
+            if (res.result) {
+              this.$Message.success("修改成功!,请稍后查看数据");
+            }
+          });
+        } else {
+          this.$Message.error("请选择数据");
+        }
+      });
+    },
+
+    changeTree(array, val) {
+      this.formValidate = val;
+    },
+
+    loadData(item, callback) {
+      item.loading = true;
+      console.log(item);
+      getChildRegion(item.id).then((res) => {
+        if (res.result.length <= 0) {
+          item.loading = false;
+        } else {
+          let way = [];
+          res.result.forEach((child, index) => {
+            item.loading = false;
+            let data;
+            data = {
+              ...child,
+              title: child.name,
+              loading: false,
+              children: [],
+            };
+
+            if (
+              child.level == "street" ||
+              item.label == "香港特别行政区" ||
+              item.label == "澳门特别行政区"
+            ) {
+              data = {
+                ...child,
+                title: child.name,
+              };
+            }
+
+            way.push(data);
+          });
+          callback(way);
+        }
+      });
+    },
+
+    init() {
+      getChildRegion(this.id).then((res) => {
+        if (res.result) {
+          res.result.forEach((item) => {
+            let data;
+
+            // 台湾省做处理
+            if (item.name == "台湾省") {
+              data = {
+                ...item,
+                title: item.name,
+              };
+            } else {
+              data = {
+                ...item,
+                title: item.name,
+                loading: false,
+                children: [],
+              };
+            }
+
+            this.data.push(data);
+          });
+        }
+      });
+    },
+
+    asyncRegion() {
+      this.num = 10;
+      this.$Modal.confirm({
+        title: "确定更新？",
+        content: "更新后店铺以及用户地区绑定数据将全部错乱",
+        onOk: () => {
+          let timer;
+          let numer;
+
+          this.asyncLoading = true
+
+          this.$Message.info({
+            duration: this.timerNum,
+            render: (h) => {
+              return h("span", [
+                `地区数据将在${this.num}秒后更新`,
+                h(
+                  "a",
+                  {
+                    on: {
+                      click: () => {
+                        this.$Message.destroy();
+                        this.asyncLoading = false
+                        clearInterval(timer, numer);
+                      },
+                    },
+                  },
+                  "点击撤销"
+                ),
+              ]);
+            },
+          });
+
+          numer = setInterval(() => {
+            this.num--;
+          }, 1000);
+
+          timer = setTimeout(() => {
+            asyncRegion().then((res) => {
+              this.asyncLoading = false
+              this.$Message.loading("地区数据正在更新中！");
+            });
+          }, 10000);
+        },
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.flex {
+  display: flex;
+  position: relative;
+}
+.tree {
+  flex: 2;
+}
+.form {
+  flex: 8;
+}
+.button-list {
+  margin-left: 80px;
+  > * {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue
new file mode 100644
index 00000000..ffe9ce16
--- /dev/null
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -0,0 +1,298 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="账单编号" prop="sn">
+              <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="出帐时间" prop="createTime">
+              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+              </DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row>
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+          </Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+      </Col>
+    </Row>
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="账单号" prop="sn">
+          <Input v-model="form.sn" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="店铺名称" prop="sellerName">
+          <Input v-model="form.sellerName" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="结算开始时间" prop="startTime">
+          <DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
+        </FormItem>
+        <FormItem label="结算结束时间" prop="endTime">
+          <DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
+        </FormItem>
+
+        <FormItem label="最终结算金额" prop="billPrice">
+          <Input v-model="form.billPrice" clearable style="width: 100%" />
+        </FormItem>
+
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
+        </Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Shop from "@/api/shops";
+
+export default {
+  name: "bill",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "账单号",
+          key: "sn",
+          minWidth: 200,
+          tooltip: true,
+        },
+        {
+          title: "生成时间",
+          key: "createTime",
+          width: 120,
+        },
+        {
+          title: "结算时间段",
+          key: "startTime",
+          width: 200,
+          render: (h, params) => {
+            return h("div", params.row.startTime + "~" + params.row.endTime);
+          },
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120,
+          tooltip: true,
+        },
+
+        {
+          title: "结算金额",
+          key: "billPrice",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.billPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "状态",
+          key: "billStatus",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.billStatus == "OUT") {
+              return h("div", "已出账");
+            } else if (params.row.billStatus == "CHECK") {
+              return h("div", "已对账");
+            } else if (params.row.billStatus == "EXAMINE") {
+              return h("div", "已审核");
+            } else {
+              return h("div", "已付款");
+            }
+          },
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 120,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "详细"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+
+      // this.searchForm
+
+      this.searchForm.startTime &&
+        (this.searchForm.startTime = this.$options.filters.unixToDate(
+          this.searchForm.startTime / 1000
+        ));
+      this.searchForm.endTime &&
+        (this.searchForm.endTime = this.$options.filters.unixToDate(
+          this.searchForm.endTime / 1000
+        ));
+      this.searchForm.billStatus = "OUT";
+      API_Shop.getBuyBillPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    detail(v) {
+      let id = v.id;
+      this.$router.push({
+        name: "bill-detail",
+        query: { id: id },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+/deep/ .ivu-col {
+  min-height: 100vh;
+}
+</style>
diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue
new file mode 100644
index 00000000..70d5ebed
--- /dev/null
+++ b/manager/src/views/seller/bill/bill-detail.vue
@@ -0,0 +1,509 @@
+<template>
+  <div>
+    <template>
+      <Row>
+        <i-col span="24">
+          <Card>
+            <p slot="title">商家信息</p>
+            <div class="flex flex_align_item">
+              <p>店铺名称：{{ bill.storeName }}</p>
+              <p>银行开户名：{{ bill.bankAccountName }}</p>
+              <p>银行账号：{{ bill.bankAccountNumber }}</p>
+              <p>开户行支行名称：{{ bill.bankName }}</p>
+              <p>支行联行号：{{ bill.bankCode }}</p>
+            </div>
+          </Card>
+        </i-col>
+      </Row>
+    </template>
+    <template>
+      <Row>
+        <i-col span="24">
+          <Card>
+            <p slot="title">账单详细</p>
+
+            <div class="tips-status">
+              <span>商品状态</span>
+
+              <span class="theme_color">{{
+                bill.billStatus | unixSellerBillStatus
+              }}</span>
+
+
+              <Button
+                v-if="bill.billStatus == 'CHECK'"
+                size="mini"
+                type="primary"
+                @click="pass()"
+                >付款</Button
+              >
+            </div>
+
+            <i-table :columns="columns" :data="data" stripe></i-table>
+          </Card>
+        </i-col>
+      </Row>
+    </template>
+    <template>
+      <Tabs active-key="key1" @on-click="clickTabs">
+        <Tab-pane label="入账流水" key="key1">
+          <Card>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="orderColumns"
+                :data="order"
+                ref="table"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="orderParam.pageNumber"
+                :total="orderTotal"
+                :page-size="orderParam.pageSize"
+                @on-change="orderChangePage"
+                @on-page-size-change="orderChangePageSize"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </Row>
+          </Card>
+        </Tab-pane>
+        <Tab-pane label="退款流水" key="key2">
+          <Card>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="refundColumns"
+                :data="refund"
+                ref="table"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="refundParam.pageNumber"
+                :total="refundTotal"
+                :page-size="refundParam.pageSize"
+                @on-change="getRefund()"
+                @on-page-size-change="getRefund()"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </Row>
+          </Card>
+        </Tab-pane>
+      </Tabs>
+    </template>
+  </div>
+</template>
+<script>
+import * as filters from "@/utils/filters";
+import * as API_Shop from "@/api/shops";
+export default {
+  name: "bill-detail",
+  data() {
+    return {
+      columns: [
+        {
+          title: "项目",
+          key: "name",
+          width: 250,
+        },
+        {
+          title: "值",
+          key: "value",
+        },
+      ],
+      data: [
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+      ],
+      id: "",
+      bill: {},
+      order: [],
+      orderParam: {
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "id", // 默认排序字段
+        order: "desc", // 默认排序方式
+        flowType: "PAY",
+        startDate: null,
+        endDate: null,
+      },
+      orderColumns: [
+        {
+          title: "入账时间",
+          key: "createTime",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "订单编号",
+          key: "sn",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "订单金额",
+          key: "finalPrice",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "平台分佣",
+          key: "commissionPrice",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "平台优惠券",
+          key: "siteCouponPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.siteCouponPrice == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.siteCouponPrice, "￥")
+              );
+            }
+
+          },
+        },
+        {
+          title: "分销金额",
+          key: "distributionRebate",
+          width: 120,
+          render: (h, params) => {
+            if(params.row.distributionRebate == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+              );
+            }
+
+          },
+        },
+        {
+          title: "应结金额",
+          key: "billPrice",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.billPrice, "￥")
+            );
+          },
+        },
+
+      ],
+      refund: [],
+      refundParam: {
+        flowTypeEnum: "PAY",
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "id", // 默认排序字段
+        order: "desc", // 默认排序方式
+        flowType: "REFUND",
+        startDate: null,
+        endDate: null,
+      },
+      refundColumns: [
+        {
+          title: "退款时间",
+          key: "createTime",
+          minWidth: 120,
+          tooltip: true        },
+        {
+          title: "退款流水编号",
+          key: "sn",
+          minWidth: 120,
+          tooltip: true        },
+        {
+          title: "订单编号",
+          key: "sn",
+          minWidth: 120,
+          tooltip: true        },
+        {
+          title: "退款金额",
+          key: "finalPrice",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "退还佣金",
+          key: "commissionPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
+            );
+          },
+        },
+
+        {
+          title: "退还平台优惠券",
+          key: "siteCouponCommission",
+          minWidth: 110
+        },
+        {
+          title: "退还分销",
+          key: "distributionRebate",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.distributionRebate == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+              );
+            }
+
+          },
+        },
+
+        {
+          title: "合计金额",
+          key: "billPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.billPrice == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.billPrice, "￥")
+              );
+            }
+
+          },
+        },
+
+
+      ],
+      orderTotal: 0,
+      refundTotal: 0,
+    };
+  },
+  methods: {
+    //订单页数发生变化
+    orderChangePage(v) {
+      this.orderParam.pageNumber = v;
+      this.getOrder();
+    },
+    //订单每页条数变化
+    orderChangePageSize(v) {
+      this.orderParam.pageSize = v;
+      this.getOrder();
+    },
+    //退款单页数发生变化
+    refundOrderChangePage(v) {
+      this.refundParam.pageNumber = v;
+      this.getRefund()
+    },
+    //退款单每页条数变化
+    refundOrderChangePageSize(v) {
+      this.refundParam.pageSize = v;
+      tthis.getRefund()
+    },
+    clickTabs(index) {
+      if (index == 1) {
+        this.orderParam.flowType = "REFUND";
+        this.getRefund();
+      } else {
+        this.orderParam.flowType = "PAY";
+        this.getOrder();
+      }
+    },
+
+
+    pass() {
+      API_Shop.pay(this.id).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success(res.message);
+          this.init();
+        }
+      });
+    },
+
+    init() {
+      this.id = this.$route.query.id;
+      this.getDetail();
+    },
+    getDetail() {
+      API_Shop.getBuyBillDetail(this.id).then((res) => {
+        if (res.success) {
+          this.bill = res.result;
+          //初始化表哥
+          this.initTable();
+          //初始化订单信息
+          this.orderParam.startDate = this.bill.startTime;
+          this.orderParam.endDate = this.bill.endTime;
+          this.refundParam.startDate = this.bill.startTime;
+          this.refundParam.endDate = this.bill.endTime;
+          this.getOrder();
+        }
+      });
+    },
+    initTable() {
+      let bill = this.bill;
+      this.data[0].name = "结算单号";
+      this.data[0].value = bill.sn;
+
+      this.data[1].name = "起止日期";
+      this.data[1].value = bill.startTime + "~" + bill.endTime;
+
+      this.data[2].name = "出帐日期";
+      this.data[2].value = bill.createTime;
+
+      this.data[3].name = "当前状态";
+      this.data[3].value = filters.unixSellerBillStatus(bill.billStatus);
+
+      this.data[4].name = "当前店铺";
+      this.data[4].value = bill.storeName;
+
+      this.data[5].name = "平台打款时间";
+      this.data[5].value = bill.payTime === null ? "未付款" : bill.payTime;
+
+      this.data[6].name = "结算金额";
+      this.data[6].value = filters.unitPrice(bill.billPrice?bill.billPrice:0, "¥");
+
+      this.data[7].name = "结算详细";
+      this.data[7].value =
+        "最终结算金额(" +
+        filters.unitPrice(bill.billPrice?bill.billPrice:0, "¥") +
+        ") = 订单付款总金额(" +
+        filters.unitPrice(bill.orderPrice?bill.orderPrice:0, "¥") +
+        ") - 退单金额(" +
+        filters.unitPrice(bill.refundPrice?bill.refundPrice:0, "¥") +
+        ")" +
+        "- 平台收取佣金(" +
+        filters.unitPrice(bill.commissionPrice?bill.commissionPrice:0, "¥") +
+        ") + 退单产生退还佣金金额(" +
+        filters.unitPrice(bill.refundCommissionPrice?bill.refundCommissionPrice:0, "¥") +
+        ") - 分销返现支出(" +
+        filters.unitPrice(bill.distributionCommission?bill.distributionCommission:0, "¥") +
+        ") + 退单分销返现返还(" +
+        filters.unitPrice(bill.distributionRefundCommission?bill.distributionRefundCommission:0, "¥") +
+        ") - 平台优惠券支出(" +
+        filters.unitPrice(bill.siteCouponCommission?bill.siteCouponCommission:0, "¥") +
+        ") + 退单平台优惠券返还(" +
+        filters.unitPrice(bill.siteCouponRefundCommission?bill.siteCouponRefundCommission:0, "¥") +
+        ")";
+    },
+    getOrder() {
+      API_Shop.getStoreFlow(this.id, this.orderParam).then((res) => {
+        if (res.result) {
+          this.order = res.result.records;
+          this.orderTotal = res.result.total;
+        }
+      });
+      this.orderTotal = this.order.length;
+    },
+    getRefund() {
+      API_Shop.getStoreFlow(this.id, this.orderParam).then((res) => {
+        this.loading = false;
+        if (res.result) {
+          this.refund = res.result.records;
+          this.refundTotal = res.result.total;
+
+          this.$set(this, "refund", res.result.records);
+          console.log();
+        }
+      });
+      this.refundTotal = this.refund.length;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex {
+  justify-content: space-between;
+  flex-wrap: wrap;
+  > p {
+    width: 50%;
+    margin: 15px 0;
+  }
+}
+.tips-status {
+  padding: 18px;
+  > span {
+    font-weight: bold;
+    margin-right: 8px;
+  }
+  > span:nth-of-type(2) {
+    color: $theme_color;
+  }
+}
+</style>
diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue
new file mode 100644
index 00000000..7c1d8f2d
--- /dev/null
+++ b/manager/src/views/seller/bill/bill.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="账单编号" prop="sn">
+              <Input
+                type="text"
+                v-model="searchForm.sn"
+                placeholder="请输入账单编号"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="出帐时间" prop="createTime">
+              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
+              </DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="operation padding-row">
+          <Button @click="add" type="primary">添加</Button>
+          <Button @click="delAll">批量删除</Button>
+        </Row>
+        <Row>
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+                 @on-sort-change="changeSort"
+                 @on-selection-change="changeSelect">
+          </Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
+                @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+      </Col>
+    </Row>
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="账单号" prop="sn">
+          <Input v-model="form.sn" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="店铺名称" prop="sellerName">
+          <Input v-model="form.sellerName" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="结算开始时间" prop="startTime">
+          <DatePicker v-model="form.startTime" valueType="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%"></DatePicker>
+        </FormItem>
+        <FormItem label="结算结束时间" prop="endTime">
+          <DatePicker type="date" v-model="form.endTime" clearable style="width: 100%"></DatePicker>
+        </FormItem>
+
+        <FormItem label="最终结算金额" prop="billPrice">
+          <Input v-model="form.billPrice" clearable style="width: 100%" />
+        </FormItem>
+
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交
+        </Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Shop from "@/api/shops";
+
+export default {
+  name: "bill",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sn: "",
+        sellerName: "",
+        startTime: "",
+        endTime: "",
+        billPrice: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "账单号",
+          key: "sn",
+          minWidth: 200,
+          tooltip: true
+        },
+        {
+          title: "生成时间",
+          key: "createTime",
+          width: 120,
+        },
+        {
+          title: "结算时间段",
+          key: "startTime",
+          width: 200,
+          render: (h, params) => {
+            return h('div', params.row.startTime +"~"+params.row.endTime)
+          }
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120,
+          tooltip: true
+        },
+
+        {
+          title: "结算金额",
+          key: "billPrice",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.billPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "状态",
+          key: "billStatus",
+          width: 100,
+          render: (h, params) => {
+            if(params.row.billStatus == 'OUT'){
+              return h('div', '已出账')
+            } else if (params.row.billStatus == 'CHECK') {
+              return h('div', '已对账')
+            } else if (params.row.billStatus == 'EXAMINE') {
+              return h('div', '已审核')
+            }else{
+              return h('div', '已付款')
+            }
+          }
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 120,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "详细"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+
+      // this.searchForm
+
+      this.searchForm.startTime &&
+        (this.searchForm.startTime = this.$options.filters.unixToDate(
+          this.searchForm.startTime / 1000
+        ));
+      this.searchForm.endTime &&
+        (this.searchForm.endTime = this.$options.filters.unixToDate(
+          this.searchForm.endTime / 1000
+        ));
+
+      API_Shop.getBuyBillPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            this.postRequest("/bill/insertOrUpdate", this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.modalVisible = true;
+    },
+    detail(v) {
+      let id = v.id;
+      this.$router.push({
+        name: "bill-detail",
+        query: { id: id },
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          this.deleteRequest("/bill/delByIds/" + v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+          // 模拟请求成功
+          //this.$Message.success("操作成功");
+          //this.$Modal.remove();
+          //this.getDataList();
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          this.deleteRequest("/bill/delByIds/" + ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue
new file mode 100644
index 00000000..cb24d860
--- /dev/null
+++ b/manager/src/views/seller/shop/shopAuditList.vue
@@ -0,0 +1,402 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="店铺名称" prop="storeName">
+                <Input
+                  type="text"
+                  v-model="searchForm.storeName"
+                  placeholder="请输入店铺名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="创建时间" prop="createTime">
+                <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+                  size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import {
+    getShopListData,
+    disableShop,
+    enableBrand,
+    shopAudit,
+  } from "@/api/shops";
+  import shopOperation from "./shopOperation";
+  export default {
+    name: "shop",
+    components: {
+      shopOperation,
+    },
+    data() {
+      return {
+        shopId: "",
+        modalFlag: false,
+        loading: true, // 表单加载状态
+        drop: false,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          memberName: "",
+          storeName: "",
+          shopDisable: "",
+          id: "",
+          createTime: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            title: "店铺名称",
+            key: "storeName",
+            minWidth: 120,
+            align: "left",
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            align: "left",
+            minWidth: 120,
+          },
+          {
+            title: "店铺地址",
+            key: "storeAddressPath",
+            width: 300,
+            sortable: false,
+          },
+          {
+            title: "是否自营",
+            key: "selfOperated",
+            align: "left",
+            width: 120,
+            render: (h, params) => {
+              return h(
+                "Tag",
+                {
+                  props: {
+                    color: params.row.selfOperated ? "default" : "primary",
+                  },
+                },
+                params.row.selfOperated == 0 ? "自营" : "非自营"
+              );
+            },
+          },
+
+          {
+            title: "创建时间",
+            key: "createTime",
+            align: "left",
+            width: 170,
+            sortable: false,
+          },
+          {
+            title: "操作",
+            key: "action",
+            width: 170,
+            align: "center",
+            fixed: "right",
+            render: (h, params) => {
+              let enableOrDisable = "";
+              if (params.row.storeDisable == "OPEN") {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                      type: "error"
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.disable(params.row);
+                      },
+                    },
+                  },
+                  "关闭"
+                );
+              } else if (params.row.storeDisable == "CLOSED") {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.enable(params.row);
+                      },
+                    },
+                  },
+                  "开启"
+                );
+              } else if (params.row.storeDisable == "APPLYING") {
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "info",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.audit(params.row);
+                        },
+                      },
+                    },
+                    "审核"
+                  ),
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "primary",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.edit(params.row);
+                        },
+                      },
+                    },
+                    "修改"
+                  ),
+                ]);
+              }
+
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                      display: this.selectedShop ? "inline-block" : "none",
+                    },
+                    on: {
+                      click: () => {
+                        this.callback(params.row);
+                      },
+                    },
+                  },
+                  "选择"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+                enableOrDisable,
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+        selectedShop: false, //用于是否选择店铺
+      };
+    },
+
+    methods: {
+      callbackShop() {
+        this.init();
+      },
+      // 回调给父级
+      callback(val) {
+        this.$emit("callback", val);
+      },
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        this.searchForm.storeDisable='APPLYING'
+        getShopListData(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      add() {
+        this.$router.push({ path: '/shop-operation'});
+      },
+      edit(v) {
+        this.$router.push({ path: '/shop-operation', query: { shopId: v.id } });
+      },
+      disable(v) {
+        this.$Modal.confirm({
+          title: "确认禁用",
+          content: "您确认要禁用店铺 " + v.storeName + " ?",
+          loading: true,
+          onOk: () => {
+            disableShop(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      audit(v) {
+        this.$Modal.confirm({
+          title: "审核店铺",
+          content: "您确认要审核通过店铺 " + v.storeName + " ?",
+          okText: "通过",
+          cancelText: "驳回",
+          loading: true,
+          onOk: () => {
+            shopAudit(v.id, 0).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+          onCancel: () => {
+            shopAudit(v.id, 1).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      enable(v) {
+        this.$Modal.confirm({
+          title: "确认启用",
+          content: "您确认要启用店铺 " + v.storeName + " ?",
+          loading: true,
+          onOk: () => {
+            enableBrand(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/seller/shop/shopDetail.scss b/manager/src/views/seller/shop/shopDetail.scss
new file mode 100644
index 00000000..5aa07462
--- /dev/null
+++ b/manager/src/views/seller/shop/shopDetail.scss
@@ -0,0 +1,126 @@
+.head-title {
+  font-size: 18px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 400;
+}
+.detail-body{
+  margin-top: 17px;
+  overflow: hidden;
+}
+
+
+.head-info {
+  display: flex;
+  height: 130px;
+  background: #93b5e1;
+  padding: 12px;
+  border-radius: 4px;
+  align-items: center;
+}
+
+.ant-layout, .ant-layout * {
+  box-sizing: border-box;
+}
+
+.base-info {
+  background-color: #fff;
+  padding: 20px;
+  margin-bottom: 12px;
+  height: 250px;
+}
+
+.ant-col-md-6 {
+  display: block;
+  box-sizing: border-box;
+  width: 33%;
+  float: left;
+  margin-left: 20px;
+}
+.info-2{
+  float: left;
+}
+
+.ant-row {
+  position: relative;
+  height: auto;
+  margin-right: 0;
+  margin-left: 0;
+  zoom: 1;
+  display: block;
+  box-sizing: border-box;
+}
+.bottom-info {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 12px;
+  margin-top: 6px;
+  height: 36px;
+  background: #f5f5f5;
+  border-radius: 4px;
+}
+
+.ant-layout * {
+  box-sizing: border-box;
+}
+.name{
+  margin-left: 10px;
+  color: #fff;
+  font-size: 18px;
+}
+.phone{
+  margin-left: 20px;
+  font-size: 14px;
+  color: #fff;
+}
+.item {
+  display: flex;
+  align-items: flex-start;
+  line-height: 30px;
+  margin-bottom: 2px;
+}
+
+.label {
+  flex-basis: 95px;
+  //text-align: right;
+  color: rgba(0, 0, 0, 0.4);
+  flex-shrink: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.info {
+  font-weight: 500;
+  padding-left: 0;
+  margin-bottom: 0;
+  width: 100%;
+}
+
+.pointsTitle {
+  background-color: #fafafa;
+  padding: 15px 20px;
+  display: flex;
+  font-size: 16px;
+  line-height: 1.8;
+  flex-direction: row;
+  justify-content: space-around;
+  color: #333;
+  text-align: center;
+  margin-bottom: 16px;
+  .points-top-title{
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 0.4);
+    line-height: 14px;
+    margin-bottom: 8px;
+  }
+  .points-top-text {
+    font-size: 16px;
+    font-weight: 500;
+    color: #93b5e1;
+    line-height: 16px;
+  }
+}
+.point-data{
+
+}
diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
new file mode 100644
index 00000000..9142513f
--- /dev/null
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -0,0 +1,1003 @@
+<template>
+  <div>
+    <Card style="padding: 10px 12px 0px">
+      <div class="head-title">基本信息</div>
+      <div class="detail-body">
+        <div class="ant-col-md-6" style="width: 25%;">
+          <div class="info">
+            <div class="head-info">
+              <Avatar size="large" :src="storeInfo.storeLogo"/>
+              <div>
+                <div class="name" v-if="storeInfo.storeName && storeInfo.storeName.length > 15">
+                  {{storeInfo.storeName.slice(0,15)}}...
+                </div>
+                <div class="name" v-else>
+                  {{storeInfo.storeName}}
+                </div>
+              </div>
+            </div>
+            <div class="bottom-info">
+              <p v-if="storeInfo.createTime">{{storeInfo.createTime}}&nbsp;开店</p>
+              <p v-if="storeInfo.selfOperated == 0">
+                <Tag color="success">自营</Tag>
+              </p>
+              <p v-else>
+                <Tag color="error">非自营</Tag>
+              </p>
+              <p>
+                <i-switch size="large" v-model="storeInfo.storeDisable" :true-value="true" :false-value="false"
+                          @on-change="shopStatusChange">
+                  <span slot="open">启用</span>
+                  <span slot="close">禁用</span>
+                </i-switch>
+              </p>
+            </div>
+            <div style="margin-top: 20px">
+              <p class="item">
+                <span class="label">公司名称：</span>
+                <span class="info">{{storeInfo.companyName}}</span>
+              </p>
+              <p class="item">
+                <span class="label">公司电话：</span>
+                <span class="info">{{storeInfo.companyPhone}}</span>
+              </p>
+              <p class="item">
+                <span class="label">电子邮箱：</span>
+                <span class="info">{{storeInfo.companyEmail}}</span>
+              </p>
+              <p class="item">
+                <span class="label">员工总数：</span>
+                <span class="info">{{storeInfo.employeeNum}}人</span>
+              </p>
+              <p class="item">
+                <span class="label">注册资金：</span>
+                <span class="info">{{storeInfo.registeredCapital}}万</span>
+              </p>
+              <p class="item">
+                <span class="label">电子邮箱：</span>
+                <span class="info">{{storeInfo.companyEmail}}</span>
+              </p>
+              <p class="item">
+                <span class="label">联系人姓名：</span>
+                <span class="info">{{storeInfo.linkName}}</span>
+              </p>
+              <p class="item">
+                <span class="label">联系人电话：</span>
+                <span class="info">{{storeInfo.linkPhone}}</span>
+              </p>
+              <p class="item">
+                <span class="label">公司地址：</span>
+                <span class="info">
+              {{storeInfo.companyAddressPath || storeInfo.companyAddress?storeInfo.companyAddressPath + ' '+storeInfo.companyAddress:"暂未完善"}}
+            </span>
+              </p>
+            </div>
+
+          </div>
+        </div>
+        <div class="ant-col-md-6">
+          <p class="item">
+            <span class="label">商家账号：</span>
+            <span class="info">{{storeInfo.memberName}}</span>
+          </p>
+          <p class="item">
+            <span class="label">库存预警数：</span>
+            <span class="info">{{storeInfo.stockWarning?storeInfo.stockWarning:'0'}}</span>
+          </p>
+          <p class="item">
+            <span class="label">店铺所在地：</span>
+            <span class="info">
+              {{storeInfo.storeAddressPath || storeInfo.storeAddressDetail?storeInfo.storeAddressPath +storeInfo.storeAddressDetail:"暂未完善"}}
+            </span>
+          </p>
+          <p class="item">
+            <span class="label">退货地址：</span>
+            <span class="info">
+               {{storeInfo.salesConsigneeName || storeInfo.salesConsigneeMobile || storeInfo.salesConsigneeAddressPath || storeInfo.salesConsigneeDetail?storeInfo.salesConsigneeName + storeInfo.salesConsigneeMobile +' '+ storeInfo.salesConsigneeAddressPath + storeInfo.salesConsigneeDetail:'暂未完善'}}
+            </span>
+
+          </p>
+          <p class="item">
+            <span class="label">店铺经纬度：</span>
+            <span class="info">{{storeInfo.storeCenter?storeInfo.storeCenter:'暂未完善'}}</span>
+          </p>
+          <p class="item">
+            <span class="label">经营范围：</span>
+            <span class="info">
+               <CheckboxGroup v-model="checkAllGroup">
+                <Checkbox disabled v-for="(item, i) in categories" :key="i + 1" :label="item.id">{{ item.name }}
+                </Checkbox>
+              </CheckboxGroup>
+            </span>
+          </p>
+          <p class="item">
+            <span class="label">店铺简介：</span>
+            <span class="info">
+              {{storeInfo.storeDesc?storeInfo.storeDesc:'暂未完善'}}
+            </span>
+          </p>
+        </div>
+
+
+
+        <div class="ant-col-md-6">
+          <p class="item">
+            <span class="label">法人姓名：</span>
+            <span class="info">{{storeInfo.legalName}}人</span>
+          </p>
+          <p class="item">
+            <span class="label">法人身份证：</span>
+            <span class="info">{{storeInfo.legalId}}人</span>
+          </p>
+          <p class="item">
+            <span class="label">身份证照片：</span>
+            <span class="info">
+              <img style="height: 100px;width: 90px" :src="storeInfo.legalPhoto">
+            </span>
+          </p>
+          <p class="item">
+            <span class="label">营业执照号：</span>
+            <span class="info">{{storeInfo.licenseNum}}</span>
+          </p>
+          <p class="item">
+            <span class="label">法定经营范围：</span>
+            <span class="info">{{storeInfo.scope}}</span>
+          </p>
+          <p class="item">
+            <span class="label">营业执照电子版：</span>
+            <span class="info">
+              <img style="height: 100px;width: 90px" :src="storeInfo.licencePhoto">
+            </span>
+          </p>
+
+          <p class="item">
+            <span class="label">银行名称：</span>
+            <span class="info">{{storeInfo.settlementBankAccountName}}</span>
+          </p>
+          <p class="item">
+            <span class="label">银行账号：</span>
+            <span class="info">{{storeInfo.settlementBankAccountNum}}</span>
+          </p>
+          <p class="item">
+            <span class="label">银行开户支行名称：</span>
+            <span class="info">{{storeInfo.settlementBankBranchName}}</span>
+          </p>
+          <p class="item">
+            <span class="label">银行支行联行号：</span>
+            <span class="info">{{storeInfo.settlementBankJointName}}</span>
+          </p>
+          <p class="item">
+            <span class="label">结算周期：</span>
+            <span class="info">
+               <Tag
+                 v-for="item in storeInfo.settlementCycle.split(',')"
+                 :key="item"
+                 v-if="item!==''"
+                 :name="item"
+                 style="marrgin-left: 10px"
+               >{{ item }}
+              </Tag
+              >
+            </span>
+          </p>
+        </div>
+      </div>
+    </Card>
+
+    <Card>
+      <Tabs type="order" @on-click="storeInfoChange">
+        <TabPane label="TA的订单" name="order" style="min-height: 200px">
+          <Row>
+            <Form ref="searchForm" :model="orderSearchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="orderSearchForm.orderSn"
+                  placeholder="请输入订单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单状态" prop="orderStatus">
+                <Select v-model="orderSearchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                  <Option value="UNDELIVERED">待发货</Option>
+                  <Option value="DELIVERED">已发货</Option>
+                  <Option value="COMPLETED">已完成</Option>
+                  <Option value="TAKE">待核验</Option>
+                  <Option value="CANCELLED">已取消</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="支付状态" prop="payStatus">
+                <Select v-model="orderSearchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="订单类型" prop="orderType">
+                <Select v-model="orderSearchForm.orderType" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="NORMAL">普通订单</Option>
+                  <Option value="FICTITIOUS">虚拟订单</Option>
+                  <Option value="GIFT">赠品订单</Option>
+                  <Option value="PINTUAN">拼团订单</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="订单来源" prop="clientType">
+                <Select v-model="orderSearchForm.clientType" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="H5">移动端</Option>
+                  <Option value="PC">PC端</Option>
+                  <Option value="WECHAT_MP">小程序</Option>
+                  <Option value="APP">移动应用端</Option>
+                  <Option value="UNKNOWN">未知</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="下单时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="getOrderData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <div style="min-height: 180px">
+            <Row class="padding-row">
+              <Table
+                :loading="loading"
+                border
+                :columns="orderColumns"
+                :data="orderData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="orderChangeSort"
+              >
+                <!-- 订单详情格式化 -->
+                <template slot="orderSlot" slot-scope="scope">
+                  <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+                </template>
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+              <Page
+                :current="orderSearchForm.pageNumber"
+                :total="orderTotal"
+                :page-size="orderSearchForm.pageSize"
+                @on-change="orderChangePage"
+                @on-page-size-change="orderChangePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </div>
+        </TabPane>
+        <TabPane label="TA的退货单" name="refundGoods">
+          <Row>
+            <Form ref="refundGoodsOrderSearchForm" :model="refundGoodsOrderSearchForm" inline :label-width="70"
+                  class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="refundGoodsOrderSearchForm.orderSn"
+                  placeholder="请输入订单编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后单号" prop="sn">
+                <Input
+                  type="text"
+                  v-model="refundGoodsOrderSearchForm.sn"
+                  placeholder="请输入售后单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后状态">
+                <Select v-model="refundGoodsOrderSearchForm.serviceStatus" placeholder="全部" clearable
+                        style="width: 200px">
+                  <Option value="APPLY">申请售后</Option>
+                  <Option value="PASS">通过售后</Option>
+                  <Option value="REFUSE">拒绝售后</Option>
+                  <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
+                  <Option value="SELLER_RE_DELIVERY">商家换货/补发</Option>
+                  <Option value="SELLER_CONFIRM">卖家确认收货</Option>
+                  <Option value="SELLER_TERMINATION">卖家终止售后</Option>
+                  <Option value="BUYER_CONFIRM">买家确认收货</Option>
+                  <Option value="BUYER_CANCEL">买家取消售后</Option>
+                  <Option value="COMPLETE">完成售后</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectRefundGoodsDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="商家名称" prop="storeName">
+                <Input
+                  type="text"
+                  v-model="refundGoodsOrderSearchForm.storeName"
+                  placeholder="请输入商家名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="refundGoodsOrderSearchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Button @click="getRefundGoodsOrderData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <div style="min-height: 180px">
+            <Row class="padding-row">
+              <Table
+                :loading="loading"
+                border
+                :columns="refundGoodsOrderColumns"
+                :data="refundGoodsOrderData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="refundGoodsOrderChangeSort"
+              >
+                <!-- 商品栏目格式化 -->
+                <template slot="goodsSlot" slot-scope="scope">
+                  <div style="margin-top: 5px;height: 80px; display: flex;">
+                    <div style="">
+                      <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
+                    </div>
+
+                    <div style="margin-left: 13px;margin-top: 3px;">
+                      <div class="div-zoom">
+                        <a>{{scope.row.goodsName}}</a>
+                      </div>
+                    </div>
+                  </div>
+
+                </template>
+
+                <!-- 订单详情格式化 -->
+                <template slot="orderSlot" slot-scope="scope">
+                  <a
+                    @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+                </template>
+
+                <!-- 售后单详情格式化 -->
+                <template slot="refundGoodsOrderSlot" slot-scope="scope">
+                  <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+                </template>
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+              <Page
+                :current="refundGoodsOrderSearchForm.pageNumber"
+                :total="refundGoodsOrderTotal"
+                :page-size="refundGoodsOrderSearchForm.pageSize"
+                @on-change="refundGoodsOrderChangePage"
+                @on-page-size-change="refundGoodsOrderChangePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </div>
+        </TabPane>
+        <TabPane label="TA的退款单" name="refund">
+          <Row>
+            <Form ref="refundOrderSearchForm" :model="refundOrderSearchForm" inline :label-width="70"
+                  class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="refundOrderSearchForm.orderSn"
+                  placeholder="请输入订单编号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后单号" prop="sn">
+                <Input
+                  type="text"
+                  v-model="refundOrderSearchForm.sn"
+                  placeholder="请输入售后单号"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="售后状态">
+                <Select v-model="refundOrderSearchForm.serviceStatus" placeholder="全部" clearable
+                        style="width: 200px">
+                  <Option value="APPLY">申请售后</Option>
+                  <Option value="PASS">通过售后</Option>
+                  <Option value="REFUSE">拒绝售后</Option>
+                  <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
+                  <Option value="SELLER_RE_DELIVERY">商家换货/补发</Option>
+                  <Option value="SELLER_CONFIRM">卖家确认收货</Option>
+                  <Option value="SELLER_TERMINATION">卖家终止售后</Option>
+                  <Option value="BUYER_CONFIRM">买家确认收货</Option>
+                  <Option value="BUYER_CANCEL">买家取消售后</Option>
+                  <Option value="COMPLETE">完成售后</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectRefundDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="商家名称" prop="storeName">
+                <Input
+                  type="text"
+                  v-model="refundOrderSearchForm.storeName"
+                  placeholder="请输入商家名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="refundOrderSearchForm.memberName"
+                  placeholder="请输入会员名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Button @click="getRefundOrder" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <div style="min-height: 180px">
+            <Row class="padding-row">
+              <Table
+                :loading="loading"
+                border
+                :columns="refundGoodsOrderColumns"
+                :data="refundOrderData"
+                ref="table"
+                sortable="custom"
+                @on-sort-change="refundOrderChangeSort"
+              >
+                <!-- 商品栏目格式化 -->
+                <template slot="goodsSlot" slot-scope="scope">
+                  <div style="margin-top: 5px;height: 80px; display: flex;">
+                    <div style="">
+                      <img :src="scope.row.goodsImage" style="height: 60px;margin-top: 3px">
+                    </div>
+
+                    <div style="margin-left: 13px;margin-top: 3px;">
+                      <div class="div-zoom">
+                        <a>{{scope.row.goodsName}}</a>
+                      </div>
+                    </div>
+                  </div>
+
+                </template>
+
+                <!-- 订单详情格式化 -->
+                <template slot="orderSlot" slot-scope="scope">
+                  <a
+                    @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+                </template>
+
+                <!-- 售后单详情格式化 -->
+                <template slot="refundGoodsOrderSlot" slot-scope="scope">
+                  <a @click="$router.push({name: 'after-order-detail',query: {sn: scope.row.sn}})">{{scope.row.sn}}</a>
+                </template>
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page" style="margin-top: 10px">
+              <Page
+                :current="refundOrderSearchForm.pageNumber"
+                :total="refundOrderTotal"
+                :page-size="refundOrderSearchForm.pageSize"
+                @on-change="refundOrderChangePage"
+                @on-page-size-change="refundOrderChangePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+              ></Page>
+            </Row>
+          </div>
+        </TabPane>
+      </Tabs>
+    </Card>
+
+  </div>
+</template>
+
+<script>
+  import region from "@/views/lili-components/region";
+  import ossManage from "@/views/sys/oss-manage/ossManage";
+  import * as RegExp from '@/libs/RegExp.js';
+  import {getCategoryTree} from "@/api/goods";
+  import * as API_Store from "@/api/shops.js";
+  import * as API_Order from "@/api/order.js";
+
+
+  export default {
+    name: "member",
+    components: {
+      region,
+      ossManage,
+    },
+    data() {
+      return {
+        id: "",//店铺id
+        categories: [], //店铺静音范围
+        loading: true, // 表单加载状态
+        storeInfo: {},//店铺信息
+        checkAllGroup: [], //选中的经营分类
+        selectDate: null,
+        submitLoading: false, // 添加或编辑提交状态
+
+        orderColumns: [
+          {
+            title: "订单编号",
+            key: "sn",
+            minWidth: 100,
+            tooltip: true,
+            slot: "orderSlot",
+          },
+          {
+            title: "订单金额",
+            key: "flowPrice",
+            width: 140,
+            render: (h, params) => {
+              return h("div", this.$options.filters.unitPrice(params.row.flowPrice, '￥'));
+            }
+          },
+          {
+            title: "订单类型",
+            key: "orderType",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.orderType == "NORMAL") {
+                return h('div', [h('span', {}, '普通订单'),]);
+              } else if (params.row.orderType == "FICTITIOUS") {
+                return h('div', [h('span', {}, '虚拟订单'),]);
+              } else if (params.row.orderType == "GIFT") {
+                return h('div', [h('span', {}, '赠品订单'),]);
+              } else if (params.row.orderType == "PINTUAN") {
+                return h('div', [h('span', {}, '拼团订单'),]);
+              }
+
+            }
+          },
+          {
+            title: "来源",
+            key: "clientType",
+            width: 80,
+          },
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', {}, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', {}, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', {}, '待发货'),]);
+              } else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', {}, '已发货'),]);
+              } else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', {}, '已完成'),]);
+              } else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', {}, '待核验'),]);
+              } else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', {}, '已取消'),]);
+              }
+            }
+          },
+          {
+            title: "支付状态",
+            key: "payStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.payStatus == "UNPAID") {
+                return h('div', [h('span', {}, '未付款'),]);
+              } else if (params.row.payStatus == "PAID") {
+                return h('div', [h('span', {}, '已付款'),]);
+              }
+            }
+          },
+
+          {
+            title: "售后状态",
+            key: "groupAfterSaleStatus",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.groupAfterSaleStatus == "NEW") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "NOT_APPLIED") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "ALREADY_APPLIED") {
+                return h('div', [h('span', {}, '已申请'),]);
+              } else if (params.row.groupAfterSaleStatus == "EXPIRED") {
+                return h('div', [h('span', {}, '已失效'),]);
+              }
+            }
+          },
+          {
+            title: "投诉状态",
+            key: "groupComplainStatus",
+            width: 95,
+            render: (h, params) => {
+              if (params.row.groupComplainStatus == "NEW") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupComplainStatus == "NO_APPLY") {
+                return h('div', [h('span', {}, '未申请'),]);
+              } else if (params.row.groupComplainStatus == "APPLYING") {
+                return h('div', [h('span', {}, '申请中'),]);
+              } else if (params.row.groupComplainStatus == "COMPLETE") {
+                return h('div', [h('span', {}, '已完成'),]);
+              } else if (params.row.groupComplainStatus == "EXPIRED") {
+                return h('div', [h('span', {}, '已失效'),]);
+              } else if (params.row.groupComplainStatus == "CANCEL") {
+                return h('div', [h('span', {}, '取消投诉'),]);
+              }
+            }
+          },
+          {
+            title: "购买店铺",
+            key: "storeName",
+            width: 180,
+            tooltip: true
+          },
+          {
+            title: "下单时间",
+            key: "createTime",
+            width: 170,
+          },
+
+        ],
+        orderData: [],//订单数据
+        orderTotal: 0,//订单总条数
+        //TA的订单form
+        orderSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          payStatus: "",
+          orderSn: "",
+          orderType: "",
+        },
+        refundGoodsOrderColumns: [
+          {
+            title: "售后服务单号",
+            key: "sn",
+            minWidth: 140,
+            slot: "refundGoodsOrderSlot",
+
+          },
+          {
+            title: "订单编号",
+            key: "orderSn",
+            minWidth: 120,
+            slot: "orderSlot",
+          },
+          {
+            title: "商品",
+            key: "goodsName",
+            minWidth: 300,
+            tooltip: true,
+            slot: "goodsSlot",
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            width: 140,
+          },
+          {
+            title: "商家名称",
+            key: "storeName",
+            minWidth: 100,
+            tooltip: true
+          },
+          {
+            title: "售后金额",
+            key: "applyRefundPrice",
+            width: 110,
+            render: (h, params) => {
+              if (params.row.applyRefundPrice == null) {
+                return h(
+                  "div",
+                  this.$options.filters.unitPrice(0, "￥")
+                );
+              } else {
+                return h(
+                  "div",
+                  this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥")
+                );
+              }
+
+            },
+          },
+          {
+            title: "售后类型",
+            key: "serviceType",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.serviceType == "RETURN_MONEY") {
+                return h('div', [h('span', {}, '退款'),]);
+              } else if (params.row.serviceType == "RETURN_GOODS") {
+                return h('div', [h('span', {}, '退货'),]);
+              } else if (params.row.serviceType == "EXCHANGE_GOODS") {
+                return h('div', [h('span', {}, '换货'),]);
+              }
+            }
+          },
+
+          {
+            title: "售后状态",
+            key: "serviceStatus",
+            width: 110,
+            render: (h, params) => {
+              if (params.row.serviceStatus == "APPLY") {
+                return h('div', [h('span', {}, '申请中'),]);
+              } else if (params.row.serviceStatus == "PASS") {
+                return h('div', [h('span', {}, '通过售后'),]);
+              } else if (params.row.serviceStatus == "REFUSE") {
+                return h('div', [h('span', {}, '拒绝售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_RETURN") {
+                return h('div', [h('span', {}, '买家退货，待卖家收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_RE_DELIVERY") {
+                return h('div', [h('span', {}, '商家换货/补发'),]);
+              } else if (params.row.serviceStatus == "SELLER_CONFIRM") {
+                return h('div', [h('span', {}, '卖家确认收货'),]);
+              } else if (params.row.serviceStatus == "SELLER_TERMINATION") {
+                return h('div', [h('span', {}, '卖家终止售后'),]);
+              } else if (params.row.serviceStatus == "BUYER_CONFIRM") {
+                return h('div', [h('span', {}, '买家确认收货'),]);
+              } else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('span', {}, '买家取消售后'),]);
+              } else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('span', {}, '完成售后'),]);
+              } else if (params.row.serviceStatus == "WAIT_REFUND") {
+                return h('div', [h('span', {}, '待平台退款'),]);
+              }
+            }
+          },
+          {
+            title: "申请时间",
+            key: "createTime",
+            minWidth: 145,
+            tooltip: true
+          },
+        ],
+        refundGoodsOrderData: [],//售后单数据
+        refundGoodsOrderTotal: 0,//售后单总条数
+        //TA的退货单form
+        refundGoodsOrderSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        //TA的退款单form
+        refundOrderSearchForm: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        refundOrderData: [],//售后单数据
+        refundOrderTotal: 0,//售后单总条数
+      };
+    },
+    methods: {
+      init() {
+        //查店铺基本信息
+        this.getStoreInfo();
+        //查询店铺分类
+        this.getCategories();
+        //查询订单信息
+        this.getOrderData();
+      },
+      //会员信息tab改变事件
+      storeInfoChange(v) {
+        if (v == "order") {
+          this.getOrderData();
+        }
+        if (v == "refundGoods") {
+          this.getRefundGoodsOrderData();
+        }
+        if(v == "refund"){
+          this.getRefundOrder();
+        }
+      },
+      //查询会员信息
+      getStoreInfo() {
+        API_Store.getShopDetailData(this.id).then((res) => {
+          this.$set(this, "storeInfo", res.result);
+          //因switch开关需要用到true或者false 所以进行一次格式化
+          this.storeInfo.storeDisable = this.storeInfo.storeDisable === "OPEN" ? true : false
+          this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(",");
+        });
+      },
+      //店铺状态改变事件
+      shopStatusChange(v) {
+        if (v) {
+          API_Store.enableBrand(this.id).then(res => {
+          });
+        } else {
+          API_Store.disableShop(this.id).then(res => {
+          });
+        }
+      },
+      //查询TA的订单
+      getOrderData() {
+        this.loading = true;
+        this.orderSearchForm.storeId = this.id
+        API_Order.getOrderList(this.orderSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.orderData = res.result.records;
+            this.orderTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      //查询TA的售后单
+      getRefundOrder() {
+        this.loading = true;
+        this.refundOrderSearchForm.storeId = this.id
+        this.refundOrderSearchForm.serviceType = "RETURN_MONEY"
+        API_Order.getAfterSaleOrderPage(this.refundOrderSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.refundOrderData = res.result.records;
+            this.refundOrderTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      //查询TA的售后单
+      getRefundGoodsOrderData() {
+        this.loading = true;
+        this.refundGoodsOrderSearchForm.storeId = this.id
+        this.refundGoodsOrderSearchForm.serviceType = "RETURN_GOODS"
+        API_Order.getAfterSaleOrderPage(this.refundGoodsOrderSearchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.refundGoodsOrderData = res.result.records;
+            this.refundGoodsOrderTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "after-order-detail",
+          query: {sn: sn},
+        });
+
+      },
+      //跳转到订单详情页面
+      orderDetail(v) {
+        this.$router.push({
+          name: "order-detail",
+          query: {sn: v},
+        });
+      },
+      //查询分类
+      getCategories() {
+        getCategoryTree().then((res) => {
+          if (res.success) {
+            this.categories = res.result;
+          }
+        });
+      },
+
+
+      //售后单页数变化
+      refundGoodsOrderChangePage(v) {
+        this.refundGoodsOrderSearchForm.pageNumber = v;
+        this.getRefundGoodsOrderData()
+      }
+      ,
+      //售后单页数变化
+      refundGoodsOrderChangePageSize(v) {
+        this.refundGoodsOrderSearchForm.pageSize = v;
+        this.getRefundGoodsOrderData();
+      },
+      //售后单
+      refundGoodsOrderChangeSort(e) {
+        this.refundGoodsOrderSearchForm.sort = e.key;
+        this.refundGoodsOrderSearchForm.order = e.order;
+        this.getRefundGoodsOrderData();
+      },
+
+      //退款单页数变化
+      refundOrderChangePage(v) {
+        this.refundOrderSearchForm.pageNumber = v;
+        this.getRefundOrder()
+      }
+      ,
+      //售后单页数变化
+      refundOrderChangePageSize(v) {
+        this.refundOrderSearchForm.pageSize = v;
+        this.getRefundOrder();
+      },
+      //售后单
+      refundOrderChangeSort(e) {
+        this.refundOrderSearchForm.sort = e.key;
+        this.refundOrderSearchForm.order = e.order;
+        this.getRefundOrder();
+      },
+      //订单记录页数变化
+      orderChangePage(v) {
+        this.orderSearchForm.pageNumber = v;
+        this.getOrderData()
+      }
+      ,
+      //订单记录页数变化
+      orderChangePageSize(v) {
+        this.orderSearchForm.pageSize = v;
+        this.getOrderData();
+      },
+      orderChangeSort(e) {
+        this.orderSearchForm.sort = e.key;
+        this.orderSearchForm.order = e.order;
+        this.getOrderData();
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.orderSearchForm.startDate = v[0];
+          this.orderSearchForm.endDate = v[1];
+        }
+      },
+      selectRefundGoodsDateRange(v) {
+        if (v) {
+          this.refundGoodsOrderSearchForm.startDate = v[0];
+          this.refundGoodsOrderSearchForm.endDate = v[1];
+        }
+      },
+      selectRefundDateRange(v) {
+        if (v) {
+          this.refundOrderSearchForm.startDate = v[0];
+          this.refundOrderSearchForm.endDate = v[1];
+        }
+      },
+    },
+
+    mounted() {
+      this.id = this.$route.query.id;
+      this.init();
+    }
+    ,
+  };
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+  @import "shopDetail.scss";
+
+</style>
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
new file mode 100644
index 00000000..ca659c50
--- /dev/null
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -0,0 +1,489 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="会员名称" prop="memberName">
+              <Input
+                type="text"
+                v-model="searchForm.memberName"
+                placeholder="请输入会员名称"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="店铺名称" prop="storeName">
+              <Input
+                type="text"
+                v-model="searchForm.storeName"
+                placeholder="请输入店铺名称"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="店铺状态" prop="shopDisable">
+              <Select v-model="searchForm.shopDisable" clearable style="width: 200px">
+                <Option value="OPEN">开启中</Option>
+                <Option value="CLOSED">已关闭</Option>
+                <Option value="APPLY">申请中</Option>
+                <Option value="APPLYING">审核中</Option>
+                <Option value="REFUSED">审核拒绝</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+              <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="operation padding-row">
+          <Button @click="add" type="primary">添加</Button>
+        </Row>
+        <Row>
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <Row type="flex" justify="end" class="page">
+          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+            size="small" show-total show-elevator show-sizer></Page>
+        </Row>
+      </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import {
+  getShopListData,
+  disableShop,
+  enableBrand,
+  shopAudit,
+} from "@/api/shops";
+import shopOperation from "./shopOperation";
+export default {
+  name: "shop",
+  components: {
+    shopOperation,
+  },
+  data() {
+    return {
+      shopId: "",
+      modalFlag: false,
+      loading: true, // 表单加载状态
+      drop: false,
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        memberName: "",
+        storeName: "",
+        shopDisable: "",
+        id: "",
+        createTime: "",
+      },
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120,
+          align: "left",
+        },
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 130,
+          tooltip: true
+        },
+        {
+          title: "店铺地址",
+          key: "storeAddressPath",
+          width: 300,
+          tooltip: true
+        },
+        {
+          title: "是否自营",
+          key: "selfOperated",
+          align: "left",
+          width: 120,
+          render: (h, params) => {
+            return h(
+              "Tag",
+              {
+                props: {
+                  color: params.row.selfOperated ? "error" : "success",
+                },
+              },
+              params.row.selfOperated  ? "自营" : "非自营"
+            );
+          },
+        },
+
+        {
+          title: "店铺状态",
+          key: "storeDisable",
+          align: "left",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.storeDisable == "OPEN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "开启中",
+                  },
+                }),
+              ]);
+            } else if (params.row.storeDisable == "CLOSED") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "已关闭",
+                  },
+                }),
+              ]);
+            } else if (params.row.storeDisable == "APPLY") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "申请中",
+                  },
+                }),
+              ]);
+            } else if (params.row.storeDisable == "APPLYING") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核中",
+                  },
+                }),
+              ]);
+            } else if (params.row.storeDisable == "REFUSED") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核拒绝",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          align: "left",
+          width: 170
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 200,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            let enableOrDisable = "";
+            if (params.row.storeDisable == "OPEN") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "error"
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.disable(params.row);
+                    },
+                  },
+                },
+                "关闭"
+              );
+            } else if (params.row.storeDisable == "CLOSED") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row);
+                    },
+                  },
+                },
+                "开启"
+              );
+            } else if (params.row.storeDisable == "APPLYING") {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.audit(params.row);
+                      },
+                    },
+                  },
+                  "审核"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+              ]);
+            }
+
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                    display: this.selectedShop ? "inline-block" : "none",
+                  },
+                  on: {
+                    click: () => {
+                      this.callback(params.row);
+                    },
+                  },
+                },
+                "选择"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "查看"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                    ghost:true
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "修改"
+              ),
+              enableOrDisable,
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      selectedShop: false, //用于是否选择店铺
+    };
+  },
+
+  methods: {
+    callbackShop() {
+      this.init();
+    },
+    // 回调给父级
+    callback(val) {
+      this.$emit("callback", val);
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getShopListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    add() {
+      this.$router.push({ path: '/shop-operation'});
+    },
+    edit(v) {
+      this.$router.push({ path: '/shop-operation', query: { shopId: v.id } });
+    },
+    disable(v) {
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您确认要禁用店铺 " + v.storeName + " ?",
+        loading: true,
+        onOk: () => {
+          disableShop(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //查看店铺详细
+    detail(row){
+      this.$router.push({ name: "shop-detail", query: { id: row.id } });
+    },
+    audit(v) {
+      this.$Modal.confirm({
+        title: "审核店铺",
+        content: "您确认要审核通过店铺 " + v.storeName + " ?",
+        okText: "通过",
+        cancelText: "驳回",
+        loading: true,
+        onOk: () => {
+          shopAudit(v.id, 0).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+        onCancel: () => {
+          shopAudit(v.id, 1).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    enable(v) {
+      this.$Modal.confirm({
+        title: "确认启用",
+        content: "您确认要启用店铺 " + v.storeName + " ?",
+        loading: true,
+        onOk: () => {
+          enableBrand(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
new file mode 100644
index 00000000..1f54ba9e
--- /dev/null
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -0,0 +1,617 @@
+<template>
+  <div>
+    <Card>
+      <Tabs v-model="tabName" :animated="false" style="overflow: visible">
+        <Form ref="shopForm" :model="shopForm" :label-width="130" label-position="right" :rules="shopValidate">
+          <TabPane label="基本信息" class="tab" name="base">
+            <Divider orientation="left">基本信息</Divider>
+            <!-- 遮罩层  -->
+            <div v-if="isRead" class="mask">只读不可修改</div>
+            <div>
+              <FormItem label="会员名称" required prop="memberName">
+                <div class="item">
+                  <Input disabled v-model="shopForm.memberName" />
+                  <Button @click="selectMember()" v-if="!$route.query.shopId">选择会员</Button>
+
+                </div>
+              </FormItem>
+              <FormItem label="店铺名称" prop="storeName">
+                <Input v-model="shopForm.storeName" clearable style="width: 350px" />
+              </FormItem>
+
+              <FormItem label="是否自营" prop="selfOperated">
+                <RadioGroup v-model="shopForm.selfOperated">
+                  <Radio :key=0 :label=0>自营</Radio>
+                  <Radio :key=1 :label=1>非自营</Radio>
+                </RadioGroup>
+              </FormItem>
+
+              <FormItem label="店铺经纬度" prop="shopCenter">
+                <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" />
+              </FormItem>
+
+              <FormItem label="店铺所在地" prop="storeAddressPath">
+                <Input disabled v-model="shopForm.storeAddressPath" style="width: 350px" />
+              </FormItem>
+              <FormItem label="店铺详细地址" required prop="storeAddressDetail">
+                <Input v-model="shopForm.storeAddressDetail" clearable style="width: 350px" />
+              </FormItem>
+
+              <FormItem label="店铺logo" class="storeLogo">
+                <Avatar style="height: 100px;width: 100px" v-if="shopForm.storeLogo" shape="square" icon="ios-person" size="default" :src="shopForm.storeLogo" />
+                <div>
+                  <Button @click="handleCLickImg('storeLogo')" type="primary">选择图片</Button>
+                </div>
+              </FormItem>
+
+              <FormItem label="店铺简介" prop="storeDesc" style="width: 350px">
+                <Input v-model="shopForm.storeDesc" type="textarea" :rows="4" clearable style="width: 400px" />
+              </FormItem>
+              <br>
+              <Divider orientation="left">退货收件地址</Divider>
+              <FormItem label="收件人姓名" prop="salesConsigneeName">
+                <Input v-model="shopForm.salesConsigneeName" clearable style="width: 350px" />
+              </FormItem>
+              <FormItem label="收件人手机" prop="salesConsigneeMobile">
+                <Input v-model="shopForm.salesConsigneeMobile" clearable maxlength="11" style="width: 350px" />
+              </FormItem>
+              <FormItem label="地址信息" prop="salesConsigneeAddressPath">
+                <Input v-model="shopForm.salesConsigneeAddressPath" disabled style="width: 305px" v-if="showRegion == false" />
+                <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary" icon="ios-create-outline" style="margin-left: 8px">修改
+                </Button>
+                <region style="width: 350px" @selected="selectedConsigneeRegion" v-if="showRegion == true" />
+              </FormItem>
+              <FormItem label="详细地址" prop="salesConsigneeDetail">
+                <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
+              </FormItem>
+              <Spin fix v-if="loading"></Spin>
+            </div>
+          </TabPane>
+          <TabPane label="入驻信息" class="tab" name="sms">
+            <!-- 遮罩层  -->
+            <div v-if="isRead" class="mask">只读不可修改</div>
+            <Divider orientation="left">公司信息</Divider>
+            <div>
+              <FormItem label="公司名称" required prop="companyName">
+                <Input v-model="shopForm.companyName" clearable style="width: 350px" />
+              </FormItem>
+
+              <FormItem label="公司电话" required prop="companyPhone">
+                <Input v-model="shopForm.companyPhone" clearable style="width: 350px" />
+              </FormItem>
+              <FormItem label="公司所在地" required>
+                <Input v-model="shopForm.companyAddressPath" disabled style="width: 260px" v-if="showRegion == false" />
+                <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary" icon="ios-create-outline" style="margin-left: 8px">修改
+                </Button>
+                <region style="width: 350px" @selected="selectedRegion" v-if="showRegion == true" />
+              </FormItem>
+              <FormItem label="公司详细地址" required prop="companyAddress">
+                <Input v-model="shopForm.companyAddress" clearable style="width: 350px" />
+              </FormItem>
+              <FormItem label="员工总数" required prop="employeeNum">
+                <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.employeeNum">
+                </InputNumber>
+              </FormItem>
+              <FormItem label="注册资金" required prop="registeredCapital">
+                <InputNumber style="width: 150px" :min="1" :max="9999999" v-model="shopForm.registeredCapital">
+                </InputNumber>
+                <span style="margin-left: 10px">万</span>
+              </FormItem>
+              <FormItem label="联系人姓名" required prop="linkName">
+                <Input v-model="shopForm.linkName" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="联系人手机" required prop="linkPhone">
+                <Input v-model="shopForm.linkPhone" maxlength="11" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="电子邮箱" required prop="companyEmail">
+                <Input v-model="shopForm.companyEmail" clearable style="width: 200px" />
+              </FormItem>
+
+              <Divider orientation="left">营业执照信息</Divider>
+
+              <FormItem label="营业执照号" required prop="licenseNum">
+                <Input v-model="shopForm.licenseNum" clearable style="width: 200px" />
+              </FormItem>
+
+              <FormItem label="法定经营范围" required prop="scope">
+                <Input v-model="shopForm.scope" clearable style="width: 200px" />
+              </FormItem>
+
+              <Divider orientation="left">法人信息</Divider>
+
+              <FormItem label="法人姓名" required prop="legalName">
+                <Input v-model="shopForm.legalName" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="法人证件号" required prop="legalId">
+                <Input v-model="shopForm.legalId" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="法人身份证照片" required ref="legalPhoto">
+                <Avatar style="height: 100px;width: 100px" v-if="shopForm.legalPhoto" shape="square" icon="ios-person" size="default" :src="shopForm.legalPhoto" />
+                <div>
+                  <Button @click="handleCLickImg('legalPhoto')" type="primary">选择图片</Button>
+                </div>
+              </FormItem>
+
+              <Divider orientation="left">结算银行信息</Divider>
+              <FormItem label="银行开户名" required prop="settlementBankAccountName">
+                <Input v-model="shopForm.settlementBankAccountName" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="银行账号" required prop="settlementBankAccountNum">
+                <Input v-model="shopForm.settlementBankAccountNum" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="银行支行名称" required prop="settlementBankBranchName">
+                <Input v-model="shopForm.settlementBankBranchName" clearable style="width: 200px" />
+              </FormItem>
+              <FormItem label="支行联行号" required prop="settlementBankJointName">
+                <Input v-model="shopForm.settlementBankJointName" clearable style="width: 200px" />
+              </FormItem>
+
+              <FormItem label="许可证电子版" required>
+                <Avatar style="height: 100px;width: 100px" v-if="shopForm.licencePhoto" shape="square" icon="ios-person" size="default" :src="shopForm.licencePhoto" />
+                <div>
+                  <Button @click="handleCLickImg('licencePhoto')" type="primary">选择图片</Button>
+                </div>
+              </FormItem>
+              <Spin fix v-if="loading"></Spin>
+            </div>
+          </TabPane>
+          <TabPane label="经营范围" class="tab" name="category">
+
+            <!-- 遮罩层  -->
+            <div v-if="isRead" class="mask">只读不可修改</div>
+            <FormItem label="经营类目" prop="goodsManagementCategory">
+              <div>
+                <Checkbox :indeterminate="indeterminate" :value="checkAll" @click.prevent.native="handleCheckAll">全选
+                </Checkbox>
+              </div>
+              <CheckboxGroup v-model="checkAllGroup" @on-change="checkAllGroupChange">
+                <Checkbox v-for="(item, i) in categories" :key="i + 1" :label="item.id">{{ item.name }}
+                </Checkbox>
+              </CheckboxGroup>
+            </FormItem>
+          </TabPane>
+
+          <TabPane label="配送信息" class="tab" name="distribution">
+
+            <!-- 遮罩层  -->
+            <FormItem label="达达编码" prop="ddCode">
+              <Input v-model="shopForm.ddCode" maxlength="20" clearable style="width: 200px" />
+            </FormItem>
+          </TabPane>
+
+          <TabPane label="结算信息" class="tab" name="settlement">
+            <FormItem label="结算周期">
+              <Tag v-for="item in settlementCycle" :key="item" :name="item" closable style="marrgin-left: 10px" @on-close="removesettlementCycle">{{ item }}
+              </Tag>
+              <InputNumber :max="28" :min="1" v-model="day" v-show="settlementShow"></InputNumber>
+              <Button type="default" @click="addsettlementCycle" size="small" v-if="addSettlementBtn" style="margin-left: 8px">添加结算周期
+              </Button>
+              <Button v-if="addSettlementConfirmBtn" type="default" @click="addsettlementCycleConfirm" size="small" style="margin-left: 8px">确认
+              </Button>
+            </FormItem>
+          </TabPane>
+        </Form>
+      </Tabs>
+      <div align="center">
+        <Button type="primary" @click="save" v-if="!isRead" style="width: 100px; margin-right: 5px">{{ shopId ? "修改" :
+          "保存" }}
+        </Button>
+      </div>
+    </Card>
+    <liliMap ref="liliMap" @getAddress="getAddress"></liliMap>
+
+    <Modal width="1200px" v-model="picModalFlag">
+      <ossManage @callback="callbackSelected" ref="ossManage" />
+    </Modal>
+
+    <Modal width="1200px" v-model="memberModalFlag">
+      <memberLayout @callback="callbackMember" class="selectedMember" ref="memberLayout" />
+    </Modal>
+  </div>
+</template>
+
+<script>
+import memberLayout from "@/views/member/list/index";
+import ossManage from "@/views/sys/oss-manage/ossManage";
+import { getCategoryTree } from "@/api/goods";
+import { shopDetail, shopAdd, shopEdit, getShopByMemberId } from "@/api/shops";
+import * as filters from "@/utils/filters";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+import region from "@/views/lili-components/region";
+import liliMap from "@/views/my-components/map/index";
+
+export default {
+  name: "shop-operation",
+  components: {
+    uploadPicInput,
+    ossManage,
+    region,
+    memberLayout,
+    liliMap,
+  },
+
+  data() {
+    return {
+      shopId: this.$route.query.shopId,
+      isRead: false, //是否只读，只有在店铺通过审核才可修改
+      regionAddressFlag: true,
+      selectedFormBtnName: "", //点击图片绑定form
+      picModalFlag: false, //图片选择器
+      memberModalFlag: false, //商家账号
+      settlementShow: false, //是否展示结算日输入框
+      addSettlementConfirmBtn: false, //添加结算日确认按钮
+      addSettlementBtn: true, //添加结算日按钮
+      day: 0, //结算日
+      shopValidate: {
+        // 表单验证规则
+        memberName: [
+          { required: true, message: "会员不能为空", trigger: "blur" },
+        ],
+        storeName: [
+          { required: true, message: "店铺名称不能为空", trigger: "blur" },
+        ],
+        companyAddress: [
+          { required: true, message: "公司地址不能为空", trigger: "blur" },
+        ],
+        storeAddressDetail: [
+          { required: true, message: "店铺详细地址不能为空", trigger: "blur" },
+        ],
+        storeDesc: [
+          { required: true, message: "店铺简介不能为空", trigger: "blur" },
+        ],
+        storeCenter: [
+          { required: true, message: "店铺经纬度不能为空", trigger: "change" },
+        ],
+        companyName: [
+          { required: true, message: "公司名称不能为空", trigger: "blur" },
+        ],
+        companyPhone: [
+          { required: true, message: "公司电话不能为空", trigger: "blur" },
+        ],
+        employeeNum: [
+          {
+            required: true,
+            type: "number",
+            message: "员工总数不能为空",
+            trigger: "blur",
+          },
+        ],
+        registeredCapital: [
+          {
+            required: true,
+            type: "number",
+            message: "注册资金不能为空",
+            trigger: "blur",
+          },
+        ],
+        linkName: [
+          { required: true, message: "联系人姓名不能为空", trigger: "blur" },
+        ],
+        linkPhone: [
+          { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+          {
+            type: "string",
+            pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
+            message: "手机号格式出错",
+            trigger: "blur",
+          },
+        ],
+        companyEmail: [
+          { required: true, message: "邮箱不能为空", trigger: "blur" },
+          { type: "email", message: "邮箱格式错误", trigger: "blur" },
+        ],
+        licenseNum: [
+          { required: true, message: "营业执照号不能为空", trigger: "blur" },
+        ],
+        scope: [
+          { required: true, message: "法定经营范围不能为空", trigger: "blur" },
+        ],
+        legalName: [
+          { required: true, message: "法人姓名不能为空", trigger: "blur" },
+        ],
+        legalId: [
+          { required: true, message: "法人证件号不能为空", trigger: "blur" },
+        ],
+        settlementBankAccountName: [
+          { required: true, message: "银行开户名不能为空", trigger: "blur" },
+        ],
+        settlementBankAccountNum: [
+          { required: true, message: "银行账号不能为空", trigger: "blur" },
+        ],
+        settlementBankBranchName: [
+          { required: true, message: "银行支行名称不能为空", trigger: "blur" },
+        ],
+        settlementBankJointName: [
+          { required: true, message: "支行联行号不能为空", trigger: "blur" },
+        ],
+        salesConsigneeMobile: [
+          {
+            type: "string",
+            pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
+            message: "手机号格式出错",
+            trigger: "blur",
+          },
+        ],
+      },
+      selectMemberList: [],
+      memberList: [],
+      indeterminate: true,
+      checkAll: false,
+      checkAllGroup: [],
+      showRegion: false,
+      submitLoading: false, // 添加或编辑提交状态
+      settlementCycle: [],
+      shopForm: {
+        settlementCycle: "",
+        selfOperated: 0,
+        memberName: "",
+        companyName: "",
+        addressPath: "",
+        addressIdPath: "",
+        companyAddress: "",
+        companyEmail: "",
+        employeeNum: 1,
+        registeredCapital: 1,
+        linkName: "",
+        linkPhone: "",
+        licenseNum: "",
+        scope: "",
+        licencePhoto: "",
+        legalName: "",
+        legalId: "",
+        legalPhoto: "",
+        companyPhone: "",
+        settlementBankAccountName: "",
+        settlementBankAccountNum: "",
+        settlementBankBranchName: "",
+        settlementBankJointName: "",
+        businesses: "",
+        storeName: "",
+        storeLogo: "",
+        storeDesc: "",
+        ddCode: "",
+      },
+      categories: [],
+
+      infoResult: "",
+    };
+  },
+  methods: {
+    // 选择会员的回调
+    callbackMember(val) {
+      if (val) {
+        //选择会员后需要检验此会员是否开过店铺
+        getShopByMemberId(val.id).then((res) => {
+          if (res.success) {
+            if (res.result != null) {
+              this.$Message.error("当前会员已经拥有店铺");
+            } else {
+              this.shopForm.memberId = val.id;
+              this.shopForm.memberName = val.username;
+            }
+            this.memberModalFlag = false;
+          }
+        });
+      }
+    },
+
+    //选择会员
+    selectMember() {
+      this.$refs["memberLayout"].selectedMember = true;
+      this.memberModalFlag = true;
+    },
+
+    //修改地址
+    regionClick() {
+      this.showRegion = true;
+      this.regionId = "";
+    },
+    //删除所选择的结算日
+    removesettlementCycle(event, name) {
+      this.settlementCycle = this.settlementCycle.filter((i) => i !== name);
+    },
+    //确认添加方法
+    addsettlementCycle() {
+      this.settlementShow = true;
+      this.addSettlementConfirmBtn = true;
+      this.addSettlementBtn = false;
+    },
+    //添加结算日
+    addsettlementCycleConfirm() {
+      console.warn(this.settlementCycle.includes(this.day + ""));
+      if (this.day !== null && !this.settlementCycle.includes(this.day + "")) {
+        this.settlementCycle.push(this.day);
+      }
+      this.addSettlementConfirmBtn = false;
+      this.addSettlementBtn = true;
+      this.settlementShow = false;
+      this.day = 1;
+    },
+    // 选择地址
+    selectedRegion(val) {
+      this.$set(this.shopForm, "companyAddressIdPath", val[0]);
+      this.$set(this.shopForm, "companyAddressPath", val[1]);
+    },
+    // 选中的地址
+    selectedConsigneeRegion(val) {
+      this.shopForm.salesConsigneeAddressPath = val[1];
+      this.shopForm.salesConsigneeAddressId = val[0];
+    },
+
+    handleCLickImg(val) {
+      this.$refs.ossManage.selectImage = true;
+      this.picModalFlag = true;
+      this.selectedFormBtnName = val;
+    },
+
+    callbackSelected(val) {
+      this.picModalFlag = false;
+      this.shopForm[this.selectedFormBtnName] = val.url;
+    },
+
+    init() {
+      this.getCategories();
+      if (this.shopId) {
+        this.getShopDetail();
+      }
+    },
+    filterMethod(value, option) {
+      if (value && option) {
+        return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+      }
+    },
+
+    getShopDetail() {
+      shopDetail(this.shopId).then((res) => {
+        if (res.result) {
+          this.infoResult = res.result;
+          this.shopForm = res.result;
+          console.warn(this.shopForm);
+          this.checkAllGroup = this.shopForm.goodsManagementCategory.split(",");
+          if (this.shopForm.settlementCycle != "")
+            this.shopForm.settlementCycle.split(",").forEach((e) => {
+              this.settlementCycle.push(e);
+            });
+        }
+      });
+    },
+    save() {
+      this.$refs.shopForm.validate((valid) => {
+        //校验结算日是否已经确认完成
+        if (this.settlementShow) {
+          this.$Message.error("请确认当前所填结算日信息");
+          return;
+        }
+        if (valid) {
+          //校验经营类目
+          if (this.checkAllGroup == "") {
+            this.$Message.error("请选择店铺经营类目");
+            return;
+          }
+          //校验公司所在地
+          if (this.shopForm.companyAddressPath == "") {
+            this.$Message.error("请选择公司所在地");
+            return;
+          }
+          //处理结算日 去掉最后一个逗号存储
+          this.shopForm.goodsManagementCategory = this.checkAllGroup;
+          this.shopForm.settlementCycle = this.settlementCycle;
+          if (this.shopId) {
+            delete this.shopForm.memberId;
+            shopEdit(this.shopId, this.shopForm).then((res) => {
+              if (res.success) {
+                this.$Message.success("编辑成功");
+                this.$router.push({ name: "shopList" });
+              }
+            });
+          } else {
+            //添加店铺单独需要检验的参数
+            if (this.shopForm.memberName == "") {
+              this.$Message.error("请选择开店的会员");
+              return;
+            }
+            shopAdd(this.shopForm).then((resp) => {
+              if (resp.success) {
+                this.$Message.success("添加成功");
+                this.shopForm = {};
+                this.$router.push({ name: "shopList" });
+              }
+            });
+          }
+        }
+      });
+    },
+    //获取地址
+    getAddress(item) {
+      this.shopForm.storeCenter = item.position.lat + "," + item.position.lng;
+      this.$set(this.shopForm, "storeAddressPath", item.addr);
+      this.$set(this.shopForm, "storeAddressIdPath", item.addrId);
+    },
+    handleCheckAll() {
+      if (this.indeterminate) {
+        this.checkAll = false;
+      } else {
+        this.checkAll = !this.checkAll;
+      }
+      this.indeterminate = false;
+
+      if (this.checkAll) {
+        let checkAllDate = [];
+        this.categories.forEach((i) => checkAllDate.push(i.id));
+        this.checkAllGroup = checkAllDate;
+      } else {
+        this.checkAllGroup = [];
+      }
+    },
+    checkAllGroupChange(data) {
+      if (data.length === this.categories.length) {
+        this.indeterminate = false;
+        this.checkAll = true;
+      } else if (data.length > 0) {
+        this.indeterminate = true;
+        this.checkAll = false;
+      } else {
+        this.indeterminate = false;
+        this.checkAll = false;
+      }
+    },
+    getCategories() {
+      getCategoryTree().then((res) => {
+        if (res.success) {
+          this.categories = res.result;
+        }
+      });
+    },
+  },
+  created() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.selectedMember {
+  width: 100%;
+}
+
+.mask {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(105, 105, 105, 0.1);
+  z-index: 9;
+}
+
+/deep/ .ivu-tabs-bar {
+  margin: 0;
+}
+
+.tab {
+  padding: 16px;
+  position: relative;
+}
+
+.categories-checkbox {
+  display: flex;
+  align-items: center;
+}
+
+.img {
+  margin-right: 10px;
+  width: 100px;
+  height: 100px;
+}
+
+.item {
+  width: 350px !important;
+  display: flex;
+
+  > * {
+    margin: 0 4px;
+  }
+}
+</style>
diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue
new file mode 100644
index 00000000..2d43c4e3
--- /dev/null
+++ b/manager/src/views/sensitiveWords/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row class="operation">
+            <Button @click="add" type="primary">添加</Button>
+            <Button @click="delAll">批量删除</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="敏感词" prop="sn">
+          <Input v-model="form.sensitiveWord" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getSensitiveWordsPage,
+  delSensitive,
+  insertSensitiveWords,
+  updateSensitiveWords
+} from "@/api/index";
+export default {
+  name: "bill",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        sensitiveWord: "",
+      },
+      selectDate: null,
+      form: {
+        // 添加或编辑表单对象初始化数据
+        sensitiveWord: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        sensitiveWord: [
+          {
+            required: true,
+            message: "请输入敏感词",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "敏感词",
+          key: "sensitiveWord",
+          minWidth: 120
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          width: 200
+        },
+        {
+          title: "更新时间",
+          key: "updateTime",
+          width: 200
+        },
+        {
+          title: "操作人",
+          key: "createBy",
+          minWidth: 150
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "修改"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+
+      getSensitiveWordsPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+
+          if (this.modalType == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            insertSensitiveWords(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            updateSensitiveWords(this.id,this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.form = {}
+      this.$refs.form.resetFields();
+
+      this.modalVisible = true;
+    },
+    detail(v) {
+      this.modalType = 1;
+      this.id = v.id;
+      this.modalTitle = "修改";
+      this.modalVisible = true;
+      this.form.sensitiveWord = v.sensitiveWord;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.sensitiveWord + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delSensitive(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          // 批量删除
+          delSensitive(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+
+</style>
diff --git a/manager/src/views/statistics/goods.vue b/manager/src/views/statistics/goods.vue
new file mode 100644
index 00000000..17b9b4e3
--- /dev/null
+++ b/manager/src/views/statistics/goods.vue
@@ -0,0 +1,120 @@
+<template>
+  <div>
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+        <affixTime :closeShop="true" @selected="clickBreadcrumb"/>
+      </Card>
+    </Affix>
+    <Card class="card">
+
+      <Tabs @on-click="handleClickType">
+        <TabPane label="热门商品订单数量" name="NUM">
+          <Table :columns="columns" :data="data"></Table>
+        </TabPane>
+        <TabPane label="热门商品订单金额" name="PRICE">
+          <Table :columns="columns" :data="data"></Table>
+        </TabPane>
+      </Tabs>
+
+    </Card>
+  </div>
+</template>
+<script>
+import memberLayout from "@/views/member/list";
+import * as API_Goods from "@/api/goods";
+import affixTime from "@/views/lili-components/affix-time";
+
+export default {
+  components: {
+
+    affixTime,
+    memberLayout,
+  },
+  data() {
+    return {
+      total: 0,
+      year: "",
+      params: {
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        shopId: "",
+        type: "NUM"
+      },
+      columns: [
+        {
+          title: "商品名称",
+          key: "goodsName",
+        },
+        {
+          title: "销售数量",
+          key: "num",
+        },
+        {
+          title: "销售金额",
+          key: "price",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price)
+            );
+          },
+        },
+      ],
+      data: [],
+    };
+  },
+  methods: {
+    handleClickType(name) {
+      this.params.type = name;
+      this.getData();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = item;
+      let type = this.params.type;
+      this.params = {...callback};
+      this.params.type = type;
+      this.getData();
+    },
+    getData() {
+      Promise.all([API_Goods.goodsStatistics(this.params)]).then((res) => {
+        if (res[0].result) {
+          this.data = res[0].result;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.getData();
+  },
+};
+</script>
+<style scoped lang="scss">
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+
+.order-col {
+  display: flex;
+
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+
+.order-list {
+  display: flex;
+}
+
+.tips {
+  margin: 0 8px;
+}
+
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/manager/src/views/statistics/member.vue b/manager/src/views/statistics/member.vue
new file mode 100644
index 00000000..a233660f
--- /dev/null
+++ b/manager/src/views/statistics/member.vue
@@ -0,0 +1,221 @@
+<template>
+  <div class="wrapper">
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+        <affixTime :closeShop="true" @selected="clickBreadcrumb" />
+      </Card>
+    </Affix>
+
+    <Card class="card">
+      <div>
+        <h4>客户增长趋势</h4>
+        <div id="orderChart"></div>
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>客户增长报表</h4>
+        <Table style="margin-top:10px;" stripe :columns="columns" :data="data"></Table>
+
+      </div>
+    </Card>
+
+  </div>
+</template>
+<script>
+import * as API_Member from "@/api/member";
+import { Chart } from "@antv/g2";
+import affixTime from "@/views/lili-components/affix-time";
+
+export default {
+  components: { affixTime },
+
+  data() {
+    return {
+      columns: [
+        {
+          key: "createDate",
+          title: "日期",
+          sortable: true,
+        },
+        {
+          key: "memberCount",
+          title: "当前会员",
+        },
+        {
+          key: "newlyAdded",
+          title: "新增会员",
+        },
+        {
+          key: "activeQuantity",
+          title: "活跃会员",
+        },
+      ],
+      // 时间
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          value: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          value: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          value: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          value: "LAST_THIRTY",
+        },
+      ],
+      year: "",
+      orderChart: "",
+      defaultParams: {
+        month: "",
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        storeId: "",
+        year: "",
+      },
+
+      params: {
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        shopId: "",
+      },
+
+      data: [],
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        this.init();
+      },
+      deep: true,
+      immediate:true,
+    },
+    year(val) {
+      this.params.year = new Date(val).getFullYear();
+    },
+  },
+  methods: {
+    // 订单图
+    initMemberChart() {
+      // 默认已经加载 legend-filter 交互
+      /**
+       * 将数据分成三组来进行展示
+       */
+
+      let count = [];
+      let newly = [];
+      let actives = [];
+
+      this.data.forEach((item) => {
+        if (item.memberCount!="" || item.memberCount!=null) {
+          count.push({
+            createDate: item.createDate,
+            memberCount: item.memberCount,
+            title: "当前会员数量",
+          });
+        }
+        if (item.newlyAdded!="" || item.newlyAdded!=null) {
+          newly.push({
+            createDate: item.createDate,
+            memberCount: item.newlyAdded,
+            title: "新增会员数量",
+          });
+        }
+        if (item.activeQuantity!="" || item.activeQuantity!=null) {
+          actives.push({
+            createDate: item.createDate,
+            memberCount: item.activeQuantity,
+            title: "当日活跃数量",
+          });
+        }
+      });
+
+      let data = [...count, ...newly, ...actives];
+
+      this.orderChart.data(data);
+      this.orderChart.scale({
+        activeQuantity: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.orderChart
+        .line()
+        .position("createDate*memberCount")
+        .color("title")
+        .label("memberCount")
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("createDate*memberCount")
+        .color("title")
+        .label("memberCount")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+
+      this.orderChart.render();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = item;
+
+      console.warn(callback);
+      this.params = {...callback};
+    },
+
+    init() {
+      API_Member.getMemberStatistics(this.params).then((res) => {
+        if (res.result) {
+          res.result.forEach((item) => {
+            item.activeQuantity += "";
+          });
+          this.data = res.result;
+
+          if (!this.orderChart) {
+            this.orderChart = new Chart({
+              container: "orderChart",
+              autoFit: true,
+              height: 500,
+              padding: [70, 35, 70, 35],
+            });
+          }
+          this.initMemberChart();
+        }
+      });
+    },
+  },
+  mounted() {
+    let data = new Date();
+    this.year = data;
+  },
+};
+</script>
+<style scoped lang="scss">
+.wrapper {
+  padding-bottom: 200px;
+}
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
new file mode 100644
index 00000000..d36c84db
--- /dev/null
+++ b/manager/src/views/statistics/order.vue
@@ -0,0 +1,801 @@
+<template>
+
+  <div class="wrapper">
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+
+        <affixTime @selected="clickBreadcrumb" />
+
+      </Card>
+    </Affix>
+
+    <Card class="card">
+      <div>
+        <h4>交易概况</h4>
+        <div class="flex">
+          <div class="transactionList">
+            <div class="transaction-item" v-for="(item,index) in transactionList" :key="index">
+              <h4>{{item.label}}</h4>
+              <div class="transaction-card" v-if="item.label=='转换'">
+
+                <div class="card-item">
+                  <div class="card-item-label">访客数UV</div>
+                  <div class="card-item-value">{{overViewList.uvNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单转化率</div>
+                  <div class="card-item-value">{{overViewList.orderConversionRate || '0%'}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款转化率</div>
+                  <div class="card-item-value">{{overViewList.paymentsConversionRate ||'0%'}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">全店转化率</div>
+                  <div class="card-item-value">{{overViewList.overallConversionRate || '0%'}}</div>
+                </div>
+
+              </div>
+              <div class="transaction-card" v-if="item.label=='订单'">
+
+                <div class="card-item">
+                  <div class="card-item-label">下单笔数</div>
+                  <div class="card-item-value">{{overViewList.orderNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单人数</div>
+                  <div class="card-item-value">{{overViewList.orderMemberNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单金额</div>
+                  <div class="card-item-value">{{overViewList.orderAmount| unitPrice('￥') }}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款笔数</div>
+                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款金额</div>
+                  <div class="card-item-value">{{overViewList.paymentAmount | unitPrice('￥')}}</div>
+                </div>
+
+              </div>
+              <div class="transaction-card" v-if="item.label=='退单'">
+
+                <div class="card-item">
+                  <div class="card-item-label">退单笔数</div>
+                  <div class="card-item-value">{{overViewList.refundOrderNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">退单金额</div>
+                  <div class="card-item-value">{{overViewList.refundOrderPrice || 0}}</div>
+                </div>
+
+              </div>
+            </div>
+          </div>
+          <div class="shap">
+            <div id="overViewChart">
+              <!-- 上 -->
+              <div class="block">
+                <div class="box">
+                  <span>访客数</span>
+                  <span>{{overViewList.uvNum  || 0}}</span>
+                </div>
+              </div>
+              <!-- 中 -->
+              <div class="block">
+                <div class="box">
+                  <span>下单笔数</span>
+                  <span>{{overViewList.orderNum  || 0}}</span>
+                </div>
+              </div>
+              <!-- 下 -->
+              <div class="block">
+                <div class="box">
+                  <span>付款笔数</span>
+                  <span>{{overViewList.paymentsNum  || 0 }}</span>
+                </div>
+              </div>
+
+              <!-- 线 -->
+              <div class="rightBorder">
+
+              </div>
+              <div class="leftTopBorder">
+
+              </div>
+              <div class="leftBottomBorder">
+
+              </div>
+              <!--数据 -->
+              <div class="leftTopTips">
+                <div>下单转化率 </div>
+                <div>{{overViewList.orderConversionRate  || '0%' }}</div>
+              </div>
+              <div class="leftBottomTips">
+                <div>付款转化率</div>
+                <div>{{overViewList.paymentsConversionRate  || '0%'}}</div>
+              </div>
+              <div class="rightTips">
+                <div>整体转换率</div>
+                <div>{{overViewList.overallConversionRate  || '0%'}}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>交易趋势</h4>
+        <div>
+
+        </div>
+      </div>
+
+      <div>
+
+        <div id="orderChart"></div>
+
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>订退单统计</h4>
+        <div class="breadcrumb" style="margin-bottom:20px;">
+          <span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
+        </div>
+        <div>
+          <Table stripe :columns="columns" :data="data"></Table>
+
+        </div>
+        <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
+
+      </div>
+
+    </Card>
+
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+import { Chart } from "@antv/g2";
+import empty from "@/views/lili-empty";
+import orderRow from "./order/orderDetail";
+import refundRow from "./order/refundOrder";
+import affixTime from "@/views/lili-components/affix-time";
+
+export default {
+  components: { empty, orderRow, refundRow, affixTime },
+
+  data() {
+    return {
+      total: "0",
+      orderType: [
+        {
+          title: "订单",
+          selected: true,
+        },
+        {
+          title: "退单",
+          selected: false,
+        },
+      ],
+      // 订单状态
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+
+      serviceTypeList: {
+        CANCEL: "取消",
+        RETURN_GOODS: "退货",
+        EXCHANGE_GOODS: "换货",
+        RETURN_MONEY: "退款",
+      },
+      serviceStatusList: {
+        APPLY: "申请售后",
+        PASS: "通过售后",
+        REFUSE: "拒绝售后",
+        BUYER_RETURN: "买家退货，待卖家收货",
+        SELLER_RE_DELIVERY: "商家换货/补发",
+        SELLER_CONFIRM: "卖家确认收货",
+        SELLER_TERMINATION: "卖家终止售后",
+        BUYER_CONFIRM: "买家确认收货",
+        BUYER_CANCEL: "买家取消售后",
+        WAIT_REFUND: "等待平台退款",
+        COMPLETE: "完成售后",
+      },
+      //
+
+      data: [], //定退单存储值
+
+      columns: [], // 定退单title
+
+      orderColumns: [
+        {
+          type: "expand",
+          width: 50,
+          render: (h, params) => {
+            return h(orderRow, {
+              props: {
+                res: params.row,
+              },
+            });
+          },
+        },
+        {
+          title: "商家名称",
+          key: "storeName",
+        },
+        {
+          title: "用户名",
+          key: "memberName",
+        },
+
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          render: (h, params) => {
+            return h("div", this.orderStatusList[params.row.orderStatus]);
+          },
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+        },
+
+        {
+          title: "支付时间",
+          key: "paymentTime",
+          render: (h, params) => {
+            return h("div", params.row.paymentTime || "暂无");
+          },
+        },
+        {
+          title: "价格",
+          key: "flowPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+      ],
+      refundColumns: [
+        {
+          type: "expand",
+          width: 50,
+          render: (h, params) => {
+            return h(refundRow, {
+              props: {
+                res: params.row,
+              },
+            });
+          },
+        },
+        {
+          title: "商品图片",
+          key: "goodsImage",
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.goodsImage,
+              },
+              style: {
+                width: "60px",
+                verticalAlign: "middle",
+              },
+            });
+          },
+        },
+
+        {
+          title: "商品名称",
+          key: "goodsName",
+        },
+        {
+          title: "商家名称",
+          key: "sellerName",
+        },
+        {
+          title: "售后单类型",
+          key: "serviceType",
+          render: (h, params) => {
+            return h("div", this.serviceTypeList[params.row.serviceType]);
+          },
+        },
+        {
+          title: "售后单状态",
+          key: "serviceStatus",
+          render: (h, params) => {
+            return h("div", this.serviceStatusList[params.row.serviceStatus]);
+          },
+        },
+        {
+          title: "退款时间",
+          key: "refundTime",
+          render: (h, params) => {
+            return h("div", params.row.refundTime || "暂无");
+          },
+        },
+        {
+          title: "申请退款金额",
+          key: "applyRefundPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              "￥" +
+                (params.row.applyRefundPrice ? params.row.applyRefundPrice : 0)
+            );
+          },
+        },
+        {
+          title: "申请原因",
+          key: "reason",
+        },
+        {
+          title: "实际金额",
+          key: "flowPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+      ],
+
+      // 交易概况
+      transactionList: [
+        {
+          label: "转换",
+          value: "",
+        },
+        {
+          label: "订单",
+          value: "",
+        },
+        {
+          label: "退单",
+          value: "",
+        },
+      ],
+
+      chartList: [], // 绘制订单图表数据
+      orderChart: "", //订单图表
+
+      overViewList: {}, // 绘制订单统计概览
+      overViewChart: "", //订单订单统计概览图标
+
+      // 时间
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          value: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          value: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          value: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          value: "LAST_THIRTY",
+        },
+      ],
+      year: "",
+
+      // 订单传参
+      orderParams: {
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        year: "",
+        shopId: "",
+        memberId: "",
+      },
+      // 订单概念
+      overViewParams: {
+        month: "",
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        storeId: "",
+        year: "",
+      },
+      defaultParams: {
+        month: "",
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        storeId: "",
+        year: "",
+      },
+
+      refundIndex: 0,
+      // 退单订单
+      refundParams: {
+        pageNumber: 1,
+        pageSize: 10,
+        searchType: "LAST_SEVEN",
+        storeId: "",
+        year: "",
+      },
+
+      //
+      //
+    };
+  },
+  watch: {
+    refundParams: {
+      handler() {
+        if (this.refundIndex == 1) {
+          this.getOrderRefundList();
+        } else {
+          this.getOrderList();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+    orderParams: {
+      handler() {
+        this.initOrderChartList();
+      },
+      deep: true,
+    },
+    overViewParams: {
+      handler() {
+        this.initOrderOverViewList();
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    clickTab(item, index) {
+      this.refundIndex = index;
+      this.orderType.forEach((res) => {
+        res.selected = false;
+      });
+      if (item.title == "退单") {
+        this.getOrderRefundList();
+      } else {
+        this.getOrderList();
+      }
+      item.selected = true;
+    },
+    // 订单图
+    initOrderChart() {
+      // 默认已经加载 legend-filter 交互
+      let data = this.chartList;
+
+      data.forEach(item=>{
+        item.createTime =  item.createTime.split(" ")[0]
+        item.title="交易额"
+      })
+      this.orderChart.data(data);
+
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.orderChart
+        .line()
+        .position("createTime*price")
+         .label("price")
+         .color("title")
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("createTime*price")
+        .label("price")
+        .color("title")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+      this.orderChart.render();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = JSON.parse(JSON.stringify(item));
+
+      this.orderParams = callback;
+
+      this.overViewParams = callback;
+      this.refundParams = callback;
+    },
+
+    // 实例化订单概览
+    async initOrderOverViewList() {
+      const res = await API_Goods.getOrderOverView(this.overViewParams);
+      if (res.success) {
+        this.overViewList = res.result;
+
+      }
+    },
+    // 实例化订单图表
+    async initOrderChartList(name) {
+      const res = await API_Goods.getOrderChart(this.orderParams);
+      if (res.success) {
+        this.chartList = res.result;
+
+        if (!this.orderChart) {
+          this.orderChart = new Chart({
+            container: "orderChart",
+            autoFit: true,
+            height: 500,
+            padding: [70, 35, 70, 35],
+          });
+        }
+
+        this.initOrderChart(); //订单表
+      }
+    },
+    // 统计相关订单统计
+    async getOrderList() {
+      const res = await API_Goods.statisticsOrderList(this.refundParams);
+      if (res.success) {
+        this.data = res.result.records;
+        this.columns = this.orderColumns;
+        this.total = res.result.total;
+      }
+    },
+
+    //  统计相关退单统计
+    async getOrderRefundList() {
+      const res = await API_Goods.statisticsOrderRefundList(this.refundParams);
+      if (res.success) {
+        this.data = res.result.records;
+        this.columns = this.refundColumns;
+        this.total = res.result.total;
+      }
+    },
+
+    // 实例化初始值
+    initBaseParams() {
+      let data = new Date();
+      this.getOrderList();
+      this.orderParams.year = data.getFullYear();
+      this.overViewParams.year = data.getFullYear();
+    },
+  },
+
+  mounted() {
+    this.initBaseParams();
+  },
+};
+</script>
+<style scoped lang="scss">
+.active {
+  color: $theme_color;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: 3px;
+    bottom: -5px;
+    left: 0;
+    background: $theme_color;
+  }
+}
+.breadcrumb{
+  span{
+      cursor: pointer;
+  }
+}
+
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+.wrapper {
+  padding-bottom: 200px;
+}
+.page {
+  text-align: right;
+  margin: 20px 0;
+}
+#overViewChart {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  margin-left: 20px;
+  > .leftTopTips {
+    position: absolute;
+    top: 68px;
+    left: -2px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .leftBottomTips {
+    position: absolute;
+    bottom: 100px;
+    left: -2px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .rightTips {
+    position: absolute;
+    bottom: 240px;
+    right: 0px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .rightBorder {
+    width: 110px;
+    position: absolute;
+    top: 30px;
+    right: 40px;
+    border: 2px solid #d9d9d9;
+    border-left: 0;
+    height: 280px;
+  }
+  > .leftTopBorder {
+    border: 2px solid #d9d9d9;
+    height: 118px;
+    width: 56px;
+    position: absolute;
+    left: 40px;
+    top: 30px;
+    border-right: 0;
+  }
+  > .leftBottomBorder {
+    width: 108px;
+    border: 2px solid #d9d9d9;
+    height: 150px;
+    position: absolute;
+    bottom: 45px;
+    left: 40px;
+    border-right: 0;
+  }
+  > .block {
+    height: 0px;
+    border-left: 30px solid transparent;
+    border-right: 30px solid transparent;
+    position: relative;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    position: relative;
+  }
+  > .block:nth-of-type(1) {
+    width: 240px;
+    border-top: 90px solid #ff4646;
+    > .box {
+      left: -30px;
+      top: -90px;
+      width: 240px;
+      height: 90px;
+    }
+  }
+  > .block:nth-of-type(2) {
+    width: 172px;
+    border-top: 100px solid #ff8585;
+    margin-top: 10px;
+    > .box {
+      left: -29px;
+      top: -100px;
+      width: 172px;
+      height: 100px;
+    }
+  }
+  > .block:nth-of-type(3) {
+    width: 100px;
+    margin-top: 10px;
+    border-top: 150px solid #ffb396;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+
+    > .box {
+      left: -50px;
+      top: -150px;
+      width: 100px;
+      height: 120px;
+      z-index: 2;
+    }
+  }
+  /deep/ .box {
+    color: #fff;
+    position: absolute;
+
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    > span {
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+}
+
+.transaction-item {
+  margin: 10px 0;
+}
+h4 {
+  margin: 0 0 20px 0;
+}
+.transactionList {
+  flex: 7;
+  padding: 0 20px;
+}
+.shap {
+  width: 400px;
+  margin-left: 20px;
+  margin-top: 50px;
+}
+
+.transaction-card {
+  height: 120px;
+  border-radius: 0.4em;
+  display: flex;
+  background: #f3f5f7;
+}
+.card-item-label {
+  font-weight: bold;
+  font-size: #666;
+  font-size: 15px;
+  margin-bottom: 10px;
+}
+.card-item-value {
+  font-size: 15px;
+  font-weight: bold;
+  color: $theme_color;
+}
+.card-item {
+  height: 100%;
+
+  width: 20%;
+  align-items: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.order-col {
+  display: flex;
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+.order-list {
+  display: flex;
+}
+.tips {
+  margin: 0 8px;
+}
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/manager/src/views/statistics/order/orderDetail.vue b/manager/src/views/statistics/order/orderDetail.vue
new file mode 100644
index 00000000..3d445e01
--- /dev/null
+++ b/manager/src/views/statistics/order/orderDetail.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="wrapper">
+
+    <div class="shop">
+      <h3>订单详情</h3>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>订单来源</span>
+          <span>{{res.clientType}}</span>
+        </div>
+        <div class="label-item">
+          <span>订单状态</span>
+          <span>{{orderStatusList[res.orderStatus]}}</span>
+        </div>
+        <div class="label-item">
+          <span>付款状态</span>
+          <span>{{res.payStatus == "UNPAID"
+                ? "未付款"
+                : res.payStatus == "PAID"
+                ? "已付款"
+                : ""}}</span>
+        </div>
+        <div class="label-item">
+          <span>支付时间</span>
+          <span>{{res.paymentTime || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>支付方式</span>
+          <span>{{res.paymentMethod == "ONLINE" ? "在线支付" : ""
+            }}{{ res.paymentMethod == "ALIPAY" ? "支付宝" : res.paymentMethod == "BANK_TRANSFER" ? "银行卡" : "" || '暂无'}}</span>
+        </div>
+
+      </div>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>用户名</span>
+          <span>{{res.memberName}}</span>
+        </div>
+        <div class="label-item">
+          <span>店铺名称</span>
+          <span>{{res.storeName}}</span>
+        </div>
+        <div class="label-item">
+          <span>创建时间</span>
+          <span>{{res.createTime}}</span>
+        </div>
+
+      </div>
+      <h3>商品详情</h3>
+      <div class="shop-item">
+
+        <div class="goods-item" v-for="(item,index) in res.orderItems" :key="index">
+          <div class="goods-img">
+            <img class="img" :src="item.image" alt="">
+          </div>
+          <div class="goods-title">
+            <div>{{item.name}}</div>
+            <div>{{'x'+item.num}}</div>
+            <div class="goods-price">{{res.flowPrice |  unitPrice('￥')}}</div>
+
+          </div>
+
+        </div>
+      </div>
+      <div class="count-price">
+        <div class="label-item">
+          <span>总价格</span>
+          <span class="flowPrice">{{res.flowPrice |  unitPrice('￥')}}</span>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+    };
+  },
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+.shop {
+  padding: 10px 0;
+  background: #fff;
+}
+.shop-item {
+  display: flex;
+
+  flex-wrap: wrap;
+}
+h3 {
+  margin: 20px 16px;
+  font-size: 18px;
+}
+.goods-price {
+  font-size: 18px;
+  color: red;
+}
+.goods-item {
+  display: flex;
+  width: 100%;
+  margin: 16px;
+}
+.count-price {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.flowPrice {
+  font-size: 24px;
+  color: red;
+}
+.goods-title {
+  margin: 0 16px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-weight: bold;
+}
+
+.img {
+  width: 100px;
+  height: 100px;
+  border-radius: 10px;
+}
+.label-item {
+  margin: 10px 0;
+  width: 20%;
+  padding: 8px;
+  align-items: center;
+  font-weight: bold;
+  display: flex;
+  > span {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue
new file mode 100644
index 00000000..1967b0b8
--- /dev/null
+++ b/manager/src/views/statistics/order/refundOrder.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="wrapper">
+
+    <div class="shop">
+      <h3>售后详情</h3>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>售后类型</span>
+          <span>{{serviceTypeList[res.serviceType]}}</span>
+        </div>
+        <div class="label-item">
+          <span>售后单状态</span>
+          <span>{{serviceStatusList[res.serviceStatus]}}</span>
+        </div>
+
+        <div class="label-item">
+          <span>退款时间</span>
+          <span>{{res.refundTime || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>申请退款金额</span>
+          <span>{{res.applyRefundPrice || '0'}}</span>
+        </div>
+        <div class="label-item">
+          <span>商家备注</span>
+          <span>{{res.auditRemark || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>申请原因</span>
+          <span>{{res.reason || '暂无'}}</span>
+        </div>
+
+      </div>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>用户名</span>
+          <span>{{res.memberName}}</span>
+        </div>
+        <div class="label-item">
+          <span>店铺名称</span>
+          <span>{{res.sellerName}}</span>
+        </div>
+        <div class="label-item">
+          <span>创建时间</span>
+          <span>{{res.createTime}}</span>
+        </div>
+
+      </div>
+      <h3>商品详情</h3>
+      <div class="shop-item">
+
+        <div class="goods-item">
+          <div class="goods-img">
+            <img class="img" :src="res.goodsImage" alt="">
+          </div>
+          <div class="goods-title">
+            <div>{{res.goodsName}}</div>
+            <div>{{'x'+res.num}}</div>
+            <div class="goods-price">{{res.flowPrice |  unitPrice('￥')}}</div>
+
+          </div>
+
+        </div>
+      </div>
+      <div class="count-price">
+        <div class="label-item">
+          <span>实际退款金额</span>
+          <span class="flowPrice">{{res.flowPrice | unitPrice('￥')}}</span>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+      // 售后类型
+      serviceTypeList: {
+        CANCEL: "取消",
+        RETURN_GOODS: "退货",
+        EXCHANGE_GOODS: "换货",
+        RETURN_MONEY: "退款",
+      },
+      serviceStatusList: {
+        APPLY: "申请售后",
+        PASS: "通过售后",
+        REFUSE: "拒绝售后",
+        BUYER_RETURN: "买家退货，待卖家收货",
+        SELLER_RE_DELIVERY: "商家换货/补发",
+        SELLER_CONFIRM: "卖家确认收货",
+        SELLER_TERMINATION: "卖家终止售后",
+        BUYER_CONFIRM: "买家确认收货",
+        BUYER_CANCEL: "买家取消售后",
+        WAIT_REFUND: "等待平台退款",
+        COMPLETE: "完成售后",
+      },
+    };
+  },
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+.shop {
+  padding: 10px 0;
+  background: #fff;
+}
+.shop-item {
+  display: flex;
+
+  flex-wrap: wrap;
+}
+h3 {
+  margin: 20px 16px;
+  font-size: 18px;
+}
+.goods-price {
+  font-size: 18px;
+  color: red;
+}
+.goods-item {
+  display: flex;
+  width: 100%;
+  margin: 16px;
+}
+.count-price {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.flowPrice {
+  font-size: 24px;
+  color: red;
+}
+.goods-title {
+  margin: 0 16px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-weight: bold;
+}
+.img {
+  width: 100px;
+  height: 100px;
+  border-radius: 10px;
+}
+.label-item {
+  margin: 10px 0;
+  width: 20%;
+  padding: 8px;
+  align-items: center;
+  font-weight: bold;
+  display: flex;
+  > span {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue
new file mode 100644
index 00000000..7d39af66
--- /dev/null
+++ b/manager/src/views/statistics/traffic.vue
@@ -0,0 +1,248 @@
+<template>
+  <div class="wrapper">
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+        <affixTime @selected="clickBreadcrumb" />
+
+      </Card>
+    </Affix>
+    <Card class="card">
+      <div>
+        <h4>流量概况</h4>
+
+      </div>
+      <div class="box">
+        <div class="box-item">
+          <div>
+            访客数UV
+          </div>
+          <div>
+            {{uvs||0}}
+          </div>
+        </div>
+
+        <div class="box-item">
+          <div>
+            浏览量PV
+          </div>
+          <div>
+            {{pvs||0}}
+          </div>
+        </div>
+
+      </div>
+
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>流量趋势</h4>
+        <div id="orderChart"></div>
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>客户增长报表</h4>
+        <Table class="table" stripe :columns="columns" :data="data"></Table>
+
+      </div>
+    </Card>
+
+  </div>
+  </div>
+</template>
+<script>
+import affixTime from "@/views/lili-components/affix-time";
+import * as API_Member from "@/api/member";
+import { Chart } from "@antv/g2";
+
+export default {
+  components: { affixTime },
+
+  data() {
+    return {
+      // 时间
+
+      uvs: 0,
+      pvs: 0,
+
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          value: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          value: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          value: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          value: "LAST_THIRTY",
+        },
+      ],
+
+      orderChart: "",
+      params: {
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        // storeId: "",
+      },
+      columns: [
+        {
+          key: "date",
+          title: "日期",
+        },
+        {
+          key: "pvNum",
+          title: "浏览量",
+        },
+        {
+          key: "uvNum",
+          title: "访客数",
+        },
+      ],
+
+      data: [],
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        this.init();
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    // 订单图
+    initChart() {
+      // 默认已经加载 legend-filter 交互
+      /**
+       * 将数据分成三组来进行展示
+       */
+
+      let uv = [];
+      let pv = [];
+
+      this.data.forEach((item) => {
+        uv.push({
+          date: item.date,
+          uvNum: item.uvNum,
+          title: "访客数UV",
+          pv: item.uvNum,
+        });
+        pv.push({
+          date: item.date,
+          pvNum: item.pvNum,
+          pv: item.pvNum,
+          title: "浏览量PV",
+        });
+      });
+
+      let data = [...uv, ...pv];
+
+      this.orderChart.data(data);
+      this.orderChart.scale({
+        activeQuantity: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.orderChart
+        .line()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+
+      this.orderChart.render();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = JSON.parse(JSON.stringify(item));
+
+      this.params = callback;
+    },
+
+    init() {
+      API_Member.getStatisticsList(this.params).then((res) => {
+        if (res.result) {
+          this.data = res.result;
+          res.result.forEach((item) => {
+            this.uvs += item.uvNum;
+            this.pvs += item.pvNum;
+          });
+
+          if (!this.orderChart) {
+            this.orderChart = new Chart({
+              container: "orderChart",
+              autoFit: true,
+              height: 500,
+              padding: [70, 35, 70, 35],
+            });
+          }
+          this.initChart();
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style scoped lang="scss">
+.table {
+  margin-top: 10px;
+}
+.wrapper {
+  padding-bottom: 200px;
+}
+.box-item {
+  display: flex;
+
+  flex-direction: column;
+  width: 25%;
+  font-weight: bold;
+  // align-items: center;
+  justify-content: center;
+  > div {
+    margin: 4px;
+  }
+}
+.box {
+  background: rgb(250, 250, 250);
+  padding: 10px;
+  margin-top: 10px;
+  display: flex;
+}
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
new file mode 100644
index 00000000..d1502987
--- /dev/null
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -0,0 +1,465 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="系统类型" prop="orderSn">
+                <Select
+                  v-model="searchForm.type"
+                  placeholder="请选择系统类型"
+                  clearable
+                  style="width: 200px"
+                >
+                  <Option value="IOS">苹果</Option>
+                  <Option value="ANDROID">安卓</Option>
+                </Select>
+              </Form-item>
+              <Form-item style="margin-left:-35px;" class="br">
+                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+              </Form-item>
+            </Form>
+          </Row>
+          <Row class="operation" style="margin-top: 20px">
+            <Button @click="addAppVersion" type="primary">添加</Button>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="1000"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="版本名称" prop="versionName">
+          <Input v-model="form.versionName" maxlength="15" clearable style="width: 40%"/>
+        </FormItem>
+        <FormItem label="版本号" prop="version">
+          <Input v-model="form.version" maxlength="15" clearable style="width: 40%"/>
+        </FormItem>
+        <FormItem label="更新时间" prop="versionUpdateDate">
+          <DatePicker
+            v-model="form.versionUpdateDate"
+            type="datetime"
+            format="yyyy-MM-dd HH:mm:ss"
+            clearable
+            placeholder="请选择"
+            style="width: 200px"
+          ></DatePicker>
+        </FormItem>
+        <FormItem label="强制更新">
+          <RadioGroup v-model="form.forceUpdate">
+            <Radio label="1">强制更新</Radio>
+            <Radio label="0">非强制更新</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="类型">
+          <RadioGroup v-model="form.type">
+            <Radio label="IOS">苹果</Radio>
+            <Radio label="ANDROID">安卓</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="下载地址" prop="downloadUrl">
+          <Input v-model="form.downloadUrl" maxlength="100" clearable style="width: 40%"/>
+        </FormItem>
+        <FormItem class="form-item-view-el" label="更新内容" prop="content">
+          <editor v-model="form.content"></editor>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="saveAppVersion">保存</Button>
+      </div>
+    </Modal>
+    <div>
+      <!-- 查看版本信息 -->
+      <Modal
+        :title="queryModalTitle"
+        v-model="queryModalVisible"
+        :width="700"
+      >
+        <Form>
+          <div class="div-version">
+            <FormItem label="版本名称:">
+              {{form.versionName}}
+            </FormItem>
+          </div>
+          <div class="div-version">
+            <FormItem label="版本号:">
+              {{form.version}}
+            </FormItem>
+          </div>
+
+          <FormItem label="更新时间:">
+            <div>
+              {{versionUpdateDate}}
+            </div>
+          </FormItem>
+          <FormItem label="强制更新:">
+            <span v-if="form.forceUpdate == 1">强制更新</span>
+            <span v-else>非强制更新</span>
+          </FormItem>
+          <FormItem label="类型">
+            <span v-if="form.type == 'IOS'">IOS</span>
+            <span v-else>安卓</span>
+          </FormItem>
+          <FormItem label="下载地址:">
+            {{form.downloadUrl}}
+          </FormItem>
+          <FormItem label="更新内容:">
+            <div v-html="form.content">
+
+            </div>
+          </FormItem>
+        </Form>
+        <div slot="footer">
+          <Button type="text" @click="queryModalVisible = false">取消</Button>
+        </div>
+      </Modal>
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as API_Setting from "@/api/setting";
+  import editor from "@/views/my-components/lili/editor";
+
+
+  export default {
+    name: "orderList",
+    components: {
+      editor
+    },
+    data() {
+      return {
+        queryModalVisible: false,
+        queryModalTitle: "查看更新信息",
+        loading: true, // 表单加载状态
+        modalVisible: false, // 添加app版本模态框
+        modalTitle: "", // 添加app版本标题
+        modalType: 0,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          type: ""
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          versionName: "",
+          version: "",
+          forceUpdate: 1,
+          type: "IOS",
+          downloadUrl: "",
+          content: "",
+          versionUpdateDate: ""
+        },
+        versionUpdateDate: "",
+        // 表单验证规则
+        formValidate: {
+          version: [
+            {required: true, message: '版本号不能为空', trigger: 'blur'},
+          ],
+          versionName: [
+            {required: true, message: '版本名称不能为空', trigger: 'blur'},
+          ],
+          downloadUrl: [
+            {required: true, message: '下载地址不能为空', trigger: 'blur'},
+          ],
+          versionUpdateDate: [{required: true, message: "更新时间不能为空"}],
+
+        },
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "版本名称",
+            key: "versionName",
+            minWidth: 100,
+          },
+          {
+            title: "版本号",
+            key: "version",
+            minWidth: 120,
+          },
+          {
+            title: "强制更新",
+            key: "forceUpdate",
+            width: 100,
+            render: (h, params) => {
+
+              return h(
+                "div",
+                {
+                  props: {
+                    color: params.row.forceUpdate ? "primary" : "default",
+                  },
+                },
+                params.row.forceUpdate == 0 ? "非强制" : "强制"
+              );
+
+
+            }
+          },
+          {
+            title: "类型",
+            key: "type",
+            minWidth: 80,
+            render: (h, params) => {
+              if (params.row.type == "IOS") {
+                return h('div', [h('span', {}, '苹果'),]);
+              } else {
+                return h('div', [h('span', {}, '安卓'),]);
+              }
+            }
+          },
+
+          {
+            title: "更新时间",
+            key: "versionUpdateDate",
+            minWidth: 120,
+            sortable: true,
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 230,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+                h(
+                  "Button",
+
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                      ghost:true
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.editAppVersion(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.remove(params.row);
+                      },
+                    },
+                  },
+                  "删除"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getData();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getData();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getData();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getData();
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      getData() {
+        this.loading = true;
+        API_Setting.appVersionPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //添加app版本信息
+      addAppVersion() {
+        this.modalVisible = true;
+        this.modalTitle = "添加APP版本信息"
+        const versionUpdateDate = this.$options.filters.unixToDate(
+          new Date() / 1000
+        );
+        this.form = {
+          forceUpdate: 0,
+          type: "IOS",
+          versionUpdateDate: versionUpdateDate,
+          content: " "
+        }
+      },
+      //添加app版本信息
+      editAppVersion(v) {
+        this.modalVisible = true;
+        this.modalTitle = "修改APP版本信息"
+        this.modalType = 1
+        this.form = v
+      },
+      //保存app版本信息
+      saveAppVersion() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            const versionUpdateDate = this.$options.filters.unixToDate(
+              this.form.versionUpdateDate / 1000
+            );
+            this.form.versionUpdateDate = versionUpdateDate
+            this.form.updateTime = versionUpdateDate
+            if (this.modalType == 0) {
+              // 添加 避免编辑后传入id等数据 记得删除
+              delete this.form.id;
+              API_Setting.addVersion(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res && res.success) {
+                  this.$Message.success("添加成功");
+                  this.modalVisible = false
+                  this.getData();
+                }
+              });
+            } else {
+              API_Setting.editVersion(this.form, this.form.id).then((res) => {
+                this.submitLoading = false;
+                if (res && res.success) {
+                  this.$Message.success("修改成功");
+                  this.modalVisible = false
+                  this.getData();
+                }
+              });
+            }
+
+          }
+        })
+      },
+      remove(v) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          content: "您确认要删除么?",
+          loading: true,
+          onOk: () => {
+            // 删除
+            API_Setting.deleteVersion(v.id).then(res => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("删除成功");
+                this.getData();
+              }
+            });
+          }
+        });
+      },
+      detail(v) {
+        this.queryModalVisible = true
+        this.form = JSON.parse(JSON.stringify(v))
+        //时间格式化有问题，所以另外单独给时间赋值
+        this.versionUpdateDate = this.form.versionUpdateDate
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  .ivu-form-item {
+    margin-bottom: 14px;
+    vertical-align: top;
+    zoom: 1;
+  }
+.search-form{
+  width: 100%;
+}
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/sys/department-manage/departmentManage.vue b/manager/src/views/sys/department-manage/departmentManage.vue
new file mode 100644
index 00000000..f50f73fd
--- /dev/null
+++ b/manager/src/views/sys/department-manage/departmentManage.vue
@@ -0,0 +1,474 @@
+
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <i-switch v-model="strict" size="large" style="margin-right: 5px">
+          <span slot="open">级联</span>
+          <span slot="close">单选</span>
+        </i-switch>
+        <Button @click="addRoot">添加部门</Button>
+        <Button @click="add" type="primary">添加子部门</Button>
+        <Button @click="delAll">批量删除</Button>
+        <Button @click="getParentList">刷新</Button>
+      </Row>
+      <Row type="flex" justify="start">
+        <Col :md="8" :lg="8" :xl="6">
+          <Alert show-icon>
+            当前选择编辑：
+            <span class="select-title">{{ editTitle }}</span>
+            <a class="select-clear" v-if="form.id" @click="cancelEdit"
+              >取消选择</a
+            >
+          </Alert>
+          <!--  <Input
+            v-model="searchKey"
+            suffix="ios-search"
+            @on-change="search"
+            placeholder="输入部门名搜索"
+            clearable
+          /> -->
+          <div class="tree-bar" :style="{ maxHeight: maxHeight }">
+            <Tree
+              ref="tree"
+              :data="data"
+              :load-data="loadData"
+              show-checkbox
+              @on-check-change="changeSelect"
+              @on-select-change="selectTree"
+              :check-strictly="!strict"
+            ></Tree>
+            <Spin size="large" fix v-if="loading"></Spin>
+          </div>
+        </Col>
+        <Col :md="15" :lg="13" :xl="9" style="margin-left: 10px">
+          <Form
+            ref="form"
+            :model="form"
+            :label-width="100"
+            :rules="formValidate"
+          >
+            <FormItem label="上级部门" prop="parentTitle">
+              <div style="display: flex">
+                <Input
+                  v-model="form.parentTitle"
+                  readonly
+                  style="margin-right: 10px"
+                />
+                <Poptip
+                  transfer
+                  trigger="click"
+                  placement="right-start"
+                  title="选择上级部门"
+                  width="250"
+                >
+                  <Button icon="md-list">选择部门</Button>
+                  <div
+                    slot="content"
+                    style="position: relative; min-height: 5vh"
+                  >
+                    <Tree
+                      :data="dataEdit"
+                      :load-data="loadData"
+                      @on-select-change="selectTreeEdit"
+                    ></Tree>
+                    <Spin size="large" fix v-if="loadingEdit"></Spin>
+                  </div>
+                </Poptip>
+              </div>
+            </FormItem>
+            <FormItem label="部门名称" prop="title">
+              <Input v-model="form.title" />
+            </FormItem>
+            <FormItem label="选择角色">
+              <Select
+                :loading="userLoading"
+                not-found-text="暂无角色"
+                v-model="selectedRole"
+                multiple
+              >
+                <Option v-for="item in users" :value="item.id" :key="item.id">{{
+                  item.name
+                }}</Option>
+              </Select>
+            </FormItem>
+
+            <FormItem label="排序值" prop="sortOrder">
+              <Tooltip
+                trigger="hover"
+                placement="right"
+                content="值越小越靠前，支持小数"
+              >
+                <InputNumber
+                  :max="1000"
+                  :min="0"
+                  v-model="form.sortOrder"
+                ></InputNumber>
+              </Tooltip>
+            </FormItem>
+            <!--   <FormItem label="是否启用" prop="status">
+              <i-switch size="large" v-model="form.status" :true-value="0" :false-value="-1">
+                <span slot="open">启用</span>
+                <span slot="close">禁用</span>
+              </i-switch>
+            </FormItem> -->
+            <Form-item>
+              <Button
+                style="margin-right: 5px"
+                @click="submitEdit"
+                :loading="submitLoading"
+                type="primary"
+                >修改并保存</Button
+              >
+              <Button @click="handleReset">重置</Button>
+            </Form-item>
+          </Form>
+        </Col>
+      </Row>
+    </Card>
+
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="formAdd"
+        :model="formAdd"
+        :label-width="85"
+        :rules="formValidate"
+      >
+        <div v-if="showParent">
+          <FormItem label="上级部门：">{{ form.title }}</FormItem>
+        </div>
+        <FormItem label="部门名称" prop="title">
+          <Input v-model="formAdd.title" />
+        </FormItem>
+        <FormItem label="排序值" prop="sortOrder">
+          <Tooltip
+            trigger="hover"
+            placement="right"
+            content="值越小越靠前，支持小数"
+          >
+            <InputNumber
+              :max="1000"
+              :min="0"
+              v-model="formAdd.sortOrder"
+            ></InputNumber>
+          </Tooltip>
+        </FormItem>
+        <!--   <FormItem label="是否启用" prop="status">
+          <i-switch size="large" v-model="formAdd.status" :true-value="0" :false-value="-1">
+            <span slot="open">启用</span>
+            <span slot="close">禁用</span>
+          </i-switch>
+        </FormItem> -->
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="cancelAdd">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitAdd"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  initDepartment,
+  loadDepartment,
+  addDepartment,
+  editDepartment,
+  deleteDepartment,
+  searchDepartment,
+  getUserByDepartmentId,
+  getRoleList,
+  updateDepartmentRole,
+} from "@/api/index";
+export default {
+  name: "department-manage",
+  data() {
+    return {
+      loading: true,
+      maxHeight: "500px",
+      strict: true,
+      userLoading: false,
+      loadingEdit: true,
+      modalVisible: false,
+      selectList: [],
+      selectCount: 0,
+      showParent: false,
+      modalTitle: "",
+      editTitle: "",
+      selectedRole: [], //选择的角色
+      searchKey: "",
+      form: {
+        id: "",
+        title: "",
+        parentId: "",
+        parentTitle: "",
+        sortOrder: 0,
+        status: 0,
+      },
+
+      formAdd: {},
+      formValidate: {
+        title: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        sortOrder: [
+          {
+            required: true,
+            type: "number",
+            message: "排序值不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false,
+      data: [],
+      dataEdit: [],
+      users: [],
+    };
+  },
+  methods: {
+    init() {
+      this.getParentList();
+    },
+    getParentList() {
+      this.loading = true;
+      initDepartment().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result;
+        }
+      });
+    },
+
+    loadData(item, callback) {
+      loadDepartment(item.id).then((res) => {
+        if (res.success) {
+          /*  res.result.forEach(function(e) {
+            if (e.isParent) {
+              e.loading = false;
+              e.children = [];
+            }
+          }); */
+          callback(res.result);
+        }
+      });
+    },
+    search() {
+      if (this.searchKey) {
+        this.loading = true;
+        searchDepartment({ title: this.searchKey }).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+          }
+        });
+      } else {
+        this.getParentList();
+      }
+    },
+
+    // 点击树
+    selectTree(v) {
+      if (v.length > 0) {
+        // 转换null为""
+        for (let attr in v[0]) {
+          if (v[0][attr] == null) {
+            v[0][attr] = "";
+          }
+        }
+        let str = JSON.stringify(v[0]);
+        let data = JSON.parse(str);
+
+        this.editTitle = data.title;
+        // 加载部门用户数据
+        this.userLoading = true;
+
+        getUserByDepartmentId(data.id).then((res) => {
+          let way =[]
+          res.result && res.result.forEach((item) => {
+            way.push(item.roleId)
+          })
+           this.$set(this,'selectedRole',way)
+          console.warn( this.selectedRole);
+
+        });
+
+        getRoleList({
+          pageNumber: 1,
+          pageSize: 10000,
+        }).then((res) => {
+          this.userLoading = false;
+          console.log(res);
+          if (res.success) {
+            this.users = res.result.records;
+            // 回显
+            this.form = data;
+          }
+        });
+      } else {
+        this.cancelEdit();
+      }
+    },
+    cancelEdit() {
+      let data = this.$refs.tree.getSelectedNodes()[0];
+      if (data) {
+        data.selected = false;
+      }
+      this.$refs.form.resetFields();
+      delete this.form.id;
+      this.editTitle = "";
+    },
+    selectTreeEdit(v) {
+
+      if (v.length > 0) {
+        // 转换null为""
+        for (let attr in v[0]) {
+          if (v[0][attr] == null) {
+            v[0][attr] = "";
+          }
+        }
+        let str = JSON.stringify(v[0]);
+        let data = JSON.parse(str);
+        this.form.parentId = data.id;
+        this.form.parentTitle = data.title;
+      }
+    },
+    cancelAdd() {
+      this.modalVisible = false;
+    },
+    handleReset() {
+      this.$refs.form.resetFields();
+      this.form.status = 0;
+    },
+    submitEdit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (!this.form.id) {
+            this.$Message.warning("请先点击选择要修改的部门");
+            return;
+          }
+
+          console.log(this.selectedRole);
+          let roleWay = [];
+          this.selectedRole.forEach((item) => {
+            let role = {
+              departmentId: this.form.id,
+              roleId: item,
+            };
+            roleWay.push(role);
+          });
+
+          Promise.all([
+            editDepartment(this.form.id, this.form),
+            updateDepartmentRole(
+                this.form.id,
+           roleWay
+
+            ),
+          ]).then((res) => {
+            this.submitLoading = false;
+            if (res[0].success) {
+              this.$Message.success("编辑成功");
+              this.init();
+              this.modalVisible = false;
+            }
+
+            console.log(res[1]);
+          });
+
+
+        }
+      });
+    },
+    submitAdd() {
+      this.$refs.formAdd.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          addDepartment(this.formAdd).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("添加成功");
+              this.init();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    add() {
+      if (this.form.id == "" || this.form.id == null) {
+        this.$Message.warning("请先点击选择一个部门");
+        return;
+      }
+      this.modalTitle = "添加子部门";
+      this.showParent = true;
+
+      this.formAdd = {
+        parentId: this.form.id,
+        sortOrder: 0,
+        status: 0,
+      };
+      this.modalVisible = true;
+    },
+    addRoot() {
+      this.modalTitle = "添加一级部门";
+      this.showParent = false;
+      this.formAdd = {
+        parentId: 0,
+        sortOrder: 0,
+        status: 0,
+      };
+      this.modalVisible = true;
+    },
+    changeSelect(v) {
+      console.log(v);
+      this.selectCount = v.length;
+      this.selectList = v;
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未勾选要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content:
+          "您确认要删除所选的 " + this.selectCount + " 条数据及其下级所有数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          deleteDepartment(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.selectList = [];
+              this.selectCount = 0;
+              this.cancelEdit();
+              this.init();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    // 计算高度
+    let height = document.documentElement.clientHeight;
+    this.maxHeight = Number(height - 287) + "px";
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/tree-common.scss";
+
+</style>
diff --git a/manager/src/views/sys/instant-delivery/instantDelivery.vue b/manager/src/views/sys/instant-delivery/instantDelivery.vue
new file mode 100644
index 00000000..2b16c7b5
--- /dev/null
+++ b/manager/src/views/sys/instant-delivery/instantDelivery.vue
@@ -0,0 +1,231 @@
+<template>
+  <Card class="card">
+    <div v-for="(item,index) in instantDelivery" :key="index">
+      <div class="cardBox">
+        <div class="methodItem">
+
+          <span v-if="item.image = ''">暂无封面</span>
+          <img v-else :src=item.images height="172" width="440"/>
+          <h4>{{item.deliveryName}}</h4></div>
+        <div class="bar">
+          <div v-if="item.deliveryOpen==1" class="status" style="color: rgb(53, 189, 129);">已启用</div>
+          <div v-else class="status" style="color: rgb(53, 189, 129);">
+            <a class="links" style="color: rgb(53, 189, 129);" @click="openDelivery(item)">启用</a>&nbsp;<span
+            style="color: red;">(未启用)</span>
+          </div>
+          <div class="div-edit">
+            <Upload
+              multiple
+              :action=action
+              :show-upload-list="false"
+              :format="['jpg', 'jpeg', 'png', 'gif']"
+              :on-success="uploadSuccess"
+            >
+              <a class="links" @click="deliveryBean = item.deliveryBean">更换封面</a>
+            </Upload>
+
+          </div>
+          <div>
+            <a class="links" @click="edit">编辑</a>
+          </div>
+        </div>
+      </div>
+      <Modal
+        :title="modalTitle"
+        v-model="modalVisible"
+        :width="500"
+      >
+        <Form ref="form" :model="form" :label-width="90">
+          <Form-item :label="config.name" v-for="(config,q) in item.configItems" :key="config">
+            <div>
+              <Input
+                type="text"
+                v-model="config.value"
+                clearable
+                placeholder="请输入您的请求参数，均不能为空"
+                style="width: 300px"
+                v-if="config.type == 'text'"
+              />
+            </div>
+          </Form-item>
+        </Form>
+        <div slot="footer">
+          <Button type="text" @click="modalVisible = false">取消</Button>
+          <Button type="primary" :loading="submitLoading" @click="saveDeliverySubmit(item)">保存</Button>
+        </div>
+      </Modal>
+    </div>
+
+
+  </Card>
+
+</template>
+
+<script>
+  import * as API_Setting from "@/api/setting";
+  import editor from "@/views/my-components/lili/editor";
+  import {commonUrl} from '@/libs/axios'
+
+
+  export default {
+    name: "instantDelivery",
+    components: {
+      editor
+    },
+    data() {
+      return {
+        deliveryBean: "",
+        action: commonUrl + '/common/upload/file',
+        loading: true, // 表单加载状态
+        modalVisible: false, // 修改同城配送模态框
+        modalTitle: "", // 修改同城配送标题
+        instantDelivery: [{
+          configItems: []
+        }
+
+        ], //同城配送数据
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        selectDate: null,
+        form: {},
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+      };
+    },
+    methods: {
+      init() {
+        this.getData();
+      },
+      //修改同城配送方案
+      edit() {
+        this.modalVisible = true
+        this.modalTitle = "编辑同城配送"
+      },
+      saveDeliverySubmit(item) {
+        const headers = {
+          "Content-Type": "application/json;charset=utf-8"
+        }
+        this.loading = true
+        API_Setting.editInstantDelivery(item.deliveryBean, item.configItems, headers).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.instantDelivery = (res.result.records);
+            this.modalVisible = false
+            this.$Message.success("保存成功");
+            this.getData()
+          }
+        });
+      },
+      //开启某个同城配送
+      openDelivery(item) {
+        this.$Modal.confirm({
+          title: "确定开启？",
+          content: "确认开启当前同城配送方案",
+          onOk: () => {
+            API_Setting.openInstantDelivery(item.deliveryBean).then((res) => {
+              if (res.success) {
+                this.$Message.success("开启成功");
+                this.getData();
+              }
+            });
+          },
+        });
+      },
+      //封面上传成功方法
+      uploadSuccess(res) {
+        const params = {
+          images: res.result
+        }
+        this.loading = true
+        API_Setting.editInstantDeliveryImage(this.deliveryBean, params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$Message.success("更换成功");
+            this.getData()
+          }
+        });
+      },
+      getData() {
+        this.loading = true;
+        API_Setting.getInstantDelivery(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.instantDelivery = res.result.records;
+
+
+          }
+        });
+        this.loading = false;
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  .cardBox {
+    display: inline-block;
+    border-radius: 2px;
+    line-height: 1.5;
+    margin-right: 20px;
+    width: 300px;
+    border: 1px solid #eee;
+    padding: 10px;
+  }
+
+  .methodItem {
+    width: 100%;
+    border: 1px solid #f5f5f5;
+    text-align: center;
+    padding: 20px 0;
+  }
+
+  methodItem img {
+    width: 220px;
+    height: 86px;
+  }
+
+  methodItem h4 {
+    font-size: 14px;
+    color: #333;
+    margin-top: 5px;
+  }
+
+  .methodItem img {
+    width: 220px;
+    height: 86px;
+  }
+
+  .div-edit {
+    margin-left: 50px
+  }
+
+  .bar {
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-align-items: center;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    padding: 10px 8px 0;
+  }
+
+  .ivu-upload {
+    height: 21px;
+    margin-left: 15px;
+  }
+</style>
diff --git a/manager/src/views/sys/log-manage/logManage.vue b/manager/src/views/sys/log-manage/logManage.vue
new file mode 100644
index 00000000..9c2a4106
--- /dev/null
+++ b/manager/src/views/sys/log-manage/logManage.vue
@@ -0,0 +1,330 @@
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70"   class="search-form">
+          <Form-item label="搜索日志" prop="searchKey">
+            <Input
+              type="text"
+              v-model="searchForm.searchKey"
+              placeholder="请输入搜索日志内容"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="操作人" prop="operatorName">
+            <Input
+              type="text"
+              v-model="searchForm.operatorName"
+              placeholder="请输入操作人"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="创建时间">
+            <DatePicker
+              type="daterange"
+              v-model="selectDate"
+              format="yyyy-MM-dd"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="getLogList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="openTip=!openTip">{{openTip ? "关闭提示" : "开启提示"}}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          <span>展示详细内容</span>
+          <Icon type="ios-bulb-outline" slot="icon"></Icon>
+          <i-switch
+            size="large"
+            v-model="showDev"
+          >
+            <span slot="open">开发</span>
+            <span slot="close">普通</span>
+          </i-switch>
+        </Alert>
+      </Row>
+      <Row>
+
+        <Table
+          v-if="showDev"
+          :loading="loading"
+          border
+          :columns="columns_dev"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+        </Table>
+        <Table
+          v-else
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+        </Table>
+
+
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-totalzx
+
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+  import {getLogListData} from "@/api/index";
+
+  export default {
+    name: "log-manage",
+    data() {
+      return {
+        openSearch: true,
+        openTip: false,
+        loading: true,
+        selectList: [],
+        selectCount: 0,
+        selectDate: null,
+        searchKey: "",
+        operatorName: "",
+        showDev: false,//展示进阶日志
+        searchForm: {
+          type: 1,
+          pageNumber: 1,
+          pageSize: 10,
+          startDate: "",
+          endDate: "",
+          sort: "createTime",
+          order: "desc"
+        },
+        columns: [
+          {
+            title: "操作名称",
+            key: "name",
+            width: 150,
+            fixed: "left",
+            ellipsis: false,
+            tooltip: true
+          },
+          {
+            title: "日志内容",
+            key: "customerLog",
+            minWidth: 200,
+            fixed: "left",
+            ellipsis: false,
+            tooltip: true
+          },
+          {
+            title: "操作用户",
+            minWidth: 115,
+            key: "username",
+            width: 120,
+            tooltip: true
+          },
+          {
+            title: "操作时间",
+            key: "createTime",
+            align: "center",
+            width: 170
+          }
+        ],
+        columns_dev: [
+          {
+            title: "操作名称",
+            key: "name",
+            minWidth: 100,
+            fixed: "left",
+            ellipsis: false,
+            tooltip: true
+          },
+          {
+            title: "日志内容",
+            key: "customerLog",
+            minWidth: 120,
+            fixed: "left",
+            ellipsis: false,
+            tooltip: true,
+          },
+          {
+            title: "操作用户",
+            key: "username",
+            width: 115,
+          },
+          {
+            title: "IP",
+            key: "ip",
+            width: 150
+          },
+          {
+            title: "IP信息",
+            key: "ipInfo",
+            width: 150,
+            ellipsis: false,
+            tooltip: true,
+          },
+          {
+            title: "请求路径",
+            width: 150,
+            ellipsis: false,
+            tooltip: true,
+            key: "requestUrl"
+          },
+          {
+            title: "请求类型",
+            key: "requestType",
+            width: 130,
+            align: "center",
+            filters: [
+              {
+                label: "GET",
+                value: "GET"
+              },
+              {
+                label: "POST",
+                value: "POST"
+              },
+              {
+                label: "PUT",
+                value: "PUT"
+              },
+              {
+                label: "DELETE",
+                value: "DELETE"
+              }
+            ],
+            filterMultiple: false,
+            filterMethod(value, row) {
+              if (value == "GET") {
+                return row.requestType == "GET";
+              } else if (value == "POST") {
+                return row.requestType == "POST";
+              } else if (value == "PUT") {
+                return row.requestType == "PUT";
+              } else if (value == "DELETE") {
+                return row.requestType == "DELETE";
+              }
+            }
+          },
+          {
+            title: "请求参数",
+            minWidth: 100,
+            key: "requestParam",
+            ellipsis: false,
+            tooltip: true
+          },
+          {
+            title: "耗时-毫秒",
+            key: "costTime",
+            width: 140,
+            align: "center",
+            filters: [
+              {
+                label: "≤300毫秒",
+                value: 0
+              },
+              {
+                label: "300毫秒<x<1000毫秒",
+                value: 0.3
+              },
+              {
+                label: ">1000毫秒",
+                value: 1
+              }
+            ],
+            filterMultiple: false,
+            filterMethod(value, row) {
+              if (value == 0) {
+                return row.costTime <= 300;
+              } else if (value == 0.3) {
+                return row.costTime > 300 && row.costTime < 1000;
+              } else {
+                return row.costTime > 1000;
+              }
+            }
+          },
+          {
+            title: "操作时间",
+            key: "createTime",
+            align: "center",
+            width: 170,
+            sortType: "desc"
+          }
+        ],
+        data: [],
+        total: 0
+      };
+    },
+    methods: {
+      init() {
+        this.getLogList();
+      },
+      changeTab(v) {
+        this.searchForm.type = v;
+        this.getLogList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getLogList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getLogList();
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getLogList();
+      },
+      getLogList() {
+        this.loading = true;
+        this.searchForm.key = this.searchKey;
+        this.searchForm.operatorName = this.operatorName;
+
+        getLogListData(this.searchForm).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      }
+    },
+    mounted() {
+      this.init();
+    }
+  };
+</script>
diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue
new file mode 100644
index 00000000..edbb2a76
--- /dev/null
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@@ -0,0 +1,681 @@
+<style lang="scss" scoped>
+@import "@/styles/tree-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+
+        <i-switch v-model="strict" class="selectModel" size="large" style="margin-right: 5px">
+          <span slot="open">级联</span>
+          <span slot="close">单选</span>
+        </i-switch>
+        <Button @click="addRootMenu" >添加顶级菜单</Button>
+        <Button @click="addMenu" type="primary" >添加子菜单</Button>
+        <Button @click="delAll">批量删除</Button>
+        <Dropdown @on-click="handleDropdown">
+          <Button>
+            更多操作
+            <Icon type="md-arrow-dropdown"></Icon>
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem name="refresh">刷新</DropdownItem>
+            <DropdownItem name="expandOne">收合所有</DropdownItem>
+            <DropdownItem name="expandTwo">展开一级</DropdownItem>
+            <DropdownItem name="expandThree">展开两级</DropdownItem>
+            <DropdownItem name="expandAll">展开所有</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </Row>
+      <Row type="flex" justify="start">
+        <Col :md="8" :lg="8" :xl="6">
+          <Alert show-icon>
+            当前选择编辑：
+            <span class="select-title">{{ editTitle }}</span>
+            <a class="select-clear" v-if="form.id" @click="cancelEdit"
+            >取消选择</a
+            >
+          </Alert>
+          <Input
+            v-model="searchKey"
+            suffix="ios-search"
+            @on-change="search"
+            placeholder="输入菜单名搜索"
+            clearable
+          />
+          <div class="tree-bar" :style="{ maxHeight: maxHeight }">
+            <Tree
+              ref="tree"
+              :data="data"
+              show-checkbox
+              :render="renderContent"
+              @on-select-change="selectTree"
+              @on-check-change="changeSelect"
+              :check-strictly="!strict"
+            ></Tree>
+            <Spin size="large" fix v-if="loading"></Spin>
+          </div>
+        </Col>
+        <Col :md="15" :lg="13" :xl="9" style="margin-left: 10px">
+          <Form
+            ref="form"
+            :model="form"
+            :label-width="110"
+            :rules="formValidate"
+          >
+            <FormItem label="类型" prop="type">
+              <div v-show="form.level == 0">
+                <Icon
+                  type="ios-navigate-outline"
+                  size="16"
+                  style="margin-right: 5px"
+                ></Icon>
+                <span>顶部菜单</span>
+              </div>
+              <div v-show="form.level == 1 || form.level == 2">
+                <Icon
+                  type="ios-list-box-outline"
+                  size="16"
+                  style="margin-right: 5px"
+                ></Icon>
+                <span>页面菜单</span>
+              </div>
+            </FormItem>
+            <FormItem
+              label="名称"
+              prop="title"
+            >
+              <Input v-model="form.title"/>
+            </FormItem>
+
+            <FormItem label="路径" prop="path" v-if="form.level != 0">
+              <Input v-model="form.path"/>
+            </FormItem>
+            <FormItem
+              label="英文名"
+              prop="name"
+              v-if="form.level == 0"
+              class="block-tool"
+            >
+              <Tooltip placement="right" content="需唯一">
+                <Input v-model="form.name"/>
+              </Tooltip>
+            </FormItem>
+            <FormItem
+              label="路由英文名"
+              prop="name"
+              v-if="form.level != 0"
+              class="block-tool"
+            >
+              <Tooltip placement="right" content="需唯一" transfer>
+                <Input v-model="form.name"/>
+              </Tooltip>
+            </FormItem>
+            <FormItem
+              label="图标"
+              prop="icon"
+            >
+              <icon-choose v-model="form.icon"></icon-choose>
+            </FormItem>
+            <FormItem label="前端组件" prop="frontRoute" v-if="form.level != 0">
+              <Input v-model="form.frontRoute"/>
+            </FormItem>
+
+            <FormItem
+              label="第三方链接"
+              v-if="form.level == 2"
+              class="block-tool"
+            >
+              <Tooltip
+                placement="right"
+                content="前端组件需为 sys/monitor/monitor 时生效"
+                max-width="300"
+                transfer
+              >
+                <Input
+                  v-model="form.url"
+                  placeholder="http://"
+                  @on-change="changeEditUrl"
+                />
+              </Tooltip>
+            </FormItem>
+            <FormItem label="排序值" prop="sortOrder">
+              <Tooltip
+                trigger="hover"
+                placement="right"
+                content="值越小越靠前，支持小数"
+              >
+                <InputNumber
+                  :max="1000"
+                  :min="0"
+                  v-model="form.sortOrder"
+                ></InputNumber>
+              </Tooltip>
+            </FormItem>
+            <Form-item>
+              <Button
+                style="margin-right: 5px"
+                @click="submitEdit"
+                :loading="submitLoading"
+                type="primary"
+                icon="ios-create-outline"
+              >保存
+              </Button
+              >
+              <Button @click="handleReset">重置</Button>
+            </Form-item>
+          </Form>
+        </Col>
+      </Row>
+    </Card>
+
+    <Modal
+      draggable
+      :title="modalTitle"
+      v-model="menuModalVisible"
+      :mask-closable="false"
+      :width="500"
+      :styles="{ top: '30px' }"
+    >
+      <Form
+        ref="formAdd"
+        :model="formAdd"
+        :label-width="100"
+        :rules="formValidate"
+      >
+        <div v-if="showParent">
+          <FormItem label="上级节点：">{{ parentTitle }}</FormItem>
+        </div>
+        <FormItem label="类型" prop="type">
+          <div v-show="formAdd.level == 0">
+            <Icon
+              type="ios-navigate-outline"
+              size="16"
+              style="margin-right: 5px"
+            ></Icon>
+            <span>顶部菜单</span>
+          </div>
+          <div v-show="formAdd.level != 0">
+            <Icon
+              type="ios-list-box-outline"
+              size="16"
+              style="margin-right: 5px"
+            ></Icon>
+            <span>页面菜单</span>
+          </div>
+
+        </FormItem>
+        <FormItem
+          label="名称"
+          prop="title"
+        >
+          <Input v-model="formAdd.title"/>
+        </FormItem>
+
+        <FormItem label="路径" prop="path" v-if="formAdd.level != 0">
+          <Input v-model="formAdd.path"/>
+        </FormItem>
+        <FormItem
+          label="英文名"
+          prop="name"
+          v-if="formAdd.level == 0"
+          class="block-tool"
+        >
+          <Tooltip placement="right" content="需唯一">
+            <Input v-model="formAdd.name"/>
+          </Tooltip>
+        </FormItem>
+        <FormItem
+          label="路由英文名"
+          prop="name"
+          v-if="formAdd.level != 0"
+          class="block-tool"
+        >
+          <Tooltip placement="right" content="需唯一">
+            <Input v-model="formAdd.name"/>
+          </Tooltip>
+        </FormItem>
+        <FormItem
+          label="图标"
+          prop="icon"
+        >
+          <icon-choose v-model="formAdd.icon"></icon-choose>
+        </FormItem>
+        <FormItem label="前端组件" prop="frontRoute" v-if="formAdd.level != 0">
+          <Input v-model="formAdd.frontRoute"/>
+        </FormItem>
+        <FormItem
+          label="第三方链接"
+          prop="url"
+          v-if="formAdd.level == 2"
+          class="block-tool"
+        >
+          <Tooltip
+            placement="right"
+            content="前端组件需为 sys/monitor/monitor 时生效"
+            max-width="300"
+            transfer
+          >
+            <Input
+              v-model="formAdd.url"
+              placeholder="http://"
+              @on-change="changeAddUrl"
+            />
+          </Tooltip>
+        </FormItem>
+        <FormItem label="排序值" prop="sortOrder">
+          <Tooltip
+            trigger="hover"
+            placement="right"
+            content="值越小越靠前，支持小数"
+          >
+            <InputNumber
+              :max="1000"
+              :min="0"
+              v-model="formAdd.sortOrder"
+            ></InputNumber>
+          </Tooltip>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="menuModalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitAdd"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getAllPermissionList,
+  addPermission,
+  editPermission,
+  deletePermission,
+  searchPermission,
+} from "@/api/index";
+import IconChoose from "@/views/my-components/lili/icon-choose";
+import util from "@/libs/util.js";
+
+export default {
+  name: "menu-manage",
+  components: {
+    IconChoose,
+  },
+  data() {
+    return {
+      loading: true,
+      strict: true,
+      maxHeight: "500px",
+      expandLevel: 1,
+      menuModalVisible: false,
+      iconModalVisible: false,
+      selectList: [],
+      selectCount: 0,
+      showParent: false,
+      searchKey: "",
+      parentTitle: "",
+      editTitle: "",
+      modalTitle: "",
+      form: {
+        id: "",
+        title: "",
+        name: "",
+        icon: "",
+        path: "",
+        frontRoute: "",
+        parentId: "",
+        buttonType: "",
+        sortOrder: 0,
+        level: 0,
+        url: "",
+        showAlways: true,
+      },
+      formAdd: {
+        buttonType: "",
+      },
+      formValidate: {
+        title: [{required: true, message: "名称不能为空", trigger: "blur"}],
+        name: [
+          {required: true, message: "路由英文名不能为空", trigger: "blur"},
+        ],
+        icon: [{required: true, message: "图标不能为空", trigger: "click"}],
+        path: [{required: true, message: "路径不能为空", trigger: "blur"}],
+        frontRoute: [
+          {required: true, message: "前端组件不能为空", trigger: "blur"},
+        ],
+        sortOrder: [
+          {
+            required: true,
+            type: "number",
+            message: "排序值不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false,
+      data: [],
+    };
+  },
+  methods: {
+    init() {
+      this.getAllList();
+    },
+
+    renderContent(h, {root, node, data}) {
+      let icon = "";
+      if (data.level == 0) {
+        icon = "ios-navigate";
+      } else if (data.level == 1) {
+        icon = "md-list-box";
+      } else if (data.level == 2) {
+        icon = "md-list";
+      }
+      return h("span", [
+        h("span", [
+          h("Icon", {
+            props: {
+              type: icon,
+              size: "16",
+            },
+            style: {
+              "margin-right": "8px",
+              "margin-bottom": "3px",
+            },
+          }),
+          h("span", data.title),
+        ]),
+      ]);
+    },
+    handleDropdown(name) {
+      console.log(name)
+      if (name == "expandOne") {
+        this.expandLevel = 1;
+        this.getAllList();
+      } else if (name == "expandTwo") {
+        this.expandLevel = 2;
+        this.getAllList();
+      } else if (name == "expandThree") {
+        this.expandLevel = 3;
+        this.getAllList();
+      }
+      if (name == "expandAll") {
+        this.expandLevel = 4;
+        this.getAllList();
+      } else if (name == "refresh") {
+        this.getAllList();
+      }
+    },
+    getAllList() {
+      this.loading = true;
+      getAllPermissionList().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          // 仅展开指定级数 默认后台已展开所有
+          let expandLevel = this.expandLevel;
+          res.result.forEach(function (e) {
+            if (expandLevel == 1) {
+              if (e.level == 0) {
+                e.expand = false;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 2) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 3) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = true;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 4) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = true;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = true;
+                      }
+                    });
+                  }
+                });
+              }
+            }
+          });
+          this.data = res.result;
+        }
+      });
+    },
+    search() {
+      if (this.searchKey) {
+        this.loading = true;
+        searchPermission({title: this.searchKey}).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+          }
+        });
+      } else {
+        this.getAllList();
+      }
+    },
+    selectTree(v) {
+      if (v.length > 0) {
+        // 转换null为""
+
+        let str = JSON.stringify(v);
+        let menu = JSON.parse(str);
+        this.form = menu[0];
+        this.editTitle = menu[0].title;
+      } else {
+        this.cancelEdit();
+      }
+    },
+    cancelEdit() {
+      let data = this.$refs.tree.getSelectedNodes()[0];
+      if (data) {
+        data.selected = false;
+      }
+      this.$refs.form.resetFields();
+      this.form.id = "";
+      this.editTitle = "";
+    },
+    handleReset() {
+      this.$refs.form.resetFields();
+      this.form.icon = "";
+      this.form.frontRoute = "";
+    },
+    submitEdit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (!this.form.id) {
+            this.$Message.warning("请先点击选择要修改的菜单节点");
+            return;
+          }
+          this.submitLoading = true;
+          if (this.form.sortOrder == null) {
+            this.form.sortOrder = "";
+          }
+          if (this.form.buttonType == null) {
+            this.form.buttonType = "";
+          }
+
+          delete this.form.updateTime;
+          editPermission(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("编辑成功");
+              // 标记重新获取菜单数据
+              this.$store.commit("setAdded", false);
+              util.initRouter(this);
+              this.init();
+              this.menuModalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    submitAdd() {
+      this.$refs.formAdd.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+
+          addPermission(this.formAdd).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("添加成功");
+              // 标记重新获取菜单数据
+              this.$store.commit("setAdded", false);
+              util.initRouter(this);
+              this.init();
+              this.menuModalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    changeEditUrl(e) {
+      let v = e.target.value;
+      if (v.indexOf("http") > -1) {
+        this.form.frontRoute = "sys/monitor/monitor";
+      }
+    },
+    changeAddUrl(e) {
+      let v = e.target.value;
+      if (v.indexOf("http") > -1) {
+        this.formAdd.frontRoute = "sys/monitor/monitor";
+      }
+    },
+    addMenu() {
+      if (!this.form.id) {
+        this.$Message.warning("请先点击选择一个菜单权限节点");
+        return;
+      }
+      this.parentTitle = this.form.title;
+      this.modalTitle = "添加子节点(可拖动)";
+      this.showParent = true;
+      if (this.form.level == 2) {
+        this.$Modal.warning({
+          title: "抱歉，不能添加啦",
+          content: "仅支持2级菜单目录",
+        });
+        return;
+      }
+      let frontRoute = "";
+      this.formAdd = {
+        icon: "",
+        parentId: this.form.id,
+        level: Number(this.form.level) + 1,
+        sortOrder: 0,
+        buttonType: "",
+        status: 0,
+        showAlways: true,
+      };
+      if (this.form.level == 0) {
+        this.formAdd.path = "/";
+        this.formAdd.frontRoute = "Main";
+      }
+      this.menuModalVisible = true;
+    },
+    addRootMenu() {
+      this.modalTitle = "添加顶部菜单(可拖动)";
+      this.showParent = false;
+      this.formAdd = {
+        level: 0,
+        sortOrder: 0,
+        status: 0,
+      };
+      this.menuModalVisible = true;
+    },
+    changeSelect(v) {
+      this.selectCount = v.length;
+      this.selectList = v;
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未勾选要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          deletePermission(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              // 标记重新获取菜单数据
+              this.$store.commit("setAdded", false);
+              util.initRouter(this);
+              this.selectList = [];
+              this.selectCount = 0;
+              this.cancelEdit();
+              this.init();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    // 计算高度
+    let height = document.documentElement.clientHeight;
+    this.maxHeight = Number(height - 287) + "px";
+    this.init();
+  },
+};
+</script>
diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue
new file mode 100644
index 00000000..9090c3d1
--- /dev/null
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -0,0 +1,792 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Tabs value="MESSAGE" @on-click="paneChange">
+
+            <TabPane label="站内信列表" name="MESSAGE">
+              <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+                <Form ref="searchForm" :model="searchMessageForm" inline :label-width="70" class="search-form">
+                  <Form-item label="消息标题" prop="title">
+                    <Input
+                      type="text"
+                      v-model="searchMessageForm.title"
+                      placeholder="请输入消息标题"
+                      clearable
+                      style="width: 200px"
+                    />
+                  </Form-item>
+
+                  <Form-item label="消息内容" prop="content">
+                    <Input
+                      type="text"
+                      v-model="searchMessageForm.content"
+                      placeholder="请输入消息内容"
+                      clearable
+                      style="width: 200px"
+                    />
+                  </Form-item>
+
+                  <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+                </Form>
+              </Row>
+              <Row class="operation" style="margin-top: 20px">
+                <Button @click="sendMessage" type="primary">发送消息</Button>
+              </Row>
+              <Row>
+                <Table
+                  :loading="loading"
+                  border
+                  :columns="messageColumns"
+                  :data="messageData"
+                  ref="table"
+                  sortable="custom"
+                  @on-sort-change="messageChangeSort"
+                  @on-selection-change="messageChangeSelect"
+                ></Table>
+              </Row>
+              <Row type="flex" justify="end" class="page">
+                <Page
+                  :current="searchMessageForm.pageNumber"
+                  :total="messageDataTotal"
+                  :page-size="searchMessageForm.pageSize"
+                  @on-change="messageChangePage"
+                  @on-page-size-change="messageChangePageSize"
+                  :page-size-opts="[10, 20, 50]"
+                  size="small"
+                  show-total
+                  show-elevator
+                  show-sizer
+                ></Page>
+              </Row>
+            </TabPane>
+
+            <TabPane label="通知类站内信" name="SETTING">
+              <Row>
+                <Table
+                  :loading="loading"
+                  border
+                  :columns="noticeColumns"
+                  :data="noticeData"
+                  ref="table"
+                  sortable="custom"
+                  @on-sort-change="changeSort"
+                  @on-selection-change="changeSelect"
+                ></Table>
+              </Row>
+              <Row type="flex" justify="end" class="page">
+                <Page
+                  :current="searchForm.pageNumber"
+                  :total="noticeDataTotal"
+                  :page-size="searchForm.pageSize"
+                  @on-change="changePage"
+                  @on-page-size-change="changePageSize"
+                  :page-size-opts="[10, 20, 50]"
+                  size="small"
+                  show-total
+                  show-elevator
+                  show-sizer
+                ></Page>
+              </Row>
+            </TabPane>
+          </Tabs>
+
+        </Card>
+      </Col>
+    </Row>
+    <!-- 站内信模板编辑 -->
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="800"
+    >
+      <div class="message-title">
+        <p>1、左侧#{xxx}为消息变量</p>
+        <p>2、如果要发送的消息包含消息变量则将消息变量复制到消息内容中即可，注意格式</p>
+        <p>3、例：比如消息变量为#{订单号}，发送的内容为：订单号为xxx的订单已经发货注意查收，完整的消息内容应该为订单号为#{订单号}的订单已经发货注意查收</p>
+      </div>
+      <div class="send-setting">
+        <div class="left-show">
+            <div v-for="(item, index) in form.variables" >
+              #{<span>{{item}}</span>}
+            </div>
+        </div>
+        <div class="send-form">
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+
+            <FormItem label="通知节点" prop="noticeNode">
+              <Input v-model="form.noticeNode" clearable type="text" style="width: 90%" maxlength="20"  disabled />
+            </FormItem>
+            <FormItem label="消息标题" prop="noticeTitle">
+              <Input v-model="form.noticeTitle" clearable type="text" style="width: 90%" maxlength="20"/>
+            </FormItem>
+            <FormItem label="消息内容" prop="noticeContent">
+              <Input v-model="form.noticeContent" clearable type="textarea" style="width: 90%" maxlength="50" :autosize="{maxRows:4,minRows: 4}" show-word-limit />
+            </FormItem>
+          </Form>
+        </div>
+
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit">保存</Button>
+      </div>
+    </Modal>
+
+    <!-- 站内信发送 -->
+    <Modal
+      :title="messageModalTitle"
+      v-model="messageModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="messageSendForm" :model="messageSendForm" :label-width="100" :rules="messageFormValidate">
+        <FormItem label="消息标题" prop="title">
+          <Input v-model="messageSendForm.title" maxlength="15" clearable style="width: 90%"/>
+        </FormItem>
+        <FormItem label="消息内容" prop="content">
+          <Input
+            v-model="messageSendForm.content"
+            :rows="4"
+            type="textarea"
+            style="max-height:60vh;overflow:auto;width: 90%"
+          />
+        </FormItem>
+        <FormItem label="发送范围">
+          <RadioGroup v-model="messageSendForm.messageRange" @on-change="selectShop">
+            <Radio label="ALL">全站</Radio>
+            <Radio label="APPOINT">指定商家</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="指定商家" v-if="shopShow">
+          <Select v-model="messageSendForm.userIds" filterable multiple style="width: 90%;"
+                  label-in-value @on-change="getName">
+            <Option v-for="item in shopList" :value="item.id" :key="item.id" :lable="item.storeName">{{ item.storeName
+              }}
+            </Option>
+          </Select>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="messageModalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="sendMessageSubmit"
+        >发送
+        </Button
+        >
+      </div>
+    </Modal>
+
+    <!-- 站内信发送 -->
+    <Modal
+      :title="modalTitle"
+      v-model="messageDetailModalVisible"
+      :mask-closable="false"
+      :width="700"
+    >
+      <Form ref="messageSendForm" :model="messageSendForm" :label-width="100" :rules="messageFormValidate">
+        <FormItem label="消息标题" prop="title">
+          <Input v-model="messageSendForm.title" maxlength="15" clearable style="width: 50%" disabled/>
+        </FormItem>
+        <FormItem label="消息内容" prop="content">
+          <Input
+            disabled
+            v-model="messageSendForm.content"
+            :rows="4"
+            type="textarea"
+            style="max-height:60vh;overflow:auto;width: 50%"
+          />
+        </FormItem>
+        <FormItem label="发送范围">
+          <RadioGroup v-model="messageSendForm.messageRange">
+            <Radio disabled label="ALL">全站</Radio>
+            <Radio  disabled label="APPOINT">指定商家</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="指定商家">
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="messageDetailColumns"
+              :data="shopMessageData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="messageChangeSort"
+              @on-selection-change="messageChangeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchShopMessageForm.pageNumber"
+              :total="shopMessageDataTotal"
+              :page-size="searchShopMessageForm.pageSize"
+              @on-change="messageChangePage"
+              @on-page-size-change="messageChangePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="messageDetailModalVisible = false">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import * as API_Setting from "@/api/setting.js";
+  import * as API_Other from "@/api/other.js";
+  import * as API_Shop from "@/api/shops.js";
+
+
+  export default {
+    name: "bill",
+    components: {},
+    data() {
+      return {
+        openSearch: true, // 显示搜索
+        openTip: true, // 显示提示
+        loading: true, // 表单加载状态
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        messageModalVisible: false, // 发送站内信模态框
+        messageModalTitle: "", // 发送站内信标题
+        messageDetailModalVisible: false, // 添加或编辑显示
+        shopShow: false, //指定商家是否出现
+        shopList: [],//店铺列表
+        drop: false,
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        messageFormValidate: {
+          title: [
+            {required: true, message: '请输入消息标题', trigger: 'blur'},
+          ],
+          content: [
+            {required: true, message: '请输入消息内容', trigger: 'blur'},
+          ],
+        },
+        //管理端消息汇总
+        searchMessageForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        //发送给店铺的消息
+        searchShopMessageForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        selectDate: null,
+        form: {
+          noticeNode: "",
+          noticeTitle: ""
+        },
+        //消息发送表单
+        messageSendForm: {
+          messageRange: "ALL",
+          userIds: [],
+          userNames: [],
+        },
+        // 表单验证规则
+        formValidate: {
+          noticeNode: [
+            {required: true, message: '请输入通知节点', trigger: 'blur'},
+          ],
+          noticeTitle: [
+            {required: true, message: '请输入通知标题', trigger: 'blur'},
+          ],
+          noticeContent: [
+            {required: true, message: '请输通知内容', trigger: 'blur'},
+          ],
+
+        },
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        messageSelectList: [], // 消息多选数据
+        messageSelectCount: 0, // 多选计数
+        selectCount: 0, // 多选计数
+        noticeColumns: [
+          {
+            title: "通知节点",
+            key: "noticeNode",
+            maxWidth: 270,
+            sortable: false,
+          },
+          {
+            title: "通知标题",
+            key: "noticeTitle",
+            minWidth: 200,
+            sortable: false,
+          },
+          {
+            title: "通知内容",
+            key: "noticeContent",
+            minWidth: 300,
+            sortable: false,
+          },
+          {
+            title: "状态",
+            key: "noticeStatus",
+            maxWidth: 100,
+            sortType: "desc",
+            render: (h, params) => {
+              if (params.row.noticeStatus == "OPEN") {
+                return h("Badge", {props: {status: "success", text: "开启"}})
+              } else if (params.row.noticeStatus == "CLOSE") {
+                return h("Badge", {props: {status: "processing", text: "关闭"}})
+              }
+            }
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 140,
+            render: (h, params) => {
+              let enableOrDisable = "";
+              if (params.row.noticeStatus == "OPEN") {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.disable(params.row);
+                      }
+                    }
+                  },
+                  "关闭"
+                );
+              } else {
+                enableOrDisable = h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.enable(params.row);
+                      }
+                    }
+                  },
+                  "开启"
+                );
+              }
+              return h("div", [
+                enableOrDisable,
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "primary",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      }
+                    }
+                  },
+                  "编辑"
+                ),
+              ]);
+            }
+          },
+        ],
+        noticeData: [], // 表单数据
+        noticeDataTotal: 0, // 表单数据总数
+        messageColumns: [
+          {
+            title: "消息标题",
+            key: "title",
+            minWidth: 150,
+          },
+          {
+            title: "消息内容",
+            key: "content",
+            minWidth: 350,
+            tooltip: true
+          },
+
+          {
+            title: "发送类型",
+            key: "messageRange",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.messageRange == "ALL") {
+                return h('div', [
+                  h('span', {}, '全站'),
+                ]);
+              } else if (params.row.messageRange == "APPOINT") {
+                return h('div', [
+                  h('span', {}, '指定用户'),
+                ]);
+              }
+            }
+          },
+          {
+            title: "发送时间",
+            key: "createTime",
+            sortable: true,
+            width: 180,
+            sortable: false,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 140,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      }
+                    }
+                  },
+                  "详细"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small"
+                    },
+                    style: {
+                      marginRight: "5px"
+                    },
+                    on: {
+                      click: () => {
+                        this.delete(params.row.id);
+                      }
+                    }
+                  },
+                  "删除"
+                ),
+              ]);
+            }
+          },
+        ],
+      messageData: [], // 表单数据
+        messageDataTotal: 0, // 表单数据总数
+        messageDetailColumns: [
+          {
+            title: "店铺ID",
+            key: "storeId",
+            maxWidth: 300,
+            sortable: false,
+          },
+          {
+            title: "店铺名称",
+            key: "storeName",
+            sortable: false,
+          },
+          {
+            title: "是否已读",
+            key: "status",
+            render: (h, params) => {
+              if (params.row.status == "ALREADY_READY") {
+                return h( "Badge", {props: { status: "success",text: "已读" } })
+              } else if (params.row.status == "UN_READY") {
+                return h( "Badge", {props: { status: "processing",text: "未读" } })
+              }else{
+                return h( "Badge", {props: { status: "processing",text: "回收站" } })
+              }
+            }
+          },
+        ],
+        shopMessageData: [], // 发送给店铺的消息数据
+        shopMessageDataTotal: 0, // 发送给店铺的消息数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getMessage();
+      },
+
+      //获取全部商家
+      getShopList() {
+        this.loading = true;
+        API_Shop.getShopList().then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.shopList = res.result;
+          }
+        });
+        this.loading = false;
+
+      },
+      paneChange(v) {
+        if (v == "SETTING") {
+          this.getNoticeMessage()
+        }
+        if (v == "MESSAGE") {
+          this.getMessage()
+        }
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getNoticeMessage();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getNoticeMessage();
+      },
+      handleSearch() {
+        this.searchMessageForm.pageNumber = 1;
+        this.searchMessageForm.pageSize = 10;
+        this.getMessage();
+      },
+
+      //消息每页条数发生变化
+      messageChangePageSize(v) {
+        this.searchMessageForm.pageSize = v;
+        this.getMessage();
+      },
+      //消息页数变化
+      messageChangePage(v) {
+        this.searchMessageForm.pageNumber = v;
+        this.getMessage();
+        this.clearSelectAll();
+      },
+      //消息
+      messageChangeSort(e) {
+        this.searchMessageForm.sort = e.key;
+        this.searchMessageForm.order = e.order;
+        this.getMessage();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getNoticeMessage();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      //消息
+      messageChangeSelect(e) {
+        this.messageSelectList = e;
+        this.messageSelectCount = e.length;
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      //获取发送段铺的名称
+      getName(value) {
+        this.messageSendForm.userNames = new Array()
+        value.forEach((item) => {
+          this.messageSendForm.userNames.push(item.label)
+        })
+      },
+      //删除站内信
+      delete(id){
+        console.warn(id)
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "您确认删除此站内信 ?",
+          loading: true,
+          onOk: () => {
+            API_Setting.deleteMessage(id).then((res) => {
+              if (res.success) {
+                this.$Message.success("删除成功");
+              }
+              this.$Modal.remove();
+              this.getMessage();
+            });
+
+
+          }
+        });
+      },
+      //管理员发送消息
+      sendMessage() {
+        this.messageModalVisible = true
+        this.messageModalTitle = "发送站内信"
+        this.shopShow = false
+        this.messageSendForm =
+          {
+            messageRange: "ALL",
+            content: "",
+            title: "",
+            userIds: [],
+            userNames: [],
+          }
+      },
+      //管理员发送站内信提交
+      sendMessageSubmit() {
+        if (this.messageSendForm.userIds.length <= 0 && this.messageSendForm.messageRange == "APPOINT") {
+          this.$Message.error("请选择发送对象");
+          return
+        }
+        this.$refs["messageSendForm"].validate(valid => {
+          if (valid) {
+            API_Other.sendMessage(this.messageSendForm).then((res) => {
+              this.loading = false;
+              if (res.success) {
+                this.$Message.success("发送成功");
+                this.messageModalVisible = false
+                this.getMessage();
+              }
+            });
+            this.loading = false;
+          }
+        })
+
+      },
+      //弹出选择商家的框
+      selectShop(v) {
+        if (v == "APPOINT") {
+          this.getShopList()
+          this.shopShow = true
+        }
+        if (v == "ALL") {
+          this.shopShow = false
+        }
+      },
+      //获取管理员发送列表
+      getMessage() {
+        this.loading = true;
+        API_Other.getMessagePage(this.searchMessageForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.messageData = res.result.records;
+            this.messageDataTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+
+      getNoticeMessage() {
+        this.loading = true;
+        API_Setting.getNoticeMessageData(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.noticeData = res.result.records;
+            this.noticeDataTotal = res.result.total;
+          }
+        });
+        this.loading = false;
+      },
+      //保存通知类站内信
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            let params ={
+              noticeContent:this.form.noticeContent,
+              noticeTitle:this.form.noticeTitle
+            }
+            API_Setting.editNoticeMessage(this.form.id, params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+                this.modalVisible = false;
+                this.getNoticeMessage();
+              }
+            });
+          }
+        });
+      },
+      //消息详情
+      detail(v) {
+        this.searchShopMessageForm.messageId = v.id
+        API_Other.getShopMessage(this.searchShopMessageForm).then((res) => {
+          if (res.success) {
+            this.messageDetailModalVisible = true;
+            this.modalTitle = "消息详情"
+            this.messageSendForm = v
+            this.shopMessageData = res.result.records;
+            this.shopMessageDataTotal = res.result.total;
+          }
+        });
+
+      },
+      edit(v) {
+        API_Setting.getNoticeMessageDetail(v.id).then((res) => {
+          if (res.success) {
+            this.modalTitle = "编辑通知类推送"
+            this.modalVisible = true
+            this.form = res.result
+          }
+        });
+      },
+      //禁用站内信模板
+      disable(v) {
+        API_Setting.updateMessageStatus(v.id,"CLOSE").then((res) => {
+          if (res.success) {
+            this.$Message.success("禁用成功");
+            this.getNoticeMessage();
+          }
+        });
+      },
+      //启用站内信模板
+      enable(v) {
+        API_Setting.updateMessageStatus(v.id,"OPEN").then((res) => {
+          if (res.success) {
+            this.$Message.success("启用成功");
+            this.getNoticeMessage();
+          }
+        });
+      },
+
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+  @import "sms.scss";
+</style>
diff --git a/manager/src/views/sys/message/sms.scss b/manager/src/views/sys/message/sms.scss
new file mode 100644
index 00000000..3688eaf9
--- /dev/null
+++ b/manager/src/views/sys/message/sms.scss
@@ -0,0 +1,151 @@
+.card {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+}
+
+.cardBox {
+  display: inline-block;
+  border-radius: 2px;
+  line-height: 1.5;
+  margin-right: 20px;
+  width: 300px;
+  border: 1px solid #eee;
+  padding: 10px;
+}
+
+.methodItem {
+  width: 100%;
+  border: 1px solid #f5f5f5;
+  text-align: center;
+  padding: 20px 0;
+}
+
+methodItem img {
+  width: 220px;
+  height: 86px;
+}
+
+methodItem h4 {
+  font-size: 14px;
+  color: #333;
+  margin-top: 5px;
+}
+
+.methodItem img {
+  width: 220px;
+  height: 86px;
+}
+
+.bar {
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  padding: 10px 8px 0;
+}
+
+.send-setting .left-show {
+  width: 230px;
+  padding: 20px 30px 20px 10px;
+  border: 1px solid #eee;
+  background-color: #fafafa;
+}
+
+.send-form {
+  flex: 1;
+  padding: 10px;
+  border: 1px solid #eee;
+  margin-left: 24px;
+  background-color: #fafafa;
+}
+.send-setting {
+  display: flex;
+  margin: 20px 0 0 0;
+  .sms {
+    word-break: break-all;
+    display: inline-block;
+    background-color: #eee;
+    max-width: 220px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius: 6px;
+  }
+}
+.choose-member {
+  display: flex;
+  height: 400px;
+  border: 1px solid #eee;
+  margin-bottom: 20px;
+}
+
+.source-member {
+  width: 50%;
+  border-right: 1px solid #eee;
+  padding: 10px;
+}
+.btns {
+  > span {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+.mobile {
+  margin-right: 20px;
+}
+
+.nickname {
+  font-size: 12px;
+  color: #999;
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+
+  white-space: nowrap;
+}
+.traget-member {
+  width: 50%;
+  padding: 10px;
+}
+.scroll-card {
+  margin: 5px 0;
+}
+.ivu-card-body {
+  padding: 1px;
+  margin-left: 7px;
+}
+.checkbox-tag {
+  height: 35px;
+  width: 100%;
+}
+.ivu-tag-border.ivu-tag-closable .ivu-icon-ios-close {
+  margin-right: 68px !important;
+  left: 7px;
+  top: 0px;
+}
+.ivu-tag-text {
+  line-height: 35px;
+  font-size: 14px;
+}
+
+.message-title{
+  background-color: #fff5eb;
+  border: 1px solid #ffc999;
+  box-sizing: border-box;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 14px;
+  padding: 8px 15px;
+  border-radius: 2px;
+}
diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue
new file mode 100644
index 00000000..8e517ae3
--- /dev/null
+++ b/manager/src/views/sys/message/sms.vue
@@ -0,0 +1,928 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <Tabs value="LIST" @on-click="paneChange">
+          <TabPane label="发送任务列表" name="LIST">
+            <Row class="operation" style="margin-bottom: 10px">
+              <Button @click="sendBatchSmsModal" type="primary">发送短信</Button>
+            </Row>
+            <Row>
+              <Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
+              </Table>
+            </Row>
+
+            <Row type="flex" justify="end" class="page">
+              <Page :current="smsSearchForm.pageNumber" :total="smsTotal" :page-size="smsSearchForm.pageSize" @on-change="smsChangePage" @on-page-size-change="smsChangePageSize"
+                :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+            </Row>
+          </TabPane>
+          <TabPane label="短信模板" name="TEMPLATE">
+            <Row class="operation" style="margin-bottom: 10px">
+              <Button @click="addTemplate" type="primary">添加短信模板</Button>
+              <Button @click="syncTemplate" type="info">同步</Button>
+            </Row>
+            <Row>
+              <Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
+              </Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page :current="templateSearchForm.pageNumber" :total="templateTotal" :page-size="templateSearchForm.pageSize" @on-change="templateChangePage"
+                @on-page-size-change="templateChangePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+            </Row>
+          </TabPane>
+          <TabPane label="短信签名" name="SIGN">
+            <Row class="operation" style="margin-bottom: 10px">
+              <Button @click="addSign" type="primary">添加短信签名</Button>
+              <Button @click="syncSign" type="info">同步</Button>
+            </Row>
+            <Row>
+              <Table :loading="loading" border :columns="signColumns" :data="signData" ref="table" sortable="custom" @on-sort-change="signChangeSort">
+                <template slot="signStatus" slot-scope="scope">
+                  <div v-if="scope.row.signStatus ==2 ">
+                    审核拒绝
+                    <Poptip trigger="hover" :content=scope.row.reason placement="top-start" transfer>
+                      <span style="color: #ed3f14">【原因】</span>
+                    </Poptip>
+                  </div>
+                  <div v-if="scope.row.signStatus ==0 ">
+                    审核中
+                  </div>
+                  <div v-if="scope.row.signStatus ==1 ">
+                    审核通过
+                  </div>
+
+                </template>
+              </Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page :current="signSearchForm.pageNumber" :total="signTotal" :page-size="signSearchForm.pageSize" @on-change="signChangePage" @on-page-size-change="signChangePageSize"
+                :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
+            </Row>
+
+          </TabPane>
+        </Tabs>
+
+      </Card>
+      </Col>
+    </Row>
+    <Modal :title="templateModalTitle" v-model="templateModalVisible" :mask-closable="false" :width="500">
+      <Form ref="templateForm" :model="templateForm" :label-width="100" :rules="templateFormValidate">
+        <FormItem label="模板名称" prop="templateName">
+          <Input v-model="templateForm.templateName" maxlength="30" clearable style="width: 90%" placeholder="请输入模板名称，不超过30字符" />
+        </FormItem>
+        <FormItem label="模板内容" prop="templateContent">
+          <Input v-model="templateForm.templateContent" clearable type="textarea" style="width: 90%" maxlength="200" :autosize="{maxRows:5,minRows: 5}" show-word-limit
+            placeholder="请输入短信内容，不超过500字符，不支持【】、★、 ※、 →、 ●等特殊符号；" />
+        </FormItem>
+        <FormItem label="申请说明" prop="remark">
+          <Input v-model="templateForm.remark" clearable type="textarea" style="width: 90%" maxlength="150" :autosize="{maxRows:4,minRows: 4}" show-word-limit
+            placeholder="请描述您的业务使用场景，不超过100字符；如：用于春节集五福" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="templateModalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="templateSubmit">提交
+        </Button>
+      </div>
+    </Modal>
+    <Modal :title="sendSmsModalTitle" v-model="sendSmsModal" :mask-closable="false" :width="900">
+      <div class="send-setting">
+        <div class="left-show" v-html="smsContent">
+          <div class="sms">效果预览</div>
+        </div>
+        <div class="send-form">
+          <Form ref="smsForm" :model="smsForm" :label-width="100" :rules="smsFormValidate">
+            <FormItem label="短信签名" prop="signName">
+              <Select @on-change="selectSmsSign" v-model="smsForm.signName" style="width: 35%;">
+                <Option v-for="item in smsSigns" :value="item.signName" :key="item.signName">{{ item.signName }}
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem label="短信模板" prop="messageCode">
+              <Select @on-change="selectSmsTemplate" v-model="smsForm.messageCode" style="width: 35%;">
+                <Option v-for="(item,index) in smsTemplates" :key="index" :value="item.templateCode">{{
+                  item.templateName }}
+                  <input type="hidden"></input>
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem label="短信内容" prop="context">
+              <Input v-model="smsForm.context" clearable type="textarea" style="width: 90%" maxlength="50" :autosize="{maxRows:4,minRows: 4}" show-word-limit disabled />
+            </FormItem>
+            <FormItem label="接收人" prop="smsRange">
+              <p>
+                已选<span style="color: #f56c1d"> {{memberNum}}</span>人，预计耗费条数<span style="color: #f56c1d">{{this.smsForm.num}}条</span>
+              </p>
+              <RadioGroup @on-change="smsRangeChange" v-model="smsForm.smsRange">
+                <Radio label="1">全部会员</Radio>
+                <Radio label="2">自定义选择</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem>
+              <div class="choose-member" v-if="customSms">
+                <div class="source-member">
+                  <Input suffix="ios-search" @on-enter="memberSearch" v-model="memberSearchParam.mobile" @on-blur="memberSearch" placeholder="请输入手机号码" style="width: 92%" />
+                  <div style="margin-top: 5px">
+                    <Scroll :on-reach-bottom="memberSearchEdge">
+
+                      <div dis-hover v-for="(item, index) in members" :key="index" class="scroll-card">
+                        <Button class="btns" :class="{'active':item.___selected}" @click="moveMember(index,item)" style="width: 100%;text-align: left">
+                          <span v-if="item.mobile" class="mobile">
+                            {{item.mobile}}
+                          </span>
+                          <span class="nickname">
+                            {{  item.nickName}}
+                          </span>
+                        </Button>
+
+                      </div>
+                    </Scroll>
+                  </div>
+                </div>
+                <div class="traget-member" style="overflow:auto">
+                  <div v-for="(item, index) in alreadyCheckShow" :key="index"  >
+                    <Tag class="checkbox-tag" closable @on-close="alreadyCheckClose(item,index)">{{item.mobile ||
+                      item.nickName}}
+                    </Tag>
+                  </div>
+                </div>
+              </div>
+            </FormItem>
+          </Form>
+        </div>
+
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="sendSmsModal = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="sendSms">发送</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+
+<script>
+import * as API_Setting from "@/api/setting.js";
+import * as API_Member from "@/api/member.js";
+
+export default {
+  name: "sms",
+  components: {},
+
+  data() {
+    return {
+      customSms: false, //当选择自动发送对象 展示
+      isActive: false,
+      alreadyCheck: [], //已经选中的数据
+      alreadyCheckShow: [], //已经选择的值负责显示
+      memberPage: 0,
+      members: [], //所有会员
+      smsTemplateContent: "", //短信模板内容
+      memberNum: 0, //会员总数
+      smsNum: 0, //预计发送短信条数
+      smsContent: "<div class='sms'>效果预览</div>", //短信内容
+      smsTemplates: [], //短信模板
+      smsSigns: [], //短信签名
+      sendSmsModal: false, //弹出发送短信模态框
+      sendSmsModalTitle: "短信发送", //发送短信模态框标题
+      modalType: 0, // 添加或编辑标识
+      templateModalVisible: false, //添加短信模板弹出框
+      templateModalTitle: "", //添加短信模板弹出框标题
+      templateForm: {}, //短信模板添加form
+      submitLoading: false,
+      selected: "",
+      settingData: "",
+      modalTitle: "设置",
+      modalVisible: false,
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      signSearchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      //短信模板查询form
+      templateSearchForm: {
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      //会员条数查询form
+      memberSearchFrom: {
+        disabled: "OPEN", // 会员状态
+      },
+      //会员查询条件
+      memberSearchParam: {
+        pageNumber: 1, // 当前页数
+        pageSize: 8, // 页面大小
+        disabled: "OPEN", // 会员状态
+      },
+      //短信记录查询form
+      smsSearchForm: {
+        sort: "createTime",
+        order: "desc",
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+      smsForm: {
+        smsName: "",
+        signName: "",
+        context: "",
+        smsRange: "1",
+        num: 0,
+        messageCode: "",
+      }, //短信发送form
+      //短信发送参数校验
+      smsFormValidate: {
+        signName: [
+          {
+            required: true,
+            message: "请选择短信签名",
+            trigger: "blur",
+          },
+        ],
+        messageCode: [
+          {
+            required: true,
+            message: "请选择短信模板",
+            trigger: "blur",
+          },
+        ],
+      },
+      templateFormValidate: {
+        templateName: [
+          {
+            required: true,
+            message: "请输入短信模板名称",
+            trigger: "blur",
+          },
+        ],
+        templateContent: [
+          {
+            required: true,
+            message: "请输入短信模板内容",
+            trigger: "blur",
+          },
+        ],
+        remark: [
+          {
+            required: true,
+            message: "请输入短信模板申请说明",
+            trigger: "blur",
+          },
+        ],
+      },
+      smsColumns: [
+        {
+          title: "模板名称",
+          key: "smsName",
+          width: 250,
+        },
+        {
+          title: "签名",
+          width: 150,
+          key: "signName",
+        },
+        {
+          title: "短信内容",
+          minWidth: 300,
+          key: "context",
+          tooltip: true,
+        },
+        {
+          title: "预计发送条数",
+          key: "num",
+          width: 140,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 150,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "详细"
+              ),
+            ]);
+          },
+        },
+      ],
+      smsData: [], // 表单数据
+      smsTotal: 0, // 表单数据总数
+      templateColumns: [
+        {
+          title: "模板code",
+          key: "templateCode",
+        },
+        {
+          title: "模板名称",
+          key: "templateName",
+        },
+        {
+          title: "模板内容",
+          key: "templateContent",
+        },
+        {
+          title: "状态",
+          key: "templateStatus",
+          headerAlign: "center",
+          Width: "100px",
+          render: (h, params) => {
+            if (params.row.templateStatus == 0) {
+              return h("div", {}, "审核中");
+            } else if(params.row.templateStatus == 1){
+              return h("div", {}, "审核通过");
+            } else {
+              return h("div", {}, "审核失败");
+            }
+          },
+        },
+        {
+          title: "操作",
+          key: "action",
+          fixed: "right",
+          width: 200,
+          align: "center",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                    icon: "ios-create-outline",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  attrs: {
+                    disabled: params.row.templateStatus == 2 ? false : true,
+                  },
+                  on: {
+                    click: () => {
+                      this.editTemplate(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  attrs: {
+                    disabled: params.row.templateStatus == 0 ? true : false,
+                  },
+                  on: {
+                    click: () => {
+                      this.deleteSmsTemplate(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      templateData: [], // 表单数据
+      templateTotal: 0, // 表单数据总数
+      signColumns: [
+        {
+          title: "签名名称",
+          key: "signName",
+        },
+        {
+          title: "申请说明",
+          key: "remark",
+        },
+        {
+          title: "状态",
+          key: "signStatus",
+          headerAlign: "center",
+          Width: "100px",
+          slot: "signStatus",
+        },
+        {
+          title: "操作",
+          key: "action",
+          fixed: "right",
+          width: 200,
+          align: "center",
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                    icon: "ios-create-outline",
+                  },
+                  attrs: {
+                    disabled: params.row.signStatus == 2 ? false : true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editSign(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                    icon: "ios-create-outline",
+                  },
+                  attrs: {
+                    disabled: params.row.signStatus == 0 ? true : false,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.deleteSmsSign(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      signData: [], // 表单数据
+      signTotal: 0, // 表单数据总数
+    };
+  },
+  filters: {},
+  methods: {
+    init() {
+      this.getSms();
+      //查询会员总数
+      this.getMemberNum();
+    },
+    //查询会员条数
+    getMemberNum() {
+      API_Member.getMemberNum(this.memberSearchFrom).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.memberNum = res.result;
+          this.smsForm.num = this.memberNum; //全部会员则会员数就等于条数
+        }
+      });
+    },
+    //已经选择的人取消选中
+    alreadyCheckClose(val,index) {
+      this.alreadyCheck.splice(index, 1);
+      this.alreadyCheckShow.splice(index, 1);
+
+
+      this.members.forEach((item,index)=>{
+        if(item.___selected && item.mobile == val.mobile){
+          item.___selected = false
+        }
+      })
+
+
+
+      this.smsForm.num--;
+      this.memberNum--;
+    },
+    //发送短信详细
+    detail(){
+
+    },
+
+    //选择接收人事件
+    smsRangeChange(v) {
+      this.memberNum = 0;
+      this.smsForm.num = 0;
+      if (v == 1) {
+        this.alreadyCheck = [];
+        this.alreadyCheckShow = [];
+        this.customSms = false;
+        this.getMemberNum();
+      }
+      if (v == 2) {
+        this.customSms = true;
+        this.getMembers();
+      }
+    },
+    //搜索会员
+    memberSearch() {
+      this.memberSearchParam.pageNumber = 1;
+      this.members = [];
+      this.getMembers();
+    },
+    //移动会员
+    moveMember(index, item) {
+      if (!item.mobile) {
+        this.$Message.error("当前用户暂无手机号绑定");
+        return false;
+      }
+      item.___selected = true;
+      if (this.alreadyCheck.length == 0) {
+        this.alreadyCheck.push(item.mobile);
+        this.alreadyCheckShow.push(item);
+        this.smsForm.num++;
+        this.memberNum++;
+      } else {
+        //如果已选择数组内存在此用户则不在进行选择
+        let result = this.alreadyCheck.indexOf(item.mobile);
+        if (result < 0) {
+          this.smsForm.num++;
+          this.memberNum++;
+          this.alreadyCheck.push(item.mobile);
+          this.alreadyCheckShow.push(item);
+        }
+      }
+    },
+    //底部滑动查询会员
+    memberSearchEdge() {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          if (this.memberPage != this.memberSearchParam.pageNumber) {
+            this.memberSearchParam.pageNumber++;
+            this.getMembers();
+            resolve();
+          } else {
+            resolve();
+            return false;
+          }
+        }, 1000);
+      });
+    },
+    //分页查询会员信息
+    getMembers() {
+      API_Member.getMemberListData(this.memberSearchParam).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          res.result.records.forEach((item) => {
+            item.___selected = false;
+            this.members.push(item);
+          });
+
+          this.memberPage = res.result.pages;
+        }
+      });
+    },
+
+    //弹出发送短信模态框
+    sendBatchSmsModal() {
+      this.templateSearchForm.templateStatus = 1;
+      API_Setting.getSmsTemplatePage(this.templateSearchForm).then((res) => {
+        if (res.success) {
+          this.smsTemplates = res.result.records;
+        }
+      });
+      this.signSearchForm.signStatus = 1;
+      API_Setting.getSmsSignPage(this.signSearchForm).then((res) => {
+        if (res.success) {
+          this.smsSigns = res.result.records;
+        }
+      });
+
+      this.smsContent = "<div class='sms'>效果预览</div>";
+      //添加的时候将已经选过的手机号码置为空
+      this.alreadyCheck = [];
+      this.alreadyCheckShow = [];
+      this.smsTemplateContent = "效果预览";
+      // this.smsTemplateContent = "";
+      this.smsForm = {
+        smsName: "",
+        signName: "",
+        context: "",
+        smsRange: "1",
+        num: 0,
+        messageCode: "",
+      };
+      this.getMemberNum();
+      this.loading = false;
+      this.sendSmsModal = true;
+    },
+    setting() {
+      this.modalVisible = true;
+    },
+    //pane切换事件
+    paneChange(v) {
+      if (v == "TEMPLATE") {
+        this.getSmsTemplate();
+      }
+      if (v == "SIGN") {
+        this.getSmsSign();
+      }
+    },
+    //短信签名变化方法
+    selectSmsSign(v) {
+      if (v != void 0) {
+        //给预览赋值
+        this.smsContent =
+          "<div class='sms'>【" +
+          v +
+          "】" +
+          " " +
+          this.smsTemplateContent +
+          "</div>";
+      } else {
+        this.smsContent =
+          "<div class='sms'>效果预览" + this.smsTemplateContent + "</div>";
+      }
+    },
+    //短信模板变化方法
+    selectSmsTemplate(v) {
+      //循环短信模板 如果选择短信模板匹配则查询出当前模板的内容
+      this.smsTemplates.forEach((e) => {
+        if (this.smsForm.messageCode == e.templateCode) {
+          this.smsTemplateContent = e.templateContent;
+          this.smsForm.smsName = e.templateName;
+        }
+      });
+      if (this.smsForm.signName != "" && this.smsForm.signName != void 0) {
+        this.smsContent =
+          "<div class='sms'>【" +
+          this.smsForm.signName +
+          "】" +
+          this.smsTemplateContent +
+          "</div>";
+      } else {
+        this.smsContent =
+          "<div class='sms'>" + this.smsTemplateContent + "</div>";
+      }
+      this.smsForm.context = this.smsTemplateContent;
+    },
+    //查询方法
+    handleSearch() {},
+    //删除短信模板
+    deleteSmsTemplate(v) {
+      let params = {
+        templateCode: v.templateCode,
+      };
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除此短信模板？",
+        loading: true,
+        onOk: () => {
+          API_Setting.deleteSmsTemplatePage(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getSmsTemplate();
+            }
+          });
+        },
+      });
+    },
+    //发送短信
+    sendSms() {
+      this.$refs.smsForm.validate((valid) => {
+        const mobile = JSON.stringify(this.alreadyCheck);
+        this.smsForm.mobile = mobile;
+        if (valid) {
+          API_Setting.sendSms(this.smsForm).then((res) => {
+            if (res.success) {
+              this.$Message.success("发送成功");
+              this.getSms();
+              this.sendSmsModal = false;
+            }
+          });
+        }
+      });
+    },
+    //添加短信签名
+    addSign() {
+      this.$router.push({ name: "add-sms-sign" });
+    },
+    //新增短信模板
+    addTemplate() {
+      this.templateModalVisible = true;
+      this.templateModalTitle = "添加短信模板";
+      this.templateForm = {};
+    },
+    //新增短信模板
+    editTemplate(v) {
+      this.templateModalVisible = true;
+      this.templateModalTitle = "修改短信模板";
+      this.templateForm = v;
+      this.modalType = 1;
+    },
+    //同步签名
+    syncSign() {
+      this.loading = true;
+      API_Setting.syncSign().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.$Message.success("同步成功");
+          this.getSmsSign();
+        }
+      });
+      this.loading = false;
+    },
+    //短信模板添加提交
+    templateSubmit() {
+      this.$refs.templateForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          if (this.modalType == 0) {
+            API_Setting.addSmsTemplatePage(this.templateForm)
+              .then((res) => {
+                this.loading = false;
+                if (res.code === 200) {
+                  this.$Message.success("添加成功");
+                  this.loading = false;
+                  this.templateModalVisible = false;
+                  this.getSmsTemplate();
+                }
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          } else {
+            API_Setting.editSmsTemplatePage(this.templateForm)
+              .then((res) => {
+                this.loading = false;
+                if (res.code === 200) {
+                  this.$Message.success("修改成功");
+                  this.loading = false;
+                  this.templateModalVisible = false;
+                  this.getSmsTemplate();
+                }
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          }
+        }
+      });
+    },
+    //删除短信签名
+    deleteSmsSign(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除此短信签名？",
+        loading: true,
+        onOk: () => {
+          API_Setting.deleteSign(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getSmsTemplate();
+            }
+          });
+        },
+      });
+    },
+    //短信模板同步
+    syncTemplate() {
+      this.loading = true;
+      API_Setting.syncTemplate().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.$Message.success("同步成功");
+          this.getSmsTemplate();
+        }
+      });
+      this.loading = false;
+    },
+    //短信记录页数变化
+    smsChangePage(v) {
+      this.smsSearchForm.pageNumber = v;
+      this.getSms();
+    },
+    //短信记录页数变化
+    smsChangePageSize(v) {
+      this.smsSearchForm.pageSize = v;
+      this.getSms();
+    },
+    //短信模板页数变化
+    templateChangePage(v) {
+      this.templateSearchForm.pageNumber = v;
+      this.getSmsTemplate();
+    },
+    //短信模板页数变化
+    templateChangePageSize(v) {
+      this.templateSearchForm.pageSize = v;
+      this.getSmsTemplate();
+    },
+    templateChangeSort(e) {
+      this.templateSearchForm.sort = e.key;
+      this.templateSearchForm.order = e.order;
+      this.getSmsTemplate();
+    },
+    smsChangeSort(e) {
+      this.smsSearchForm.sort = e.key;
+      this.smsSearchForm.order = e.order;
+      this.getSms();
+    },
+    //分页获取短信模板数据
+    getSmsTemplate() {
+      this.loading = true;
+      API_Setting.getSmsTemplatePage(this.templateSearchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.templateData = res.result.records;
+          this.templateTotal = res.result.total;
+        }
+      });
+      this.loading = false;
+    },
+    //分页获取短信记录数据
+    getSms() {
+      this.loading = true;
+      API_Setting.getSmsPage(this.smsSearchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.smsData = res.result.records;
+          this.smsTotal = res.result.total;
+        }
+      });
+      this.loading = false;
+    },
+    //短信模板页数变化
+    signChangePage(v) {
+      this.signSearchForm.pageNumber = v;
+      this.getSmsSign();
+    },
+    //短信模板页数变化
+    signChangePageSize(v) {
+      this.signSearchForm.pageSize = v;
+      this.getSmsSign();
+    },
+    signChangeSort(e) {
+      this.signSearchForm.sort = e.key;
+      this.signSearchForm.order = e.order;
+      this.getSmsSign();
+    },
+    //修改短信签名
+    editSign(v) {
+      this.$router.push({ name: "add-sms-sign", query: { id: v.id } });
+    },
+    //分页获取短信签名数据
+    getSmsSign() {
+      this.loading = true;
+      API_Setting.getSmsSignPage(this.signSearchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.signData = res.result.records;
+          this.signTotal = res.result.total;
+        }
+      });
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {},
+};
+</script>
+
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+@import "sms.scss";
+
+.split {
+  height: 200px;
+  border: 1px solid #dcdee2;
+}
+
+.split-pane {
+  padding: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/message/smsSign.vue b/manager/src/views/sys/message/smsSign.vue
new file mode 100644
index 00000000..d140b4f5
--- /dev/null
+++ b/manager/src/views/sys/message/smsSign.vue
@@ -0,0 +1,195 @@
+<template>
+  <Card>
+    <div style="margin-top: 0px">
+      <div class="sign-name" v-if="id == undefined">
+        新增签名
+      </div>
+      <div class="sign-name" v-else>
+        修改签名
+      </div>
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="签名" prop="signName">
+          <Input v-model="form.signName" maxlength="12" clearable style="width: 28%"
+                 placeholder="仅限2-12个字符，建议使用App应用名称或是网站名/公司名"/>
+        </FormItem>
+        <FormItem label="签名来源" prop="signSource">
+          <Select v-model="form.signSource" placeholder="请选择签名来源" style="width: 28%">
+            <Option :value="0">企事业单位的全称或简称</Option>
+            <Option :value="1">工信部备案网站的全称或简称</Option>
+            <Option :value="2">App应用的全称或简称</Option>
+            <Option :value="3">公众号或小程序的全称或简称</Option>
+            <Option :value="4">电商平台店铺名的全称或简称</Option>
+            <Option :value="5">商标名的全称或简称</Option>
+          </Select>
+        </FormItem>
+        <div class="div-remark div-remark-first">
+          签名来源选择工信部备案网站的全称或简称时，请在说明中添加网站域名，加快审核速度；
+        </div>
+        <div class="div-remark div-remark-bottom">
+          如果选择APP应用的全称或简称或公众号或小程序的全称或简称，则网站、APP、小程序或公众号必须已上线；
+        </div>
+        <FormItem label="证明文件">
+          <div style="float: left">
+            <upload-pic-thumb
+              v-model="form.businessLicense"
+              :multiple="false"
+              :max-size="2048"
+            >
+            </upload-pic-thumb>
+          </div>
+          <div style="float: left;margin-left: 20px">
+            <upload-pic-thumb
+              v-model="form.license"
+              :max-size="2048"
+              :multiple="false"
+            ></upload-pic-thumb>
+          </div>
+        </FormItem>
+        <div class="div-remark div-remark-first">
+          第一张为营业执照，第二张为授权委托书，请上传签名归属方的企事业单位的企业营业执照、组织机构代码证、税务登记证三证合一的证件及授权委托书
+        </div>
+        <div class="div-remark div-remark-bottom">
+          支持jpg、png、gif、jpeg格式的图片，每张图片不大于2MB
+        </div>
+        <FormItem label="申请说明" prop="remark">
+          <Input v-model="form.remark" clearable type="textarea" style="width: 50%" maxlength="100"
+                 :autosize="{maxRows:4,minRows: 4}" show-word-limit
+                 placeholder="请描述您的业务使用场景，不超过100字符；如：验证码、双十一大促营销"/>
+        </FormItem>
+      </Form>
+      <div class="footer">
+        <Button type="primary" :loading="submitLoading" @click="addSignSubmit">提交
+        </Button
+        >
+      </div>
+    </div>
+
+
+  </Card>
+</template>
+
+<script>
+  import * as API_Setting from "@/api/setting.js";
+  import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+  export default {
+    name: "smsSign",
+    components: {
+      uploadPicThumb
+    },
+
+    data() {
+      return {
+        id: 0,
+        form: {
+          signName: "",
+          businessLicense: "",
+          license: "",
+        },
+        loading: false,
+        formValidate: {
+          signName: [{required: true, message: "签名名称不能为空", trigger: "blur"}],
+          remark: [{required: true, message: "申请说明不能为空", trigger: "blur"}],
+          businessLicense: [{required: true, message: " ", trigger: "blur"}],
+        },
+        submitLoading: false
+      }
+
+    },
+    filters: {},
+    methods: {
+      init() {
+        this.id = this.$route.query.id;
+        if (this.id != undefined) {
+          this.getSmsSignDetail();
+        }
+
+      },
+      //添加短信模板
+      addSignSubmit() {
+        //校验证件信息
+        if (this.form.businessLicense == "" || this.form.license == "") {
+          this.$Message.error("请完善证件信息");
+          return
+        }
+        //校验签名来源
+        if (this.form.signSource == "") {
+          this.$Message.error("请选择签名来源");
+          return
+        }
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.loading = true;
+            //新增
+            if (this.id == undefined) {
+              API_Setting.addSmsSign(this.form).then(res => {
+                this.loading = false;
+                if (res.code === 200) {
+                  this.$Message.success('添加成功');
+                  this.$router.back()
+                }
+              }).catch(() => {
+                this.loading = false;
+              });
+            } else {
+              API_Setting.editSmsSign(this.form).then(res => {
+                this.loading = false;
+                if (res.code === 200) {
+                  this.$Message.success('修改成功');
+                  this.$router.back()
+                }
+              }).catch(() => {
+                this.loading = false;
+              });
+            }
+
+          }
+        })
+      },
+      //查询短信签名详细
+      getSmsSignDetail() {
+        API_Setting.smsSignDetail(this.id).then(res => {
+          this.loading = false;
+          if (res.code === 200) {
+            this.form = res.result
+          }
+        })
+      }
+    },
+    mounted() {
+      this.init();
+    },
+
+  };
+</script>
+<style lang="scss">
+  .sign-name {
+    margin-top: 5px;
+    margin-left: 20px;
+    font-size: 16px;
+    margin-bottom: 30px;
+    color: #333;
+  }
+
+  .div-remark {
+    margin-left: 100px;
+    margin-bottom: 2px;
+    color: #999;
+  }
+
+  .div-remark-first {
+    margin-top: -17px;
+  }
+
+  .div-remark-bottom {
+    margin-bottom: 8px;
+  }
+
+  .footer {
+    margin-left: 100px;
+  }
+</style>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/manager/src/views/sys/monitor/monitor.vue b/manager/src/views/sys/monitor/monitor.vue
new file mode 100644
index 00000000..8abd6e49
--- /dev/null
+++ b/manager/src/views/sys/monitor/monitor.vue
@@ -0,0 +1,98 @@
+
+
+<template>
+  <div>
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          inline
+          :label-width="70"
+
+          @keydown.enter.native="handleGo"
+        >
+          <Form-item label="链接地址" prop="url">
+            <Input type="text" v-model="url" placeholder="http://" clearable style="width: 350px" />
+          </Form-item>
+          <Form-item style="margin-left:-50px;">
+            <Button @click="handleGo" type="primary" icon="ios-send" style="margin-right:5px">前往</Button>
+            <Button @click="handleOpen" icon="md-open">新窗口中打开</Button>
+          </Form-item>
+        </Form>
+      </Row>
+      <Divider style="margin-top:-10px;margin-bottom:0px;" />
+      <Row>
+        <div style="position:relative;">
+          <iframe
+            id="iframe"
+            :src="go"
+            frameborder="0"
+            width="100%"
+            :height="height"
+            scrolling="auto"
+          ></iframe>
+          <Spin fix size="large" v-if="loading"></Spin>
+        </div>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "monitor",
+  data() {
+    return {
+      loading: false,
+      go: "",
+      url: "",
+      html: "",
+      height: "525px"
+    };
+  },
+  computed: {},
+  methods: {
+    initUrl() {
+      let url = this.$route.meta.url;
+      if (url !== null && url !== undefined) {
+        this.url = url;
+        this.go = url;
+        // window.open(this.go);
+        this.loading = true;
+        let that = this;
+        // 判断iframe是否加载完毕
+        let iframe = document.getElementById("iframe");
+        if (iframe.attachEvent) {
+          iframe.attachEvent("onload", function() {
+            //iframe加载完成后你需要进行的操作
+            that.loading = false;
+          });
+        } else {
+          iframe.onload = function() {
+            //iframe加载完成后你需要进行的操作
+            that.loading = false;
+          };
+        }
+      }
+    },
+    handleGo() {
+      let url = this.url;
+      this.go = this.url;
+    },
+    handleOpen() {
+      window.open(this.url);
+    }
+  },
+  watch: {
+    $route(to, from) {
+      this.initUrl();
+    }
+  },
+  mounted() {
+    // 计算高度
+    let height = document.documentElement.clientHeight;
+    this.height = Number(height - 217) + "px";
+    this.initUrl();
+  }
+};
+</script>
diff --git a/manager/src/views/sys/oss-manage/ossManage.scss b/manager/src/views/sys/oss-manage/ossManage.scss
new file mode 100644
index 00000000..077c560d
--- /dev/null
+++ b/manager/src/views/sys/oss-manage/ossManage.scss
@@ -0,0 +1,135 @@
+.search {
+    .oss-operation {
+        margin-bottom: 2vh;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+
+        button {
+            margin-right: 5px;
+        }
+    }
+}
+
+
+.none{
+  display: none;
+}
+.oss-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    position: relative;
+}
+
+.oss-card {
+    margin: 10px 20px 10px 0;
+    width: 290px;
+
+    :hover {
+        .content .other .name {
+            color: #1890ff;
+            transition: color .3s;
+        }
+    }
+
+    cursor: pointer;
+
+    .ivu-card-body {
+        padding: 0;
+    }
+
+    .content {
+        display: flex;
+        flex-direction: column;
+
+        :hover {
+            .play {
+                transition: opacity .3s;
+                opacity: 1 !important;
+            }
+        }
+
+        .img {
+            height: 135px;
+            object-fit: cover;
+        }
+
+        .video {
+            height: 135px;
+            position: relative;
+
+            .cover {
+                height: 100%;
+                width: 100%;
+                object-fit: fill;
+            }
+
+            .play {
+                position: absolute;
+                top: 43px;
+                left: 117px;
+                height: 50px;
+                width: 50px;
+                opacity: 0.8;
+            }
+        }
+
+        .other {
+            padding: 16px;
+            height: 135px;
+
+            .name {
+                font-size: 16px;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+                color: rgba(0, 0, 0, .85);
+                font-weight: 500;
+                margin-bottom: 4px;
+            }
+
+            .key {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                height: 45px;
+                word-break: break-all;
+                color: rgba(0, 0, 0, .45);
+            }
+
+            .info {
+                font-size: 12px;
+                color: rgba(0, 0, 0, .45);
+                overflow: hidden;
+                text-overflow: ellipsis;
+                height: 36px;
+                word-break: break-all;
+            }
+        }
+
+        .actions {
+            display: flex;
+            align-items: center;
+            height: 50px;
+            background: #f7f9fa;
+            border-top: 1px solid #e8e8e8;
+
+            i:hover {
+                color: #1890ff;
+            }
+
+            .btn {
+                display: flex;
+                justify-content: center;
+                width: 33.33%;
+                border-right: 1px solid #e8e8e8;
+            }
+
+            .btn-no {
+                display: flex;
+                justify-content: center;
+                width: 33.33%;
+            }
+        }
+    }
+}
diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue
new file mode 100644
index 00000000..8f313e21
--- /dev/null
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -0,0 +1,816 @@
+<style lang="scss">
+@import "@/styles/table-common.scss";
+@import "./ossManage.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <div class="operation">
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="85"    class="search-form"
+          >
+            <Form-item label="原文件名" prop="name">
+              <Input
+                type="text"
+                v-model="searchForm.name"
+                placeholder="请输入原文件名"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="存储文件名" prop="fileKey">
+              <Input
+                type="text"
+                v-model="searchForm.fileKey"
+                placeholder="请输入存储文件名"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="上传时间">
+              <DatePicker
+                v-model="selectDate"
+                type="daterange"
+                format="yyyy-MM-dd"
+                clearable
+                @on-change="selectDateRange"
+                placeholder="选择起始时间"
+                style="width: 200px"
+              ></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn"
+            >搜索
+            </Button
+            >
+          </Form>
+        </Row>
+        <div class="oss-operation padding-row">
+          <div>
+            <Button
+              @click="uploadVisible = true"
+              type="primary"
+            >上传文件
+            </Button
+            >
+            <Dropdown @on-click="handleDropdown">
+              <Button>
+                更多操作
+                <Icon type="md-arrow-dropdown"/>
+              </Button>
+              <DropdownMenu slot="list">
+                <DropdownItem name="refresh">刷新</DropdownItem>
+                <DropdownItem v-show="showType == 'list'" name="removeAll">批量删除
+                </DropdownItem>
+              </DropdownMenu>
+            </Dropdown>
+          </div>
+
+          <div>
+            <RadioGroup
+              v-model="fileType"
+              @on-change="changeFileType"
+              type="button"
+              style="margin-right: 25px"
+            >
+              <Radio label="all">所有类型</Radio>
+              <Radio label="pic">图片</Radio>
+              <Radio label="video">视频</Radio>
+            </RadioGroup>
+            <RadioGroup
+              v-model="showType"
+              type="button"
+              @on-change="changeShowType"
+            >
+              <Radio title="列表" label="list">
+                <Icon type="md-list"></Icon>
+              </Radio>
+              <Radio title="缩略图" label="thumb">
+                <Icon type="ios-apps"></Icon>
+              </Radio>
+            </RadioGroup>
+          </div>
+        </div>
+      </div>
+
+      <div v-show="showType == 'list'">
+        <Row v-show="openTip">
+          <Alert show-icon>
+            已选择
+            <span class="select-count">{{ selectCount }}</span> 项
+            <a class="select-clear" @click="clearSelectAll">清空</a>
+            <span v-if="selectCount > 0" style="margin-left: 15px"
+            >共计 {{ totalSize }} 存储量</span
+            >
+          </Alert>
+        </Row>
+        <Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="columns"
+            :data="data"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect"
+          ></Table>
+        </Row>
+      </div>
+      <div v-show="showType == 'thumb'">
+        <div class="oss-wrapper">
+          <Card v-for="(item, i) in data" :key="i" class="oss-card">
+            <div class="content">
+              <img
+                @click="showPic(item)"
+                v-if="item.fileType.indexOf('image') >= 0"
+                class="img"
+                :src="item.url"
+              />
+              <div
+                v-else-if="item.fileType.indexOf('video') >= 0"
+                class="video"
+                @click="showVideo(item)"
+              >
+                <!-- 文件小于5MB显示video -->
+                <video class="cover" v-if="item.fileSize < 1024 * 1024 * 5">
+                  <source :src="item.url"/>
+                </video>
+                <img class="play" src="@/assets/play.png"/>
+              </div>
+              <div v-else class="other">
+                <div class="name">{{ item.name }}</div>
+                <div class="key">{{ item.fileKey }}</div>
+                <div class="info">
+                  文件类型：{{ item.fileType }} 文件大小：{{
+                    ((item.fileSize * 1.0) / (1024 * 1024)).toFixed(2)
+                  }}
+                  MB 创建时间：{{ item.createTime }}
+                </div>
+              </div>
+              <div class="actions">
+                <div class="btn">
+                  <Tooltip content="下载" placement="top">
+                    <Icon @click="download(item)" type="md-download" size="16"/>
+                  </Tooltip>
+                </div>
+                <div class="btn">
+                  <Tooltip content="重命名" placement="top">
+                    <Icon @click="rename(item)" type="md-create" size="16"/>
+                  </Tooltip>
+                </div>
+                <div class="btn-no">
+                  <Tooltip content="删除" placement="top">
+                    <Icon @click="remove(item)" type="md-trash" size="16"/>
+                  </Tooltip>
+                </div>
+              </div>
+            </div>
+          </Card>
+        </div>
+      </div>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="pageSizeOpts"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+
+    <Drawer title="文件上传" class="drawer" styles="z-index:2000;" closable v-model="uploadVisible" width="500">
+      <Upload
+        :action="baseUrl + '/common/upload/file'"
+        :headers="accessToken"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :max-size="5120"
+        :on-exceeded-size="handleMaxSize"
+        multiple
+        type="drag"
+        ref="up"
+
+      >
+        <div style="padding: 20px 0">
+          <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
+          <p>点击这里或将文件拖拽到这里上传</p>
+        </div>
+      </Upload>
+      <div class="drawer-footer">
+        <Button @click="clearFiles">清空上传列表</Button>
+      </div>
+    </Drawer>
+
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="95" :rules="formValidate">
+        <FormItem label="原文件名" prop="name">
+          <Input v-model="form.name"/>
+        </FormItem>
+        <FormItem label="存储文件名" prop="fileKey">
+          <Input v-model="form.fileKey" disabled/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="handleCancel">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+
+    <Modal v-model="picVisible" :title="picTitle" draggable>
+      <img
+        :src="file.url"
+        alt="无效的图片链接"
+        style="width: 100%; margin: 0 auto; display: block"
+      />
+      <div slot="footer">
+        <span
+        >文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{
+            file.createTime
+          }}</span
+        >
+      </div>
+    </Modal>
+
+    <Modal
+      v-model="videoVisible"
+      :title="videoTitle"
+      :width="800"
+      @on-cancel="closeVideo"
+      draggable
+    >
+      <div id="dplayer"></div>
+      <div slot="footer">
+        <span
+        >文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{
+            file.createTime
+          }}</span
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getFileListData,
+  renameFile,
+  deleteFile,
+} from "@/api/index";
+import DPlayer from "dplayer";
+import config from "@/config";
+
+var dp;
+export default {
+  name: "oss-manage",
+  data() {
+    return {
+      config,
+      baseUrl: "",
+      selectImage: false, //是否是选择
+      accessToken: {}, // 上传token鉴权
+      loading: false, // 表单加载状态
+      fileType: "all",
+      showType: "list",
+      modalVisible: false, // 添加或编辑显示
+      uploadVisible: false,
+      videoVisible: false,
+      picVisible: false,
+      picTitle: "",
+      videoTitle: "",
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框对应data对象
+        name: "",
+        fileKey: "",
+        fileType: "",
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null, // 选择日期绑定modal
+      oldKey: "",
+      form: {
+        name: "",
+        fileKey: "",
+      },
+      file: {},
+      // 表单验证规则
+      formValidate: {
+        name: [{required: true, message: "不能为空", trigger: "blur"}],
+        fileKey: [{required: true, message: "不能为空", trigger: "blur"}],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      totalSize: "", // 文件大小统计
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "原文件名",
+          key: "name",
+          minWidth: 130,
+          sortable: true,
+          ellipsis: false,
+          tooltip: true,
+        },
+        {
+          title: "存储文件名",
+          key: "fileKey",
+          width: 165,
+          sortable: true,
+          ellipsis: false,
+          tooltip: true,
+        },
+        {
+          title: "缩略图(点击预览)",
+          key: "url",
+          width: 150,
+          align: "center",
+          render: (h, params) => {
+            if (params.row.fileType.includes("image") > 0) {
+              return h("img", {
+                attrs: {
+                  src: params.row.url,
+                  alt: "加载图片失败",
+                },
+                style: {
+                  cursor: "pointer",
+                  width: "80px",
+                  height: "60px",
+                  margin: "10px 0",
+                  "object-fit": "contain",
+                },
+                on: {
+                  click: () => {
+                    this.showPic(params.row);
+                  },
+                },
+              });
+            } else if (params.row.fileType.includes("video") > 0) {
+              // 如果视频文件大小超过5MB不予加载video
+              if (params.row.fileSize < 1024 * 1024 * 5) {
+                return h(
+                  "video",
+                  {
+                    style: {
+                      cursor: "pointer",
+                      width: "80px",
+                      height: "60px",
+                      margin: "10px 0",
+                      "object-fit": "contain",
+                    },
+                    on: {
+                      click: () => {
+                        this.showVideo(params.row);
+                      },
+                    },
+                  },
+                  [
+                    h("source", {
+                      attrs: {
+                        src: params.row.url,
+                      },
+                    }),
+                  ]
+                );
+              } else {
+                return h("img", {
+                  attrs: {
+                    src: require("@/assets/play.png"),
+                  },
+                  style: {
+                    cursor: "pointer",
+                    width: "80px",
+                    height: "60px",
+                    margin: "10px 0",
+                    "object-fit": "contain",
+                  },
+                  on: {
+                    click: () => {
+                      this.showVideo(params.row);
+                    },
+                  },
+                });
+              }
+            } else {
+              return h("span", "非多媒体类型");
+            }
+          },
+        },
+        {
+          title: "文件类型",
+          key: "fileType",
+          width: 115,
+          sortable: true,
+          className: this.selectImage == true ? "none" : "",
+        },
+        {
+          title: "文件大小",
+          key: "fileSize",
+          width: 115,
+          sortable: true,
+          className: this.selectImage == true ? "none" : "",
+          render: (h, params) => {
+            let m =
+              ((params.row.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+            return h("span", m);
+          },
+        },
+        {
+          title: "上传者",
+          key: "createBy",
+          width: 120,
+          sortable: true,
+          render: (h, params) => {
+            let m = "";
+            if(params.row.userEnums=="MANAGER"){
+            m="[管理员]"
+            }else if(params.row.userEnums=="STORE"){
+              m="[店铺]"
+            }else{
+              m="[会员]"
+            }
+            m += params.row.createBy
+            return h("span", m);
+          },
+        },
+        {
+          title: "上传时间",
+          key: "createTime",
+          width: 180,
+          sortable: true,
+          sortType: "desc",
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                    display: this.selectImage == true ? "inline-block" : "none",
+                  },
+                  on: {
+                    click: () => {
+                      this.selectedParams(params.row);
+                    },
+                  },
+                },
+                "选择"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                    display: this.selectImage == true ? "none" : "inline-block",
+                  },
+                  on: {
+                    click: () => {
+                      this.download(params.row);
+                    },
+                  },
+                },
+                "下载"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                    display: this.selectImage == true ? "none" : "inline-block",
+                  },
+                  on: {
+                    click: () => {
+                      this.rename(params.row);
+                    },
+                  },
+                },
+                "重命名"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    display: this.selectImage == true ? "none" : "inline-block",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      pageSizeOpts: [5, 10, 20],
+    };
+  },
+  methods: {
+    /**
+     * 选择
+     */
+    selectedParams(val) {
+      this.$emit("callback", val);
+    },
+
+    handleDropdown(name) {
+      if (name == "refresh") {
+        this.getDataList();
+      } else if (name == "removeAll") {
+        this.removeAll();
+      }
+    },
+    init() {
+      this.accessToken = {
+        accessToken: this.getStore("accessToken"),
+      };
+      this.getDataList();
+    },
+    showPic(v) {
+      this.file = v;
+      this.file.msize = ((v.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+
+      this.picTitle = v.name + "(" + v.fileKey + ")";
+      this.picVisible = true;
+    },
+    showVideo(v) {
+      dp = new DPlayer({
+        container: document.getElementById("dplayer"),
+        screenshot: true,
+        video: {
+          url: v.url,
+        },
+        danmaku: {
+          id: v.fileKey,
+          api: "https://api.prprpr.me/dplayer/",
+        },
+      });
+      this.file = v;
+      this.file.msize = ((v.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+      this.videoTitle = v.name + "(" + v.fileKey + ")";
+      this.videoVisible = true;
+    },
+    closeVideo() {
+      dp.destroy();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order == "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    changeShowType() {
+      this.searchForm.pageNumber = 1;
+      if (this.showType == "list") {
+        this.searchForm.pageSize = 10;
+      } else {
+        this.searchForm.pageSize = 12;
+      }
+      this.getDataList();
+    },
+
+    getDataList() {
+      if (this.showType == "list") {
+        this.pageSizeOpts = [10, 20, 50];
+      } else {
+        this.pageSizeOpts = [12, 24, 48];
+      }
+      this.loading = true;
+      getFileListData(this.searchForm).then((res) => {
+        this.loading = false;
+
+        this.data = res.result.records;
+        this.total = res.result.total;
+      });
+    },
+    handleSearch() {
+      this.searchForm.title = this.searchForm.name;
+      this.searchForm.pageNumber = 1;
+      if (this.showType == "list") {
+        this.searchForm.pageSize = 5;
+      } else {
+        this.searchForm.pageSize = 12;
+      }
+      this.getDataList();
+    },
+    changeFileType() {
+      let name = this.fileType;
+      if (name == "all") {
+        this.searchForm.fileType = "";
+      } else if (name == "pic") {
+        this.searchForm.fileType = "image";
+      } else if (name == "video") {
+        this.searchForm.fileType = "video";
+      }
+      this.handleSearch();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      if (this.showType == "list") {
+        this.searchForm.pageSize = 5;
+      } else {
+        this.searchForm.pageSize = 12;
+      }
+      this.selectDate = null;
+      this.searchForm.startDate = "";
+      this.searchForm.endDate = "";
+      this.searchForm.fileKey = "";
+      // 重新加载数据
+      this.getDataList();
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 5M.",
+      });
+    },
+    handleSuccess(res, file) {
+      if (res.success) {
+        this.$Message.success("上传文件 " + file.name + " 成功");
+        this.getDataList();
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.$Message.error(error.toString());
+    },
+    clearFiles() {
+      this.$refs.up.clearFiles();
+    },
+    handleCancel() {
+      this.modalVisible = false;
+    },
+    download(v) {
+      window.open(
+        v.url + "?attname=&response-content-type=application/octet-stream"
+      );
+    },
+    removeAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 个文件?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          deleteFile(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("批量删除文件成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除文件 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          deleteFile(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除文件 " + v.name + " 成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          let params = {
+            id: this.form.id,
+            key: this.oldKey,
+            newKey: this.form.fileKey,
+            newName: this.form.name,
+          };
+          renameFile(params).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    rename(v) {
+      this.modalTitle = "编辑文件名";
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] == null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let data = JSON.parse(str);
+      this.form = data;
+      this.oldKey = data.fileKey;
+      this.modalVisible = true;
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+      this.totalSize = "";
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+      let size = 0;
+      e.forEach((item) => {
+        size += item.fileSize * 1.0;
+      });
+      this.totalSize = ((size * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+    },
+  },
+  mounted() {
+    this.init();
+
+    this.baseUrl =
+      process.env.NODE_ENV === "development"
+        ? this.config.api_dev.common
+        : this.config.api_prod.common;
+  },
+};
+</script>
diff --git a/manager/src/views/sys/role-manage/roleManage.scss b/manager/src/views/sys/role-manage/roleManage.scss
new file mode 100644
index 00000000..5ba7b57a
--- /dev/null
+++ b/manager/src/views/sys/role-manage/roleManage.scss
@@ -0,0 +1,23 @@
+.permModal {
+    .ivu-modal-body {
+        max-height: 560px;
+        overflow: auto;
+    }
+}
+
+.depModal {
+    .ivu-modal-body {
+        max-height: 500px;
+        overflow: auto;
+    }
+}
+.tips{
+  font-size: 12px;
+  color: #999;
+  margin-left: 8px;
+}
+.title{
+
+  font-weight: bold;
+  margin-right: 20px;
+}
diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue
new file mode 100644
index 00000000..c5a60714
--- /dev/null
+++ b/manager/src/views/sys/role-manage/roleManage.vue
@@ -0,0 +1,782 @@
+<style lang="scss">
+@import "@/styles/table-common.scss";
+@import "./roleManage.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="addRole" type="primary">添加角色</Button>
+        <Button @click="delAll">批量删除</Button>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        ></Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="pageNumber"
+          :total="total"
+          :page-size="pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+
+    <!-- 编辑 -->
+    <Modal
+      :title="modalTitle"
+      v-model="roleModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="roleForm"
+        :model="roleForm"
+        :label-width="80"
+        :rules="roleFormValidate"
+      >
+        <FormItem label="角色名称" prop="name">
+          <Input v-model="roleForm.name"/>
+        </FormItem>
+        <FormItem label="备注" prop="description">
+          <Input v-model="roleForm.description"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="cancelRole">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitRole"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+    <!-- 菜单权限 -->
+    <Modal
+      :title="modalTitle"
+      v-model="permModalVisible"
+      :mask-closable="false"
+      :width="500"
+      :styles="{ top: '30px' }"
+      class="permModal"
+    >
+      <div style="position: relative">
+        <Tree
+          ref="tree"
+          :data="permData"
+          show-checkbox
+          :render="renderContent"
+          :check-strictly="true"
+        >
+        </Tree>
+        <Spin size="large" fix v-if="treeLoading"></Spin>
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="cancelPermEdit">取消</Button>
+        <Select
+          v-model="openLevel"
+          @on-change="changeOpen"
+          style="width: 110px; text-align: left; margin-right: 10px"
+        >
+          <Option value="0">展开所有</Option>
+          <Option value="1">收合所有</Option>
+          <Option value="2">仅展开一级</Option>
+          <Option value="3">仅展开两级</Option>
+        </Select>
+        <Button
+          type="primary"
+          :loading="submitPermLoading"
+          @click="submitPermEdit(true)"
+        >编辑
+        </Button
+        >
+      </div>
+    </Modal>
+    <!-- 数据权限 -->
+    <Modal
+      :title="modalTitle"
+      v-model="depModalVisible"
+      :mask-closable="false"
+      :width="500"
+      class="depModal"
+    >
+      <Alert show-icon
+      >默认可查看全部数据，自定义数据范围时请勾选下方数据
+      </Alert
+      >
+      <Form :label-width="85">
+        <FormItem label="数据范围">
+          <Select v-model="dataType" transfer>
+            <Option :value="0">全部数据权限</Option>
+            <Option :value="1">自定义数据权限</Option>
+            <Option :value="2">本部门及以下数据权限</Option>
+            <Option :value="3">本部门数据权限</Option>
+          </Select>
+        </FormItem>
+      </Form>
+      <div v-show="dataType == 1" style="margin-top: 15px">
+        <div style="position: relative">
+          <Tree
+            ref="depTree"
+            :data="depData"
+            :load-data="loadData"
+            @on-toggle-expand="expandCheckDep"
+            multiple
+            style="margin-top: 15px"
+          ></Tree>
+          <Spin size="large" fix v-if="depTreeLoading"></Spin>
+        </div>
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="depModalVisible = false">取消</Button>
+        <Button
+          type="primary"
+          :loading="submitDepLoading"
+          @click="submitDepEdit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+
+    <!-- 保存权限弹出选择权限 -->
+    <Modal
+      v-model="selectIsSuperModel"
+      title="选择菜单权限"
+      :loading="superModelLoading"
+      @on-ok="saveRole"
+    >
+      <div v-for="(item, index) in saveRoleWay" :key="index">
+        <span class="title">{{ item.title }}</span>
+        <RadioGroup v-model="item.isSuper">
+          <Radio :label="true">
+            <span>操作数据权限</span>
+          </Radio>
+          <Radio :label="false">
+            <span>查看权限</span>
+          </Radio>
+        </RadioGroup>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getRoleList,
+  getAllPermissionList,
+  addRole,
+  editRole,
+  deleteRole,
+  loadDepartment,
+  editRoleDep,
+  selectRoleMenu,
+  saveRoleMenu,
+} from "@/api/index";
+import util from "@/libs/util.js";
+
+export default {
+  name: "role-manage",
+  data() {
+    return {
+      superModelLoading: false, //保存权限弹出选择权限保存
+      selectIsSuperModel: false, //保存权限弹出选择权限
+      rolePermsWay: [], //查询角色权限集合
+      openLevel: "0",
+      loading: true,
+      treeLoading: true,
+      depTreeLoading: true,
+      submitPermLoading: false,
+      submitDepLoading: false,
+      searchKey: "",
+      sortColumn: "",
+      sortType: "desc",
+      modalType: 0, // 0 添加 1 编辑
+      roleModalVisible: false,
+      permModalVisible: false,
+      depModalVisible: false,
+      modalTitle: "",
+      roleForm: {
+        name: "",
+        description: "",
+      },
+      roleFormValidate: {
+        name: [
+          {required: true, message: "角色名称不能为空", trigger: "blur"},
+        ],
+      },
+      submitLoading: false,
+      selectList: [],
+      selectCount: 0,
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "角色名称",
+          key: "name",
+          minWidth: 150,
+        },
+        {
+          title: "备注",
+          key: "description",
+          minWidth: 150,
+          tooltip: true
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          width: 170,
+          sortable: true,
+          sortType: "desc",
+        },
+        {
+          title: "更新时间",
+          key: "updateTime",
+          width: 170,
+          sortable: true,
+        },
+        {
+          title: "最后操作人",
+          key: "createBy",
+          width: 150,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          fixed: "right",
+          width: 230,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "warning",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editPerm(params.row);
+                    },
+                  },
+                },
+                "菜单权限"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "info"
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [],
+      pageNumber: 1,
+      pageSize: 10,
+      total: 0,
+      permData: [],
+      editRolePermId: "",
+      selectAllFlag: false,
+      depData: [],
+      dataType: 0,
+      editDepartments: [],
+
+      saveRoleWay: [], //用户保存用户点击的菜单
+    };
+  },
+  methods: {
+    init() {
+      this.getRoleList();
+      // 获取所有菜单权限树
+      this.getPermList();
+    },
+
+    handleContextMenu(val) {
+      console.log(val);
+    },
+
+    renderContent(h, {root, node, data}) {
+      let icon = "";
+
+      if (data.level == 0) {
+        icon = "ios-navigate";
+      } else if (data.level == 1) {
+        icon = "md-list-box";
+      } else if (data.level == 2) {
+        icon = "md-list";
+      } else if (data.level == 3) {
+        icon = "md-radio-button-on";
+      } else {
+        icon = "md-radio-button-off";
+      }
+      return h(
+        "span",
+        {
+          style: {
+            display: "inline-block",
+            cursor: "pointer",
+          },
+          on: {
+            click: () => {
+              data.checked = !data.checked;
+            },
+          },
+        },
+        [
+          h("span", [
+            h("Icon", {
+              props: {
+                type: icon,
+                size: "16",
+              },
+              style: {
+                "margin-right": "8px",
+                "margin-bottom": "3px",
+              },
+            }),
+            h("span", data.title),
+            h(
+              "span",
+              {class: {tips: true}},
+              data.isSuper ? "操作权限" : "查看权限"
+            ),
+          ]),
+        ]
+      );
+    },
+    changePage(v) {
+      this.pageNumber = v;
+      this.getRoleList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.pageSize = v;
+      this.getRoleList();
+    },
+    changeSort(e) {
+      this.sortColumn = e.key;
+      this.sortType = e.order;
+      if (e.order == "normal") {
+        this.sortType = "";
+      }
+      this.getRoleList();
+    },
+
+    /**
+     * 查询所有角色
+     */
+    getRoleList() {
+      this.loading = true;
+      let params = {
+        pageNumber: this.pageNumber,
+        pageSize: this.pageSize,
+        sort: this.sortColumn,
+        order: this.sort,
+      };
+      getRoleList(params).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+
+    /**
+     * 查询菜单
+     */
+    getPermList() {
+      this.treeLoading = true;
+      getAllPermissionList().then((res) => {
+        if (res.success) {
+          this.deleteDisableNode(res.result);
+          this.permData = res.result;
+          this.treeLoading = false;
+        }
+        this.treeLoading = false;
+      });
+    },
+    // 递归标记禁用节点
+    deleteDisableNode(permData) {
+      let that = this;
+      permData.forEach(function (e) {
+        if (e.status == -1) {
+          e.title = "[已禁用] " + e.title;
+          e.disabled = true;
+        }
+        if (e.children && e.children.length > 0) {
+          that.deleteDisableNode(e.children);
+        }
+      });
+    },
+    cancelRole() {
+      this.roleModalVisible = false;
+    },
+    submitRole() {
+      this.$refs.roleForm.validate((valid) => {
+        if (valid) {
+          if (this.modalType == 0) {
+            // 添加
+            this.submitLoading = true;
+
+            addRole(this.roleForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getRoleList();
+                this.roleModalVisible = false;
+              }
+            });
+          } else {
+            this.submitLoading = true;
+            this.roleForm.roleId = this.roleForm.id;
+
+            editRole(this.roleForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getRoleList();
+                this.roleModalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+
+    /**
+     * 点击添加按钮
+     */
+    addRole() {
+      this.modalType = 0;
+      this.modalTitle = "添加角色";
+      this.$refs.roleForm.resetFields();
+      delete this.roleForm.id;
+      this.roleModalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑角色";
+      this.$refs.roleForm.resetFields();
+      // 转换null为""
+      for (let attr in v) {
+        if (v[attr] == null) {
+          v[attr] = "";
+        }
+      }
+      let str = JSON.stringify(v);
+      let roleInfo = JSON.parse(str);
+      this.roleForm = roleInfo;
+      this.roleModalVisible = true;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除角色 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          deleteRole(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getRoleList();
+            }
+          });
+        },
+      });
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          deleteRole(ids).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.clearSelectAll();
+              this.getRoleList();
+            }
+          });
+        },
+      });
+    },
+
+    // 菜单权限
+    async editPerm(v) {
+      if (this.treeLoading) {
+        this.$Message.warning("菜单权限数据加载中，请稍后点击查看");
+        return;
+      }
+      this.editRolePermId = v.id;
+      this.modalTitle = "分配 " + v.name + " 的菜单权限";
+      // 匹配勾选
+      let rolePerms;
+
+      // 当前角色的菜单权限
+
+      let res = await selectRoleMenu(v.id);
+      if (res.result) {
+        rolePerms = res.result;
+        this.rolePermsWay = res.result;
+      }
+
+      // 递归判断子节点
+      this.checkPermTree(this.permData, rolePerms);
+      console.warn(this.permData);
+      this.permModalVisible = true;
+    },
+    // 递归判断子节点
+    checkPermTree(permData, rolePerms) {
+      let that = this;
+
+      permData.forEach((p) => {
+        if (that.hasPerm(p, rolePerms) && p.status != -1) {
+          this.$set(p, "checked", true);
+        } else {
+          this.$set(p, "checked", false);
+        }
+        if (p.children && p.children.length > 0) {
+          that.checkPermTree(p.children, rolePerms);
+        }
+      });
+    },
+    // 判断角色拥有的权限节点勾选
+    hasPerm(p, rolePerms) {
+      console.log(p, rolePerms);
+      if (!rolePerms) return false;
+      let flag = false;
+      for (let i = 0; i < rolePerms.length; i++) {
+        if (p.id == rolePerms[i].menuId) {
+          this.$set(p, "isSuper", rolePerms[i].isSuper);
+          flag = true;
+          break;
+        }
+      }
+      if (flag) {
+        return true;
+      }
+      return false;
+    },
+
+    // 递归全选节点
+    selectedTreeAll(permData, select) {
+      let that = this;
+      permData.forEach(function (e) {
+        e.checked = select;
+        if (e.children && e.children.length > 0) {
+          that.selectedTreeAll(e.children, select);
+        }
+      });
+    },
+
+    /**分配菜单权限 */
+    submitPermEdit() {
+      this.saveRoleWay = [];
+
+      this.selectIsSuperModel = true; //打开选择权限
+
+      let selectedNodes = this.$refs.tree.getCheckedNodes();
+
+      let way = [];
+
+      selectedNodes.forEach((e) => {
+        console.log(e);
+        let perm = {
+          title: e.title,
+          isSuper: e.isSuper,
+          menuId: e.id,
+          roleId: this.editRolePermId,
+        };
+        way.push(perm);
+        this.saveRoleWay = way;
+      });
+
+    },
+
+    /**保存权限 */
+    saveRole() {
+      this.superModelLoading = true;
+      saveRoleMenu(this.editRolePermId, this.saveRoleWay).then((res) => {
+        this.superModelLoading = false;
+        if (res.success) {
+          this.$Message.success("操作成功");
+          // 标记重新获取菜单数据
+          this.$store.commit("setAdded", false);
+          util.initRouter(this);
+          this.getRoleList();
+          this.permModalVisible = false;
+        }
+      });
+    },
+
+    cancelPermEdit() {
+      this.permModalVisible = false;
+    },
+    loadData(item, callback) {
+      loadDepartment(item.id, {openDataFilter: false}).then((res) => {
+        if (res.success) {
+          res.result.forEach(function (e) {
+            e.selected = false;
+            if (e.isParent) {
+              e.loading = false;
+              e.children = [];
+            }
+            if (e.status == -1) {
+              e.title = "[已禁用] " + e.title;
+              e.disabled = true;
+            }
+          });
+          callback(res.result);
+        }
+      });
+    },
+
+    expandCheckDep(v) {
+      // 判断展开子节点
+      this.checkDepTree(v.children, this.editDepartments);
+    },
+    // 判断子节点
+    checkDepTree(depData, roleDepIds) {
+      let that = this;
+      depData.forEach(function (p) {
+        if (that.hasDepPerm(p, roleDepIds)) {
+          p.selected = true;
+        } else {
+          p.selected = false;
+        }
+      });
+    },
+
+    changeOpen(v) {
+      if (v == "0") {
+        this.permData.forEach((e) => {
+          e.expand = true;
+          if (e.children && e.children.length > 0) {
+            e.children.forEach((c) => {
+              c.expand = true;
+              if (c.children && c.children.length > 0) {
+                c.children.forEach(function (b) {
+                  b.expand = true;
+                });
+              }
+            });
+          }
+        });
+      } else if (v == "1") {
+        this.permData.forEach((e) => {
+          e.expand = false;
+          if (e.children && e.children.length > 0) {
+            e.children.forEach((c) => {
+              c.expand = false;
+              if (c.children && c.children.length > 0) {
+                c.children.forEach(function (b) {
+                  b.expand = false;
+                });
+              }
+            });
+          }
+        });
+      } else if (v == "2") {
+        this.permData.forEach((e) => {
+          e.expand = true;
+          if (e.children && e.children.length > 0) {
+            e.children.forEach((c) => {
+              c.expand = false;
+              if (c.children && c.children.length > 0) {
+                c.children.forEach(function (b) {
+                  b.expand = false;
+                });
+              }
+            });
+          }
+        });
+      } else if (v == "3") {
+        this.permData.forEach((e) => {
+          e.expand = true;
+          if (e.children && e.children.length > 0) {
+            e.children.forEach((c) => {
+              c.expand = true;
+              if (c.children && c.children.length > 0) {
+                c.children.forEach(function (b) {
+                  b.expand = false;
+                });
+              }
+            });
+          }
+        });
+      }
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
diff --git a/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue b/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
new file mode 100644
index 00000000..61886bb1
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
@@ -0,0 +1,180 @@
+<template>
+
+  <div class="layout">
+
+    <div class="row" v-if="client ==item.client" v-for="(item,index) in  formValidate" :key="index">
+      <div class="col">
+        <Card :padding="0">
+          <!-- app -->
+          <div class="icon-item" v-if="item.clientType== 'APP'">
+            <img class="icon" src="../../../../assets/setting/app.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if="item.clientType== 'PC'">
+            <!-- pc -->
+            <img class="icon" src="../../../../assets/setting/pc.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if="item.clientType== 'WECHAT_MP'">
+            <!-- 小程序 -->
+            <img class="icon" src="../../../../assets/setting/wechat_mp.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if=" item.clientType== 'H5'">
+            <!-- h5 -->
+            <img class="icon" src="../../../../assets/setting/h5.svg" alt="" srcset="">
+          </div>
+          <div class='pay-title'> {{way[item.clientType]}}</div>
+          <div>
+
+            <Divider orientation="left">登录设置</Divider>
+            <div class="pay-list">
+              <Form style="width:100%;" ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+                <FormItem label="appId" prop="appId">
+                  <Input @on-enter="setupSetting" class="label-appkey" v-model="item.appId" />
+                </FormItem>
+                <FormItem label="appKey" prop="appKey">
+                  <Input @on-enter="setupSetting" v-model="item.appKey" />
+                </FormItem>
+
+              </Form>
+              <Button @click="setupSetting">保存设置</Button>
+            </div>
+
+          </div>
+
+        </Card>
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "../setting/validate";
+import { getPaymentSupportForm } from "@/api/setting";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      way: {
+        APP: "移动应用端",
+        H5: "移动端",
+        WECHAT_MP: "小程序端",
+        PC: "PC端",
+      },
+      formValidate: {},
+      pay: "",
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      this.$Spin.show();
+      setTimeout(() => {
+        this.$Spin.hide();
+        setSetting(this.type, {
+          qqConnectSettingItemList: this.formValidate,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$Message.success("保存成功!");
+            this.$Modal.remove();
+          } else {
+            this.$Message.error("保存失败!");
+            this.$Modal.remove();
+          }
+        });
+      }, 3000);
+    },
+    // 实例化数据
+    async init() {
+      this.formValidate = JSON.parse(this.res).qqConnectSettingItemList;
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../setting/style.scss";
+.pay-title {
+  text-align: center;
+  margin: 10px 0;
+}
+
+.col {
+  width: 100%;
+}
+.layout {
+  padding: 20px;
+
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+.row {
+  width: 350px;
+  margin-right: 20px;
+  display: flex;
+  margin-bottom: 20px;
+  /deep/ .ivu-card-body {
+    padding: 0 16px !important;
+  }
+}
+
+.label-item {
+  display: flex;
+}
+.label-item {
+  display: flex;
+  align-items: center;
+}
+.pay-list {
+  display: flex;
+  justify-content: center;
+  padding-bottom: 10px;
+  flex-direction: column;
+  align-items: center;
+  /deep/ .ivu-btn {
+    width: 100px;
+  }
+}
+.icon-item {
+  width: 100%;
+  padding: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.ivu-form-item {
+  display: flex;
+
+  align-items: center;
+}
+.ivu-row {
+  width: 100%;
+}
+.icon {
+  width: 100px;
+  height: 100px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
new file mode 100644
index 00000000..c8f741eb
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
@@ -0,0 +1,178 @@
+<template>
+
+  <div class="layout">
+
+    <div class="row" v-if="client ==item.client" v-for="(item,index) in  formValidate" :key="index">
+      <div class="col">
+        <Card :padding="0">
+          <!-- app -->
+          <div class="icon-item" v-if="item.clientType== 'APP'">
+            <img class="icon" src="../../../../assets/setting/app.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if="item.clientType== 'PC'">
+            <!-- pc -->
+            <img class="icon" src="../../../../assets/setting/pc.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if="item.clientType== 'WECHAT_MP'">
+            <!-- 小程序 -->
+            <img class="icon" src="../../../../assets/setting/wechat_mp.svg" alt="" srcset="">
+          </div>
+          <div class="icon-item" v-if=" item.clientType== 'H5'">
+            <!-- h5 -->
+            <img class="icon" src="../../../../assets/setting/h5.svg" alt="" srcset="">
+          </div>
+          <div class='pay-title'> {{way[item.clientType]}}</div>
+          <div>
+
+            <Divider orientation="left">登录设置</Divider>
+            <div class="pay-list">
+              <Form style="width:100%;" ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+                <FormItem label="appId" prop="appId">
+                  <Input @on-enter="setupSetting" class="label-appkey" v-model="item.appId" />
+                </FormItem>
+                <FormItem label="appSecret" prop="appSecret">
+                  <Input @on-enter="setupSetting" v-model="item.appSecret" />
+                </FormItem>
+              </Form>
+                 <Button @click="setupSetting">保存设置</Button>
+            </div>
+          </div>
+
+        </Card>
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "../setting/validate";
+import { getPaymentSupportForm } from "@/api/setting";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      way: {
+        APP: "移动应用端",
+        H5: "移动端",
+        WECHAT_MP: "小程序端",
+        PC: "PC端",
+      },
+      formValidate: {},
+      pay: "",
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      this.$Spin.show();
+      setTimeout(() => {
+             this.$Spin.hide();
+        setSetting(this.type, {
+          wechatConnectSettingItems: this.formValidate,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.$Message.success("保存成功!");
+            this.$Modal.remove();
+          } else {
+            this.$Message.error("保存失败!");
+            this.$Modal.remove();
+          }
+        });
+      }, 3000);
+    },
+    // 实例化数据
+    async init() {
+      this.formValidate = JSON.parse(this.res).wechatConnectSettingItems;
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../setting/style.scss";
+.pay-title {
+  text-align: center;
+  margin: 10px 0;
+}
+
+.col {
+  width: 100%;
+}
+.layout {
+  padding: 20px;
+
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+.row {
+  width: 350px;
+  margin-right: 20px;
+  display: flex;
+  margin-bottom: 20px;
+  /deep/ .ivu-card-body {
+    padding: 0 16px !important;
+  }
+}
+
+.label-item {
+  display: flex;
+}
+.label-item {
+  display: flex;
+  align-items: center;
+}
+.pay-list {
+  display: flex;
+  justify-content: center;
+  padding-bottom: 10px;
+  flex-direction: column;
+  align-items: center;
+  /deep/ .ivu-btn {
+    width: 100px;
+  }
+}
+.icon-item {
+  width: 100%;
+  padding: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.ivu-form-item {
+  display: flex;
+
+  align-items: center;
+}
+.ivu-row {
+  width: 100%;
+}
+.icon {
+  width: 100px;
+  height: 100px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
new file mode 100644
index 00000000..5633e416
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="160" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="appId" prop="appId">
+        <Input class="w200" v-model="formValidate.appId" />
+      </FormItem>
+      <FormItem label="certPath" prop="certPath">
+        <Input  v-model="formValidate.certPath" />
+      </FormItem>
+      <FormItem label="alipayPublicCertPath" prop="alipayPublicCertPath">
+        <Input v-model="formValidate.alipayPublicCertPath" />
+      </FormItem>
+      <FormItem label="privateKey" class="label-item" prop="privateKey">
+        <Input v-model="formValidate.privateKey" />
+      </FormItem>
+      <FormItem label="rootCertPath" prop="rootCertPath">
+        <Input v-model="formValidate.rootCertPath" />
+      </FormItem>
+
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "../setting/validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {
+        accessKeyId: "",
+        accessKeySecret: "",
+        bucketName: "",
+        picLocation: "",
+        endPoint: "",
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../setting/style.scss";
+
+.label-item {
+  display: flex;
+}
+.w200 {
+  /deep/ .ivu-input {
+    width: 250px !important;
+    margin: 0 10px;
+  }
+}
+/deep/ .ivu-input {
+  width: 450px !important;
+  margin: 0 10px;
+}
+.ivu-input-wrapper {
+  width: 450px;
+  margin-right: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue b/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
new file mode 100644
index 00000000..3002a603
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="layout">
+    <div class="row" v-for="(client,clientIndex) in supportForm.clients" :key="clientIndex">
+
+      <div class="col" v-if="client ==item.client" v-for="(item,index) in  formValidate" :key="index">
+        <Card :padding="0">
+          <div>
+
+            <!-- app -->
+            <div class="icon-item" v-if="client ==item.client &&item.client== 'APP'">
+              <img class="icon" src="../../../../assets/setting/app.svg" alt="" srcset="">
+            </div>
+            <div class="icon-item" v-if="  client ==item.client &&  item.client== 'PC'">
+              <!-- pc -->
+              <img class="icon" src="../../../../assets/setting/pc.svg" alt="" srcset="">
+
+            </div>
+            <div class="icon-item" v-if="  client ==item.client &&  item.client== 'WECHAT_MP'">
+              <!-- 小程序 -->
+
+              <img class="icon" src="../../../../assets/setting/wechat_mp.svg" alt="" srcset="">
+            </div>
+
+            <div class="icon-item" v-if=" client ==item.client &&  item.client== 'H5'">
+              <!-- h5 -->
+
+              <img class="icon" src="../../../../assets/setting/h5.svg" alt="" srcset="">
+            </div>
+            <div class='pay-title' v-if=" client ==item.client "> {{way[item.client]}}</div>
+
+            <div v-if=" client ==item.client ">
+              <Divider orientation="left">支付设置</Divider>
+
+              <div class="pay-list">
+                <CheckboxGroup @on-change="handleChangePayType" v-model="item.supports">
+
+                  <Checkbox v-for="(support,i)  in supportForm.payments" :key="i" :label="support">
+
+                    {{payWay[support] || support}}
+
+                  </Checkbox>
+                </CheckboxGroup>
+              </div>
+            </div>
+
+          </div>
+        </Card>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "../setting/validate";
+import { getPaymentSupportForm } from "@/api/setting";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      way: {
+        APP: "移动应用端",
+        H5: "移动端",
+        WECHAT_MP: "小程序端",
+        PC: "PC端",
+      },
+      formValidate: {},
+      pay: "",
+      // key obj
+      payWay: {
+        ALIPAY: "支付宝支付",
+        WECHAT: "微信支付",
+        WALLET: "余额支付",
+      },
+      supportForm: "",
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    handleChangePayType(val) {
+      this.$Modal.confirm({
+        title: "修改支付设置",
+        content: "您是否修改此项？",
+        loading: true,
+        onOk: () => {
+          this.setupSetting();
+        },
+        onCancel: () => {
+          val.splice(val.length - 1, 1);
+        },
+      });
+    },
+
+    setupSetting() {
+      setSetting(this.type, { paymentSupportItems: this.formValidate }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.$Message.success("保存成功!");
+            this.$Modal.remove();
+          } else {
+            this.$Message.error("保存失败!");
+            this.$Modal.remove();
+          }
+        }
+      );
+    },
+    // 实例化数据
+    async init() {
+      this.formValidate = JSON.parse(this.res).paymentSupportItems;
+
+      console.log(this.formValidate);
+
+      await getPaymentSupportForm().then((res) => {
+        // res.result.payments = ["H5", "PC"];
+        this.supportForm = res.result;
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../setting/style.scss";
+.pay-title {
+  text-align: center;
+  margin: 10px 0;
+}
+.layout {
+  padding: 20px;
+
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+.row {
+  width: 300px;
+  margin-right: 20px;
+  display: flex;
+  margin-bottom: 20px;
+  /deep/ .ivu-card-body {
+    padding: 0 16px !important;
+  }
+}
+
+.label-item {
+  display: flex;
+}
+.label-item {
+  display: flex;
+  align-items: center;
+}
+.pay-list {
+  display: flex;
+  justify-content: center;
+  padding-bottom: 10px;
+}
+.icon-item {
+  width: 100%;
+  padding: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.ivu-form-item {
+  display: flex;
+
+  align-items: center;
+}
+.ivu-row {
+  width: 100%;
+}
+.icon {
+  width: 100px;
+  height: 100px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
new file mode 100644
index 00000000..731ee9ff
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="appId" prop="appId">
+        <Input class="w200" v-model="formValidate.appId" />
+      </FormItem>
+      <FormItem label="mchId" prop="mchId">
+        <Input class="w200" v-model="formValidate.mchId" />
+      </FormItem>
+      <FormItem label="apiKey3" prop="apiKey3">
+        <Input v-model="formValidate.apiKey3" />
+      </FormItem>
+      <FormItem label="apiclient_cert_p12" class="label-item" prop="apiclient_cert_p12">
+        <Input v-model="formValidate.apiclient_cert_p12" />
+      </FormItem>
+      <FormItem label="apiclient_cert_pem" prop="apiclient_cert_pem">
+        <Input v-model="formValidate.apiclient_cert_pem" />
+      </FormItem>
+      <FormItem label="apiclient_key" prop="apiclient_key">
+        <Input v-model="formValidate.apiclient_key" />
+      </FormItem>
+
+      <FormItem label="serialNumber" prop="serialNumber">
+        <Input v-model="formValidate.serialNumber" />
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "../setting/validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {
+        accessKeyId: "",
+        accessKeySecret: "",
+        bucketName: "",
+        picLocation: "",
+        endPoint: "",
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../setting/style.scss";
+
+.label-item {
+  display: flex;
+}
+.w200 {
+  /deep/ .ivu-input {
+    width: 250px !important;
+    margin: 0 10px;
+  }
+}
+/deep/ .ivu-input {
+  width: 450px !important;
+  margin: 0 10px;
+}
+.ivu-input-wrapper {
+  width: 450px;
+  margin-right: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/platformSetting.vue b/manager/src/views/sys/setting-manage/platformSetting.vue
new file mode 100644
index 00000000..7072090f
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/platformSetting.vue
@@ -0,0 +1,766 @@
+<template>
+  <div>
+    <Card>
+      <Tabs v-model="tabName" :animated="false" style="overflow: visible">
+        <TabPane label="基础设置" name="base">
+          <div style="display:flex;position:relative">
+            <Form
+                    ref="baseForm"
+                    :model="base"
+                    :label-width="140"
+                    label-position="right"
+                    :rules="baseValidate"
+            >
+              <FormItem label="网站名称" prop="siteName">
+                <Input type="text" v-model="base.siteName" placeholder="请输入网站名称" style="width: 350px"/>
+              </FormItem>
+              <FormItem label="ICP证书号" prop="icp">
+                <Input type="text" v-model="base.icp" placeholder="请输入ICP证书号"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="Logo" prop="logo">
+                <upload-pic-input v-model="base.logo" style="width: 350px"></upload-pic-input>
+              </FormItem>
+              <FormItem label="商家中心Logo" prop="sellerLogo">
+                <upload-pic-input v-model="base.sellerLogo" style="width: 350px"></upload-pic-input>
+              </FormItem>
+              <FormItem>
+                <Button type="primary" style="width: 100px;margin-right:5px" :loading="saveLoading"
+                        @click="saveBase">保存
+                </Button>
+              </FormItem>
+            </Form>
+            <Spin fix v-if="loading"></Spin>
+          </div>
+        </TabPane>
+        <TabPane label="积分设置" name="point">
+          <div style="display:flex;position:relative">
+            <Form
+                    ref="pointForm"
+                    :model="point"
+                    :label-width="140"
+                    label-position="right"
+                    :rules="pointValidate"
+            >
+              <FormItem label="注册" prop="register">
+                <Input type="text" v-model="point.register" placeholder="请输入注册赠送积分"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="登陆" prop="login">
+                <Input type="text" v-model="point.login" placeholder="请输入登陆赠送积分"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="消费一元" prop="money">
+                <Input type="text" v-model="point.money" placeholder="请输入积分"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem>
+                <Button type="primary" style="width: 100px;margin-right:5px" :loading="saveLoading"
+                        @click="savePoint">保存
+                </Button>
+              </FormItem>
+            </Form>
+            <Spin fix v-if="loading"></Spin>
+          </div>
+        </TabPane>
+        <TabPane label="订单设置" name="order">
+          <div style="display:flex;position:relative">
+            <Form
+                    ref="orderForm"
+                    :model="order"
+                    :label-width="140"
+                    label-position="right"
+                    :rules="orderValidate"
+            >
+              <FormItem label="自动取消 分钟" prop="autoCancel">
+                <Input type="text" v-model="order.autoCancel" placeholder="请输入自动取消分钟"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="自动收货 天" prop="autoReceive">
+                <Input type="text" v-model="order.autoReceive" placeholder="请输入自动收货天数"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="自动收货 天" prop="autoComplete">
+                <Input type="text" v-model="order.autoComplete" placeholder="请输入自动完成天数"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem>
+                <Button type="primary" style="width: 100px;margin-right:5px" :loading="saveLoading"
+                        @click="saveOrder">保存
+                </Button>
+              </FormItem>
+            </Form>
+            <Spin fix v-if="loading"></Spin>
+          </div>
+        </TabPane>
+        <TabPane label="商品设置" name="goods">
+          <div style="display:flex;position:relative">
+            <Form
+                    ref="goodsForm"
+                    :model="goods"
+                    :label-width="140"
+                    label-position="right"
+                    :rules="goodsValidate"
+            >
+              <FormItem label="是否开启商品审核" prop="goodsCheck">
+                <RadioGroup v-model="goods.goodsCheck">
+                  <Radio label="OPEN">开启</Radio>
+                  <Radio label="CLOSE">关闭</Radio>
+                </RadioGroup>
+              </FormItem>
+              <FormItem label="商品页面小图宽度" prop="smallPictureWidth">
+                <Input type="text" v-model="goods.smallPictureWidth" placeholder="商品页面小图宽度"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="商品页面小图高度" prop="smallPictureHeight">
+                <Input type="text" v-model="goods.smallPictureHeight" placeholder="商品页面小图高度"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="缩略图宽度" prop="abbreviationPictureWidth">
+                <Input type="text" v-model="goods.abbreviationPictureWidth" placeholder="缩略图宽度"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="缩略图高度" prop="abbreviationPictureHeight">
+                <Input type="text" v-model="goods.abbreviationPictureHeight" placeholder="缩略图高度"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="原图宽" prop="originalPictureWidth">
+                <Input type="text" v-model="goods.originalPictureWidth" placeholder="原图宽"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem label="原图高" prop="originalPictureHeight">
+                <Input type="text" v-model="goods.originalPictureHeight" placeholder="原图高"
+                       style="width: 350px"/>
+              </FormItem>
+              <FormItem>
+                <Button type="primary" style="width: 100px;margin-right:5px" :loading="saveLoading"
+                        @click="saveGoods">保存
+                </Button>
+              </FormItem>
+            </Form>
+            <Spin fix v-if="loading"></Spin>
+          </div>
+        </TabPane>
+        <TabPane label="信任登陆" name="trust">
+          <div>
+            <Row style="background:#eee;padding:10px;" :gutter="16">
+              <Col span="12">
+                <Card>
+                  <p slot="title">微信信任登陆</p>
+                  <Form
+                          ref="wechatForm"
+                          :model="wechat"
+                          :label-width="140"
+                          label-position="right"
+                  >
+                    <FormItem label="appId" prop="appId">
+                      <Input type="text" v-model="wechat.appId" placeholder="appId"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="appSecret" prop="appSecret">
+                      <Input type="text" v-model="wechat.appSecret" placeholder="appSecret"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackUrl" prop="callbackUrl">
+                      <Input type="text" v-model="wechat.callbackUrl" placeholder="callbackUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackLoginUrl" prop="callbackLoginUrl">
+                      <Input type="text" v-model="wechat.callbackLoginUrl"
+                             placeholder="callbackLoginUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackBindUrl" prop="callbackBindUrl">
+                      <Input type="text" v-model="wechat.callbackBindUrl"
+                             placeholder="callbackBindUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem>
+                      <Button type="primary" style="width: 100px;margin-right:5px"
+                              :loading="saveLoading"
+                              @click="saveWechat">保存
+                      </Button>
+                    </FormItem>
+                  </Form>
+                  <Spin fix v-if="loading"></Spin>
+                </Card>
+              </Col>
+              <Col span="12">
+                <Card>
+                  <p slot="title">QQ信任登陆</p>
+                  <Form
+                          ref="qqForm"
+                          :model="qq"
+                          :label-width="140"
+                          label-position="right"
+                  >
+                    <FormItem label="appId" prop="appId">
+                      <Input type="text" v-model="qq.appId" placeholder="appId"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="appKey" prop="appKey">
+                      <Input type="text" v-model="qq.appKey" placeholder="appKey"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackUrl" prop="callbackUrl">
+                      <Input type="text" v-model="qq.callbackUrl" placeholder="callbackUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackLoginUrl" prop="callbackLoginUrl">
+                      <Input type="text" v-model="qq.callbackLoginUrl"
+                             placeholder="callbackLoginUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackBindUrl" prop="callbackBindUrl">
+                      <Input type="text" v-model="qq.callbackBindUrl"
+                             placeholder="callbackBindUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem>
+                      <Button type="primary" style="width: 100px;margin-right:5px"
+                              :loading="saveLoading"
+                              @click="saveQQ">保存
+                      </Button>
+                    </FormItem>
+                  </Form>
+                  <Spin fix v-if="loading"></Spin>
+                </Card>
+              </Col>
+            </Row>
+            <Row style="background:#eee;padding:10px;" :gutter="16">
+              <Col span="12">
+                <Card>
+                  <p slot="title">微博信任登陆</p>
+                  <Form
+                          ref="weiboForm"
+                          :model="weibo"
+                          :label-width="140"
+                          label-position="right"
+                  >
+                    <FormItem label="appKey" prop="appKey">
+                      <Input type="text" v-model="weibo.appKey" placeholder="appKey"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="appSecret" prop="appSecret">
+                      <Input type="text" v-model="weibo.appSecret" placeholder="appSecret"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackUrl" prop="callbackUrl">
+                      <Input type="text" v-model="weibo.callbackUrl" placeholder="callbackUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackLoginUrl" prop="callbackLoginUrl">
+                      <Input type="text" v-model="weibo.callbackLoginUrl"
+                             placeholder="callbackLoginUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackBindUrl" prop="callbackBindUrl">
+                      <Input type="text" v-model="weibo.callbackBindUrl"
+                             placeholder="callbackBindUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem>
+                      <Button type="primary" style="width: 100px;margin-right:5px"
+                              :loading="saveLoading"
+                              @click="saveWeibo">保存
+                      </Button>
+                    </FormItem>
+                  </Form>
+                  <Spin fix v-if="loading"></Spin>
+                </Card>
+              </Col>
+              <Col span="12">
+                <Card>
+                  <p slot="title">支付宝信任登陆</p>
+                  <Form
+                          ref="alipayForm"
+                          :model="alipay"
+                          :label-width="140"
+                          label-position="right"
+                  >
+                    <FormItem label="appId" prop="appId">
+                      <Input type="text" v-model="alipay.appId" placeholder="appId"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="appSecret" prop="appSecret">
+                      <Input type="text" v-model="alipay.appSecret" placeholder="appSecret"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackUrl" prop="callbackUrl">
+                      <Input type="text" v-model="alipay.callbackUrl" placeholder="callbackUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackLoginUrl" prop="callbackLoginUrl">
+                      <Input type="text" v-model="alipay.callbackLoginUrl"
+                             placeholder="callbackLoginUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem label="callbackBindUrl" prop="callbackBindUrl">
+                      <Input type="text" v-model="alipay.callbackBindUrl"
+                             placeholder="callbackBindUrl"
+                             style="width: 350px"/>
+                    </FormItem>
+                    <FormItem>
+                      <Button type="primary" style="width: 100px;margin-right:5px"
+                              :loading="saveLoading"
+                              @click="saveAlipay">保存
+                      </Button>
+                    </FormItem>
+                  </Form>
+                  <Spin fix v-if="loading"></Spin>
+                </Card>
+              </Col>
+            </Row>
+            <Spin fix v-if="loading"></Spin>
+          </div>
+        </TabPane>
+      </Tabs>
+    </Card>
+  </div>
+</template>
+
+<script>
+  import {
+    getParams,
+    editParams
+  } from "@/api/platform.js";
+
+  import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+  import {regular} from '@/utils'
+
+  export default {
+    name: "setting-manage",
+    components: {
+      uploadPicInput
+    },
+    data() {
+      return {
+        tabName: "base",
+        loading: false, // 表单加载状态
+        saveLoading: false,
+        base: {
+          siteName: "",
+          icp: "",
+          logo: "",
+          sellerLogo: "",
+        },
+        point: {
+          register: "",
+          login: "",
+          money: ""
+        },
+        order: {
+          autoCancel: "",
+          autoReceive: "",
+          autoComplete: ""
+        },
+        goods: {
+          goodsCheck: "OPEN",
+          smallPictureWidth: "",
+          smallPictureHeight: "",
+          abbreviationPictureWidth: "",
+          abbreviationPictureHeight: "",
+          originalPictureWidth: "",
+          originalPictureHeight: ""
+        },
+        wechat: {
+          appId: "",
+          appSecret: "",
+          callbackUrl: "",
+          callbackLoginUrl: "",
+          callbackBindUrl: ""
+        },
+        qq: {
+          appId: "",
+          appKey: "",
+          callbackUrl: "",
+          callbackLoginUrl: "",
+          callbackBindUrl: ""
+        },
+        weibo: {
+          appKey: "",
+          appSecret: "",
+          callbackUrl: "",
+          callbackLoginUrl: "",
+          callbackBindUrl: ""
+        },
+        alipay: {
+          appId: "",
+          appSecret: "",
+          callbackUrl: "",
+          callbackLoginUrl: "",
+          callbackBindUrl: ""
+        },
+        baseValidate: {
+          // 表单验证规则
+          siteName: [{required: true, message: "不能为空", trigger: "blur"}],
+          icp: [{required: true, message: "不能为空", trigger: "blur"}],
+          logo: [{required: true, message: "不能为空", trigger: "blur"}],
+          sellerLogo: [{required: true, message: "不能为空", trigger: "blur"}]
+        },
+        pointValidate: {
+          // 表单验证规则
+          register: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          login: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          money: [
+            {
+              required: true,
+              validator: (rule, value, callback) => {
+                if (!regular.integer.test(value)) {
+                  callback(new Error('请输入正整数，且不为零！'))
+                } else {
+                  callback()
+                }
+              },
+              trigger: 'blur'
+            }]
+        },
+        orderValidate: {
+          // 表单验证规则
+          autoCancel: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          autoReceive: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          autoComplete: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }]
+        },
+        goodsValidate: {
+          smallPictureWidth: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          smallPictureHeight: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          abbreviationPictureWidth: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          abbreviationPictureHeight: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          originalPictureWidth: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }],
+          originalPictureHeight: [{
+            required: true,
+            validator: (rule, value, callback) => {
+              if (!regular.integer.test(value)) {
+                callback(new Error('请输入正整数，且不为零！'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }]
+        }
+      };
+    },
+    methods: {
+      init() {
+        this.initBase();
+        this.initPoint();
+        this.initOrder();
+        this.initGoods();
+        this.initWechat();
+        this.initQQ();
+        this.initWeibo();
+        this.initAlipay();
+      },
+      initBase() {
+        this.loading = true;
+        getParams('base').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.base = res.result
+            }
+          }
+        });
+      },
+      initPoint() {
+        this.loading = true;
+        getParams('point').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.point = res.result
+            }
+          }
+        });
+      },
+      initOrder() {
+        this.loading = true;
+        getParams('order').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.order = res.result
+            }
+          }
+        });
+      },
+      initGoods() {
+        this.loading = true;
+        getParams('goods').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.goods = res.result
+            }
+          }
+        });
+      },
+      initWeibo() {
+        this.loading = true;
+        getParams('weibo').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.weibo = res.result
+            }
+          }
+        });
+      },
+      initWechat() {
+        this.loading = true;
+        getParams('wechat').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.wechat = res.result
+            }
+          }
+        });
+      },
+      initQQ() {
+        this.loading = true;
+        getParams('qq').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.qq = res.result
+            }
+          }
+        });
+      },
+      initAlipay() {
+        this.loading = true;
+        getParams('alipay').then(res => {
+          if (res.success) {
+            this.loading = false;
+            if (res.result) {
+              this.alipay = res.result
+            }
+          }
+        });
+      },
+      saveBase() {
+        this.$refs.baseForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.base.id = 'base'
+            editParams(this.base, 'base').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      savePoint() {
+        this.$refs.pointForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.point.id = 'point'
+            editParams(this.point, 'point').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveOrder() {
+        this.$refs.orderForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.order.id = 'order'
+            editParams(this.order, 'order').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveGoods() {
+        this.$refs.goodsForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.goods.id = 'goods'
+            editParams(this.goods, 'goods').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveWechat() {
+        this.$refs.wechatForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.wechat.id = 'wechat'
+            editParams(this.wechat, 'wechat').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveQQ() {
+        this.$refs.qqForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.qq.id = 'qq'
+            editParams(this.qq, 'qq').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveWeibo() {
+        this.$refs.wechatForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.weibo.id = 'weibo'
+            editParams(this.weibo, 'weibo').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      },
+      saveAlipay() {
+        this.$refs.alipayForm.validate(valid => {
+          if (valid) {
+            this.saveLoading = true;
+            this.alipay.id = 'alipay'
+            editParams(this.alipay, 'alipay').then(res => {
+              this.saveLoading = false;
+              if (res.success) {
+                this.$Message.success("保存成功");
+              }
+            });
+          }
+        });
+      }
+    },
+    mounted() {
+      let name = this.$route.query.name;
+      if (name) {
+        this.tabName = name;
+      }
+      this.init();
+    }
+  };
+
+</script>
\ No newline at end of file
diff --git a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
new file mode 100644
index 00000000..8cd8bd4e
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+
+      <FormItem label="站点名称" prop="siteName">
+        <Input v-model="formValidate.siteName" />
+      </FormItem>
+      <FormItem label="icp" prop="icp">
+
+        <Input v-model="formValidate.icp" />
+      </FormItem>
+
+      <FormItem label="后台Logo" prop="domainLogo">
+        <div class="label-item-upload">
+
+          <img v-if="formValidate.domainLogo" class="img" :src="formValidate.domainLogo" />
+          <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
+          <Button @click="onClickImg('domainLogo')">选择图片</Button>
+        </div>
+      </FormItem>
+      <FormItem label="买家端Logo" prop="buyerSideLogo">
+        <div class="label-item-upload">
+          <img v-if="formValidate.buyerSideLogo" class="img" :src="formValidate.buyerSideLogo" />
+          <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
+          <Button @click="onClickImg('buyerSideLogo')">选择图片</Button>
+        </div>
+      </FormItem>
+      <FormItem label="商家端Logo" prop="sellerSideLogo">
+        <div class="label-item-upload">
+          <img v-if="formValidate.sellerSideLogo" class="img" :src="formValidate.sellerSideLogo" />
+          <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
+          <Button @click="onClickImg('sellerSideLogo')">选择图片</Button>
+        </div>
+      </FormItem>
+
+      <FormItem label="站点地址" prop="staticPageAddress">
+        <Input v-model="formValidate.staticPageAddress" />
+      </FormItem>
+      <FormItem label="wap站点地址" prop="staticPageWapAddress">
+        <Input v-model="formValidate.staticPageWapAddress" />
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+    <Modal width="1200px" v-model="picModelFlag">
+      <ossManage @callback="callbackSelected" ref="ossManage" />
+    </Modal>
+
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+import ossManage from "@/views/sys/oss-manage/ossManage";
+export default {
+  title: "基础设置",
+  props: ["res", "type"],
+  components: {
+    ossManage,
+  },
+  data() {
+    return {
+      handleSubmit,
+
+      picModelFlag: false,
+      formValidate: {
+        buyerSideLogo: "",
+        domainLogo: "",
+        icp: "",
+        sellerSideLogo: "",
+        siteName: "",
+        staticPageAddress: "",
+        staticPageWapAddress: "",
+      },
+      selected: "",
+      ruleValidate: {},
+    };
+  },
+  created() {
+    console.log(this.type);
+    this.init();
+  },
+  methods: {
+    // 点击图片
+    onClickImg(item) {
+      this.selected = item;
+      this.$refs.ossManage.selectImage = true;
+      this.picModelFlag = true;
+    },
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+    callbackSelected(val) {
+      this.picModelFlag = false;
+      this.formValidate[this.selected] = val.url;
+      console.log(val);
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+
+
+    /**添加必填项 */
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.res).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+.label-item {
+  display: flex;
+  > .ivu-input {
+    width: 200px;
+    margin: 0 10px;
+  }
+}
+.label-item-upload {
+  display: flex;
+  align-items: flex-end;
+  img {
+    margin-right: 10px;
+    width: 100px;
+    height: 100px;
+  }
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/EMAIL_SETTING.vue b/manager/src/views/sys/setting-manage/setting/EMAIL_SETTING.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
new file mode 100644
index 00000000..5aa162f8
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="商品审核" prop="goodsCheck">
+        <RadioGroup v-model="formValidate.goodsCheck">
+          <Radio label="true">开启</Radio>
+          <Radio label="false">关闭</Radio>
+
+        </RadioGroup>
+      </FormItem>
+      <div class="label-item">
+        <FormItem label="小图宽" prop="smallPictureWidth">
+          <Input type="number" v-model="formValidate.smallPictureWidth">
+          <span slot="prepend">宽</span>
+          <span slot="append">px</span>
+          </Input>
+
+        </FormItem>
+        <FormItem label="小图高" class="label-item" prop="smallPictureHeight">
+          <Input type="number" v-model="formValidate.smallPictureHeight">
+          <span slot="prepend">高</span>
+          <span slot="append">px</span>
+          </Input>
+        </FormItem>
+      </div>
+      <div class="label-item">
+        <FormItem class="label-item" label="缩略图宽" prop="abbreviationPictureWidth">
+          <Input type="number" v-model="formValidate.abbreviationPictureWidth">
+          <span slot="prepend">宽</span>
+          <span slot="append">px</span>
+          </Input>
+
+        </FormItem>
+        <FormItem class="label-item" label="缩略图高" prop="abbreviationPictureHeight">
+          <Input type="number" v-model="formValidate.abbreviationPictureHeight">
+          <span slot="prepend">高</span>
+          <span slot="append">px</span>
+          </Input>
+        </FormItem>
+      </div>
+      <div class="label-item">
+        <FormItem class="label-item" label="原图宽高" prop="originalPictureWidth">
+          <Input type="number" v-model="formValidate.originalPictureWidth">
+          <span slot="prepend">宽</span>
+          <span slot="append">px</span>
+          </Input>
+
+        </FormItem>
+        <FormItem class="label-item" label="原图宽高" prop="originalPictureHeight">
+          <Input type="number" v-model="formValidate.originalPictureHeight">
+          <span slot="prepend">高</span>
+          <span slot="append">px</span>
+          </Input>
+        </FormItem>
+      </div>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  props: ["res", "type"],
+  data() {
+    return {
+      formValidate: {
+        goodsCheck: 1,
+        smallPictureHeight: "0",
+        smallPictureWidth: "0",
+        abbreviationPictureWidth: "0",
+        abbreviationPictureHeight: "0",
+        originalPictureWidth: "0",
+        originalPictureHeight: "0",
+      },
+      ruleValidate: {},
+    };
+  },
+  watch: {
+    res: {
+      handler() {},
+      immediate: true,
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+       if( handleSubmit(that, name )){
+        this.setupSetting()
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      Object.keys(this.res).map((item) => {
+        this.res[item] += "";
+      });
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+           {
+            validator: (rule, value, callback) => {
+              if (value < 0) {
+                callback(new Error("不能输入负数！"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ];
+      });
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+.label-item {
+  display: flex;
+}
+/deep/ .ivu-input {
+  width: 100px !important;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue b/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue
new file mode 100644
index 00000000..fe736210
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="企业id" prop="ebusinessID">
+        <Input v-model="formValidate.ebusinessID" />
+      </FormItem>
+      <FormItem label="密钥" prop="appKey">
+        <Input class="label-appkey" v-model="formValidate.appKey" />
+      </FormItem>
+      <FormItem label="api地址" prop="reqURL">
+        <Input v-model="formValidate.reqURL" />
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: { ebusinessID: "", reqURL: "", appKey: "" },
+    };
+  },
+  props: ["res",'type'],
+  watch: {
+    res: {
+      handler() {},
+      immediate: true,
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+       if( handleSubmit(that, name )){
+        this.setupSetting()
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+ this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+.label-item {
+  display: flex;
+  > .ivu-input {
+    width: 200px;
+    margin: 0 10px;
+  }
+}
+.label-appkey {
+  width: 300px !important;
+  /deep/ input {
+    width: 300px !important;
+  }
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
new file mode 100644
index 00000000..ccc35a34
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+
+      <FormItem label="订单自动取消" prop="autoCancel">
+        <Input type='number' v-model="formValidate.autoCancel">
+        <span slot="append">分</span>
+        </Input>
+      </FormItem>
+
+      <FormItem label="订单自动收货" class="label-item" prop="autoReceive">
+        <Input type='number' v-model="formValidate.autoReceive">
+        <span slot="append">天</span>
+        </Input>
+
+      </FormItem>
+      <FormItem label="订单自动完成" prop="autoComplete">
+        <Input type='number' v-model="formValidate.autoComplete">
+        <span slot="append">天</span>
+        </Input>
+
+      </FormItem>
+
+      <FormItem label="自动评价" prop="autoEvaluation">
+        <Input type='number' v-model="formValidate.autoEvaluation">
+        <span slot="append">天</span>
+        </Input>
+
+      </FormItem>
+      <FormItem label="售后自动取消" prop="autoCancelAfterSale">
+        <Input type='number' v-model="formValidate.autoCancelAfterSale">
+        <span slot="append">天</span>
+        </Input>
+
+      </FormItem>
+
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {
+        autoCancel: "",
+        autoComplete: "",
+        autoEvaluation: "",
+        autoReceive: "",
+        autoCancelAfterSale: "",
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+  Object.keys(this.res).map((item) => {
+        this.res[item] += "";
+      });
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value < 0) {
+                callback(new Error("不能输入负数！"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+.label-item {
+  display: flex;
+}
+.ivu-input-wrapper {
+  width: 100px;
+  margin-right: 10px;
+}
+/deep/ .ivu-input {
+  width: 100px !important;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
new file mode 100644
index 00000000..d91df578
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="endPoint" prop="endPoint">
+        <Input v-model="formValidate.endPoint" />
+      </FormItem>
+      <FormItem label="bucketName" class="label-item" prop="bucketName">
+        <Input v-model="formValidate.bucketName" />
+      </FormItem>
+      <FormItem label="picLocation" prop="bucketName">
+        <Input v-model="formValidate.picLocation" />
+      </FormItem>
+      <FormItem label="accessKeyId" prop="accessKeyId">
+        <Input v-model="formValidate.accessKeyId" />
+      </FormItem>
+      <FormItem label="accessKeySecret" prop="accessKeySecret">
+        <Input v-model="formValidate.accessKeySecret" />
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {
+        accessKeyId: "",
+        accessKeySecret: "",
+        bucketName: "",
+        picLocation: "",
+        endPoint: "",
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+       if( handleSubmit(that, name )){
+        this.setupSetting()
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+.label-item {
+  display: flex;
+}
+/deep/ .ivu-input {
+  width: 300px !important;
+  margin: 0 10px;
+}
+.ivu-input-wrapper {
+  width: 300px;
+  margin-right: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
new file mode 100644
index 00000000..254a77ac
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="积分比例" prop="money">
+        <Input type="number" v-model="formValidate.money">
+        <span slot="prepend">1积分=</span>
+        <span slot="append">人民币</span>
+        </Input>
+
+      </FormItem>
+
+      <FormItem label="注册账号" prop="register">
+        <Input type="number" v-model="formValidate.register">
+        <span slot="append">积分</span>
+        </Input>
+      </FormItem>
+      <FormItem label="登录" class="label-item" prop="login">
+        <Input type="number" v-model="formValidate.login">
+
+        <span slot="append">积分</span>
+        </Input>
+
+      </FormItem>
+
+      <FormItem label="每日签到积分" prop="signIn">
+        <Input type="number" v-model="formValidate.signIn">
+        <span slot="append">积分</span>
+        </Input>
+
+      </FormItem>
+      <FormItem label="订单评价赠送积分" prop="comment">
+        <Input type="number" v-model="formValidate.comment">
+        <span slot="append">积分</span>
+        </Input>
+
+      </FormItem>
+
+      <FormItem class="label-item" v-for="(point,index) in  formValidate.pointSettingItems" :key="index" :label="'签到设置'+(index+1)">
+        <div class="label-item">
+
+          <InputNumber :min="1" v-model="point.day" :formatter="value => `签到${value}天`" :parser="value => value.replace('天', '') && value.replace('签到', '')"></InputNumber>
+
+          <InputNumber :min="0" :formatter="value => `赠送${value}积分`" :parser="value => value.replace('积分', '') && value.replace('赠送', '')" v-model="point.point"></InputNumber>
+
+          <Button ghost type="error" @click="delSign(point,index)">删除</Button>
+        </div>
+
+      </FormItem>
+      <FormItem label="操作：">
+        <Button @click="addSign">新增签到</Button>
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+      </div>
+    </Form>
+  </div>
+</template>
+
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {},
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting();
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    delSign(item, index) {
+      this.formValidate.pointSettingItems.splice(index, 1);
+    },
+    addSign() {
+      if (this.formValidate.pointSettingItems.length >= 4) {
+        this.$Message.error({
+          content: "最多设置4项签到设置",
+        });
+        return false;
+      }
+      this.formValidate.pointSettingItems.push({
+        point: "0",
+        day:
+          this.formValidate.pointSettingItems[
+            this.formValidate.pointSettingItems.length - 1
+          ].day + 1,
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+      Object.keys(this.res).map((item) => {
+        if (item == "pointSettingItems") {
+          return false;
+        }
+        this.res[item] += "";
+      });
+
+      this.$set(this, "formValidate", { ...this.res });
+
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value < 0) {
+                callback(new Error("不能输入负数！"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+
+.label-item {
+  display: flex;
+
+  > .ivu-input-number {
+    width: 100px;
+    margin-right: 5px;
+  }
+  > .ivu-input-number:nth-last-of-type(1) {
+    width: 150px;
+    margin-right: 5px;
+  }
+  > .ivu-input {
+    width: 100px;
+    margin: 0 10px;
+  }
+}
+/deep/ .ivu-input {
+  width: 70px !important;
+}
+.ivu-input-wrapper {
+  width: 70px;
+  margin-right: 10px;
+}
+.label-btns {
+  /deep/ .ivu-btn {
+    margin-right: 10px;
+  }
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
new file mode 100644
index 00000000..e330688f
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="accessKeyId" prop="accessKeyId">
+        <Input v-model="formValidate.accessKeyId" />
+      </FormItem>
+      <FormItem label="accessSecret" prop="accessSecret">
+        <Input v-model="formValidate.accessSecret" />
+      </FormItem>
+      <FormItem label="regionId" prop="regionId">
+        <Input v-model="formValidate.regionId" />
+      </FormItem>
+      <FormItem label="signName" prop="signName">
+        <Input v-model="formValidate.signName" />
+      </FormItem>
+
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      ruleValidate: {},
+      formValidate: {
+        accessKeyId: "",
+        regionId: "",
+        picLocation: "",
+        accessSecret: "",
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    submit(name) {
+      let that = this;
+       if( handleSubmit(that, name )){
+        this.setupSetting()
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", { ...this.res });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+.label-item {
+  display: flex;
+}
+/deep/ .ivu-input {
+  width: 300px !important;
+  margin: 0 10px;
+}
+.ivu-input-wrapper {
+  width: 300px;
+  margin-right: 10px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
new file mode 100644
index 00000000..2461b589
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="layout">
+
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="提现审核是否开启">
+        <i-switch v-model="formValidate.apply" style="margin-top:7px;"><span slot="open">开</span>
+          <span slot="close">关</span>
+        </i-switch>
+
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting } from "@/api/index";
+import { handleSubmit } from "./validate";
+export default {
+  data() {
+    return {
+      formValidate: {
+        apply: true,
+      },
+
+      switchTitle: "提现审核是否开启",
+    };
+  },
+  created() {
+    this.init();
+  },
+  props: ["res", "type"],
+  methods: {
+    submit(name) {
+      let that = this;
+       if( handleSubmit(that, name )){
+        this.setupSetting()
+      }
+    },
+
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+      this.$set(this, "formValidate", { ...this.res });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+/deep/ .ivu-form-item-content{
+  align-items: center;
+  paddinig-bottom: 5px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/setting/style.scss b/manager/src/views/sys/setting-manage/setting/style.scss
new file mode 100644
index 00000000..9994b8af
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/style.scss
@@ -0,0 +1,22 @@
+/deep/ .ivu-input{
+  width: 200px !important;
+}
+
+.label-btns{
+  margin-left: 150px;
+}
+
+.ivu-form-item{
+  padding: 10px 0;
+}
+
+
+.ivu-input-wrapper {
+  width: 150px;
+  margin-right: 10px;
+}
+
+/deep/ .ivu-form-item-content {
+  margin-left: 0 !important;
+  display: flex;
+}
diff --git a/manager/src/views/sys/setting-manage/setting/validate.js b/manager/src/views/sys/setting-manage/setting/validate.js
new file mode 100644
index 00000000..3d0e7754
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/setting/validate.js
@@ -0,0 +1,23 @@
+//表单中必填
+export function validateRequired(rule, value, callback) {
+  if (value != void 0 || value != null) {
+    callback();
+  } else {
+    return callback(new Error("必填项不能为空"));
+  }
+}
+
+// 验证必填项
+export function handleSubmit(that, name) {
+  let flag = false;
+  that.$refs[name].validate(valid => {
+    if (valid) {
+      flag = true;
+      return flag;
+    } else {
+      that.$Message.error("请正确填写内容!");
+      return flag;
+    }
+  });
+  return flag
+}
diff --git a/manager/src/views/sys/setting-manage/settingManage.vue b/manager/src/views/sys/setting-manage/settingManage.vue
new file mode 100644
index 00000000..95a59141
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/settingManage.vue
@@ -0,0 +1,126 @@
+
+<template>
+  <Card v-if="show">
+    <Tabs v-model="selected" @on-click="clickTab">
+      <TabPane :label="tabItem.name" :name="tabItem.type" v-for="(tabItem, tabIndex) in tabWay" :key="tabIndex">
+        <component v-if="settingData" :res="settingData" :type="selected"
+                   :is="templateSetting[tabItem.type]"></component>
+      </TabPane>
+    </Tabs>
+  </Card>
+</template>
+<script>
+import {getSetting} from "@/api/index.js";
+import templateSetting from "./template";
+
+export default {
+  data() {
+    return {
+      templateSetting,
+      selected: "",
+      settingData: "",
+      show: true,
+      setting: [
+        //基础配置
+        {
+          type: "BASE_SETTING",
+          name: "基础配置",
+        },
+        //商品设置
+        {
+          type: "GOODS_SETTING",
+          name: "商品设置",
+        },
+        //  快递鸟设置
+        {
+          type: "KUAIDI_SETTING",
+          name: "快递鸟设置",
+        },
+        //订单配置
+        {
+          type: "ORDER_SETTING",
+          name: "订单配置",
+        },
+        //阿里OSS配置
+        {
+          type: "OSS_SETTING",
+          name: "阿里OSS配置",
+        },
+        //阿里短信配置
+        {
+          type: "SMS_SETTING",
+          name: "阿里短信配置",
+        },
+        //积分设置
+        {type: "POINT_SETTING", name: "积分设置"},
+        {
+          type: "WITHDRAWAL_SETTING",
+          name: "提现设置",
+        },
+      ],
+      authLogin: [
+        // 微信设置
+        {type: "WECHAT_CONNECT", name: "微信设置"},
+        // QQ设置
+        {type: "QQ_CONNECT", name: "QQ设置"},
+        //微博联合登陆
+        // {type: "WEIBO_CONNECT", name: "微博联合登陆"},
+        // //支付宝配置
+        // {type: "ALIPAY_CONNECT", name: "支付宝配置"},
+      ],
+      pay: [
+        //支付宝支付设置
+        {type: "PAYMENT_SUPPORT", name: "支付开启/关闭"},
+        //支付宝支付设置
+        {type: "ALIPAY_PAYMENT", name: "支付宝支付设置"},
+        //微信支付设置
+        {type: "WECHAT_PAYMENT", name: "微信支付设置"},
+      ],
+      tabWay: [],
+    };
+  },
+
+  watch: {
+    $route(to, from) {
+      this.selected = "";
+      this.show = false;
+      this.getSettingData(this.selected);
+      this.$nextTick(() => {
+        this.show = true;
+      });
+      // this.$router.go(0)
+    },
+  },
+  mounted() {
+    this.clickTab(this.selected);
+  },
+  methods: {
+    clickTab(name) {
+      this.selected = name;
+      this.getSettingData(name);
+    },
+    /**
+     * 进入页面请求第一个配置
+     */
+    getSettingData(name) {
+      this.settingData = "";
+      Object.keys(this).forEach((item) => {
+        if (this.$route.name == item) {
+          this.tabWay = this[item];
+        }
+      });
+      // 点击页面给每项第一个数据赋值
+      if (!name) {
+        name = this.tabWay[0].type;
+        this.selected = name;
+      }
+
+      getSetting(name).then((res) => {
+        if (res.result) {
+          this.settingData = JSON.stringify(res.result);
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/manager/src/views/sys/setting-manage/smsSettingManage.vue b/manager/src/views/sys/setting-manage/smsSettingManage.vue
new file mode 100644
index 00000000..0d424e54
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/smsSettingManage.vue
@@ -0,0 +1,160 @@
+
+<template>
+  <Card class="card">
+
+    <div class="cardBox">
+      <div class="methodItem">
+        <img src="../../../assets/aliyun.png" height="172" width="440"/>
+        <h4>阿里云短信</h4></div>
+      <div class="bar">
+        <div class="status" style="color: rgb(53, 189, 129);">已启用</div>
+        <div><a class="links">编辑</a></div>
+      </div>
+    </div>
+    <!-- 阿里云的短信参数 -->
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="accessKeyId" prop="addressName">
+          <Input v-model="form.accessKeyId" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="accessSecret" prop="accessSecret">
+          <Input v-model="form.accessSecret" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="regionId" prop="regionId">
+          <Input v-model="form.regionId" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="signName" prop="signName">
+          <Input v-model="form.signName" clearable style="width: 100%"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="saveSetting"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+
+  </Card>
+</template>
+<script>
+  import {getSetting, setSetting} from "@/api/index.js";
+  import template from "./template";
+
+
+  export default {
+    name: "smsSettingManage",
+    components: {
+      template
+    },
+
+    data() {
+      return {
+        submitLoading: false,
+        template,
+        selected: "",
+        settingData: "",
+        modalTitle: '设置',
+        modalVisible: false,
+        form: {},
+      }
+    },
+    filters: {},
+    methods: {
+      init() {
+        settingInfo("SMS_SETTING")
+      },
+      setting() {
+        this.modalVisible = true
+      },
+      saveSetting() {
+        setSetting("SMS_SETTING", this.form).then((res) => {
+          if (res.code == 200) {
+            this.$Message.success("保存成功!");
+          } else {
+            this.$Message.error("保存失败!");
+          }
+          this.modalVisible = false
+        });
+      },
+      settingInfo(v) {
+        alert()
+        this.selected = v
+        getSetting(v).then((res) => {
+          if (res.result) {
+            console.log(res)
+            this.modalVisible = true
+            this.form = res
+          }
+        });
+      }
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  .card {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+  }
+  .cardBox {
+    display: inline-block;
+    border-radius: 2px;
+    line-height: 1.5;
+    margin-right: 20px;
+    width: 300px;
+    border: 1px solid #eee;
+    padding: 10px;
+  }
+
+  .methodItem {
+    width: 100%;
+    border: 1px solid #f5f5f5;
+    text-align: center;
+    padding: 20px 0;
+  }
+
+  methodItem img {
+    width: 220px;
+    height: 86px;
+  }
+
+  methodItem h4 {
+    font-size: 14px;
+    color: #333;
+    margin-top: 5px;
+  }
+
+  .methodItem img {
+    width: 220px;
+    height: 86px;
+  }
+
+  .bar {
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-align-items: center;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    padding: 10px 8px 0;
+  }
+</style>
diff --git a/manager/src/views/sys/setting-manage/template.js b/manager/src/views/sys/setting-manage/template.js
new file mode 100644
index 00000000..b53d674f
--- /dev/null
+++ b/manager/src/views/sys/setting-manage/template.js
@@ -0,0 +1,29 @@
+import BASE_SETTING from "./setting/BASE_SETTING";
+import GOODS_SETTING from "./setting/GOODS_SETTING";
+import ORDER_SETTING from "./setting/ORDER_SETTING";
+import POINT_SETTING from "./setting/POINT_SETTING";
+import KUAIDI_SETTING from "./setting/KUAIDI_SETTING";
+import OSS_SETTING from "./setting/OSS_SETTING";
+import SMS_SETTING from "./setting/SMS_SETTING";
+import WITHDRAWAL_SETTING from "./setting/WITHDRAWAL_SETTING";
+import ALIPAY_PAYMENT from "./pay/ALIPAY_PAYMENT";
+import WECHAT_PAYMENT from "./pay/WECHAT_PAYMENT";
+import PAYMENT_SUPPORT from "./pay/PAYMENT_SUPPORT";
+import WECHAT_CONNECT from "./authLogin/WECHAT_CONNECT";
+import QQ_CONNECT from "./authLogin/QQ_CONNECT";
+
+export default {
+  BASE_SETTING,
+  GOODS_SETTING,
+  ORDER_SETTING,
+  POINT_SETTING,
+  KUAIDI_SETTING,
+  OSS_SETTING,
+  SMS_SETTING,
+  WITHDRAWAL_SETTING,
+  PAYMENT_SUPPORT,
+  WECHAT_PAYMENT,
+  ALIPAY_PAYMENT,
+  WECHAT_CONNECT,
+  QQ_CONNECT
+};
diff --git a/manager/src/views/sys/slider/slider.vue b/manager/src/views/sys/slider/slider.vue
new file mode 100644
index 00000000..50f8d868
--- /dev/null
+++ b/manager/src/views/sys/slider/slider.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Tabs value="RESOURCE" @on-click="handleClickType">
+            <TabPane label="图片源" name="RESOURCE">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add" type="primary">添加</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    >
+
+                      <!-- 商品栏目格式化 -->
+                      <template slot="imageSlot" slot-scope="scope">
+                        <div style="">
+                          <img :src="scope.row.resource" style="height: 60px;margin-top: 1px;width: 90px">
+                        </div>
+                      </template>
+
+                    </Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    >
+                    </Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+            <TabPane label="滑块源" name="SLIDER">
+              <Row>
+                <Col>
+                  <Row class="operation" style="margin-bottom: 10px">
+                    <Button @click="add" type="primary" icon="md-add">添加</Button>
+                  </Row>
+                  <Row>
+                    <Table
+                      :loading="loading"
+                      border
+                      :columns="columns"
+                      :data="data"
+                      ref="table"
+                      sortable="custom"
+                      @on-sort-change="changeSort"
+                      @on-selection-change="changeSelect"
+                    >
+                      <!-- 商品栏目格式化 -->
+                      <template slot="imageSlot" slot-scope="scope">
+                        <div style="">
+                          <img :src="scope.row.resource" style="height: 60px;margin-top: 1px;width: 60px">
+                        </div>
+                      </template>
+                    </Table>
+                  </Row>
+                  <Row type="flex" justify="end" class="page">
+                    <Page
+                      :current="searchForm.pageNumber"
+                      :total="total"
+                      :page-size="searchForm.pageSize"
+                      @on-change="changePage"
+                      @on-page-size-change="changePageSize"
+                      :page-size-opts="[10, 20, 50]"
+                      size="small"
+                      show-total
+                      show-elevator
+                      show-sizer
+                    ></Page>
+                  </Row>
+                </Col>
+              </Row>
+            </TabPane>
+          </Tabs>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="名称" prop="name">
+          <Input v-model="form.name" maxlength="20" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="图片" prop="resource">
+          <Input v-model="form.resource" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="类型" prop="type">
+          <radio-group v-model="form.type" type="button">
+            <radio label="RESOURCE">图片源</radio>
+            <radio label="SLIDER">滑块源</radio>
+          </radio-group>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import * as API_Setting from "@/api/setting";
+
+export default {
+  data() {
+    return {
+      modalVisible: false,//添加验证码源弹出框
+      modalTitle: "", //添加验证码源弹出框标题
+      loading: true, // 表单加载状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      modalType: 0, // 添加或编辑标识
+      submitLoading: false, // 添加或编辑提交状态
+      form: {
+        name: "",
+        resource: "",
+        type: "RESOURCE",
+      },//添加编辑表单
+      formValidate: {
+        name: [
+          {
+            required: true,
+            message: "请输入名称",
+            trigger: "blur",
+          },
+        ],
+        resource: [
+          {
+            required: true,
+            message: "请上传图片",
+            trigger: "blur",
+          },
+        ],
+      },
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        type: "RESOURCE"
+      },
+      columns: [
+        {
+          title: "名称",
+          key: "name",
+          minWidth: 80,
+        },{
+          title: "图片",
+          key: "resource",
+          width: 150,
+          slot: "imageSlot"
+        },
+        {
+          title: "创建人",
+          key: "createBy",
+          minWidth: 80,
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          minWidth: 120,
+        },
+        {
+          title: "最后修改人",
+          key: "updateBy",
+          minWidth: 80,
+        },
+        {
+          title: "更新时间",
+          key: "updateTime",
+          minWidth: 120,
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    }
+                  }
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "删除"
+              )
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0,//条数
+    };
+  },
+
+  methods: {
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      this.getDataList();
+    },
+    //切换tab
+    handleClickType(v) {
+      this.searchForm.pageNumber = 1 // 当前页数
+      this.searchForm.pageSize = 10 // 页面大小
+      //图片源
+      if (v == "RESOURCE") {
+        this.searchForm.type = "RESOURCE"
+      }
+      //滑块源
+      if (v == "SLIDER") {
+        this.searchForm.type = "SLIDER"
+      }
+      this.getDataList();
+    },
+    //获取验证码源数据
+    getDataList() {
+      this.loading = true;
+      API_Setting.verificationPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total
+        }
+      });
+      this.loading = false;
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    //添加验证码源
+    add() {
+      this.form.type = this.searchForm.type
+      this.modalVisible = true
+      this.modalType = 0
+      this.modalTitle = "添加验证码源"
+    },
+    //修改验证码源
+    edit(v) {
+      this.form.name = v.name
+      this.form.id = v.id
+      this.form.resource = v.resource
+      this.form.type = v.type
+
+      this.modalType = 1
+      this.modalVisible = true
+      this.modalTitle = "修改验证码源"
+    },
+    //提交表单
+    handleSubmit() {
+      this.form.type = this.searchForm.type
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType == 0) {
+            // 添加
+            delete this.form.id;
+            API_Setting.addVerification(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            API_Setting.editVerification(this.form.id, this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    //删除验证码源
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "确认要删除此验证码源?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          API_Setting.delVerification(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("验证码源已删除");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    }
+
+  },
+  mounted() {
+    this.getDataList();
+  },
+};
+</script>
diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue
new file mode 100644
index 00000000..3b1b6d3d
--- /dev/null
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -0,0 +1,642 @@
+<style lang="scss">
+@import "@/styles/table-common.scss";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="用户名" prop="username">
+            <Input
+              type="text"
+              v-model="searchForm.username"
+              placeholder="请输入用户名"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="联系方式" prop="mobile">
+            <Input
+              type="text"
+              v-model="searchForm.mobile"
+              placeholder="请输入联系方式"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+
+          <Form-item label="部门" prop="department" >
+            <department-choose @on-change="handleSelectDep" style="width: 150px;" ref="dep"></department-choose>
+          </Form-item>
+
+          <Form-item label="用户状态" prop="status">
+            <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 150px">
+              <Option value="true">启用</Option>
+              <Option value="false">禁用</Option>
+            </Select>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll">批量删除</Button>
+        <Button @click="resetPass">重置密码</Button>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="showSelect"
+          ref="table"
+        ></Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10,20,50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+
+    <Modal
+      :title="modalTitle"
+      v-model="userModalVisible"
+      :mask-closable="false"
+      :width="500"
+      :styles="{top: '30px'}"
+    >
+      <Form ref="form" :model="form" :label-width="70" :rules="formValidate">
+        <FormItem label="用户名" prop="username">
+          <Input v-model="form.username" autocomplete="off"/>
+        </FormItem>
+        <FormItem label="昵称" prop="username">
+          <Input v-model="form.nickName" autocomplete="off"/>
+        </FormItem>
+        <FormItem label="密码" prop="password" v-if="modalType==0" :error="errorPass">
+          <Input type="password" password v-model="form.password" autocomplete="off"/>
+        </FormItem>
+        <FormItem label="邮箱" prop="email">
+          <Input v-model="form.email"/>
+        </FormItem>
+        <FormItem label="手机号" prop="mobile">
+          <Input v-model="form.mobile"/>
+        </FormItem>
+        <Form-item label="头像" prop="avatar">
+          <upload-pic-input v-model="form.avatar"></upload-pic-input>
+        </Form-item>
+        <Form-item label="所属部门">
+          <department-tree-choose @on-change="handleSelectDepTree" ref="depTree"></department-tree-choose>
+        </Form-item>
+        <FormItem label="角色" prop="roles">
+          <Select v-model="form.roles" multiple>
+            <Option v-for="item in roleList" :value="item.id" :key="item.id" :label="item.name">
+
+            </Option>
+          </Select>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="cancelUser">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitUser">提交</Button>
+      </div>
+    </Modal>
+    <check-password ref="checkPass" @on-success="resetPass"/>
+  </div>
+</template>
+
+<script>
+import {
+  getUserListData,
+  getAllRoleList,
+  addUser,
+  editOtherUser,
+  enableUser,
+  deleteUser,
+  resetPassword
+} from "@/api/index";
+import {validateMobile} from "@/libs/validate";
+import departmentChoose from "@/views/my-components/lili/department-choose";
+import departmentTreeChoose from "@/views/my-components/lili/department-tree-choose";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+export default {
+  name: "user-manage",
+  components: {
+    departmentChoose,
+    departmentTreeChoose,
+    uploadPicInput,
+  },
+  data() {
+    return {
+      height: 510,
+      openTip: false,
+      loading: true,
+      dropDownIcon: "ios-arrow-down",
+      selectCount: 0,
+      selectList: [],
+      searchForm: {
+        username: "",
+        departmentId: "",
+        mobile: "",
+        type: "",
+        status: "",
+        pageNumber: 1,
+        pageSize: 10,
+        sort: "createTime",
+        order: "desc"
+      },
+      selectDate: null,
+      modalType: 0,
+      userModalVisible: false,
+      modalTitle: "",
+      form: {
+        username: "",
+        mobile: "",
+        email: "",
+        sex: "",
+        type: 0,
+        roles: [],
+        departmentId: "",
+        departmentTitle: ""
+      },
+      userRoles: [],
+      roleList: [],
+      errorPass: "",
+      formValidate: {
+        username: [
+          {required: true, message: "用户名不能为空", trigger: "blur"}
+        ],
+        mobile: [
+          {required: true, message: "手机号不能为空", trigger: "blur"},
+          {validator: validateMobile, trigger: "blur"}
+        ],
+        email: [
+          {required: true, message: "请输入邮箱地址"},
+          {type: "email", message: "邮箱格式不正确"}
+        ]
+      },
+      submitLoading: false,
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+          fixed: "left"
+        },
+        {
+          title: "用户名",
+          key: "username",
+          minWidth: 120,
+          sortable: true,
+          fixed: "left"
+        },
+        {
+          title: "头像",
+          key: "avatar",
+          width: 80,
+          align: "center",
+          render: (h, params) => {
+            return h("Avatar", {
+              props: {
+                src: params.row.avatar
+              }
+            });
+          }
+        },
+        {
+          title: "手机",
+          key: "mobile",
+          width: 125
+        },
+        {
+          title: "邮箱",
+          key: "email",
+          minWidth: 180,
+          sortable: true
+        },
+        {
+          title: "状态",
+          key: "status",
+          align: "center",
+          width: 110,
+          render: (h, params) => {
+            if (params.row.status == true) {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "启用"
+                  }
+                })
+              ]);
+            } else if (params.row.status == false) {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "禁用"
+                  }
+                })
+              ]);
+            }
+          },
+          filters: [
+            {
+              label: "启用",
+              value: true
+            },
+            {
+              label: "禁用",
+              value: false
+            }
+          ],
+          filterMultiple: false,
+          filterMethod(value, row) {
+            return row.status == value;
+          }
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          sortable: true,
+          sortType: "desc",
+          width: 180
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 200,
+          align: "center",
+          fixed: "right",
+          render: (h, params) => {
+            let enableOrDisable = "";
+            if (params.row.status == true) {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.disable(params.row);
+                    }
+                  }
+                },
+                "禁用"
+              );
+            } else {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "success",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row);
+                    }
+                  }
+                },
+                "启用"
+              );
+            }
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small"
+                  },
+                  style: {
+                    marginRight: "5px"
+                  },
+                  on: {
+                    click: () => {
+                      this.edit(params.row);
+                    }
+                  }
+                },
+                "编辑"
+              ),
+              enableOrDisable,
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "删除"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [],
+      total: 0,
+      departments: []
+    };
+  },
+  methods: {
+    init() {
+      this.getUserList();
+    },
+    handleSelectDepTree(v) {
+      if (v) {
+        this.form.departmentId = v.departmentId;
+        this.form.departmentTitle = v.departmentTitle;
+      } else {
+        this.form.departmentId = "";
+        this.form.departmentTitle = "";
+      }
+    },
+    handleSelectDep(v) {
+      this.searchForm.departmentId = v;
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getUserList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getUserList();
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getUserList() {
+      // 多条件搜索用户列表
+      this.loading = true;
+      // 避免后台默认值
+      if (!this.searchForm.type) {
+        this.searchForm.type = "";
+      }
+      if (!this.searchForm.status) {
+        this.searchForm.status = "";
+      }
+      getUserListData(this.searchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getUserList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order == "normal") {
+        this.searchForm.order = "";
+      }
+      this.getUserList();
+    },
+    getRoleList() {
+      let params = {
+        pageSize: 100
+      }
+      getAllRoleList(params).then(res => {
+        if (res.success) {
+          this.roleList = res.result.records;
+        }
+      });
+    },
+    resetPass() {
+      this.$Modal.confirm({
+        title: "确认重置",
+        content:
+          "您确认要重置所选的 " +
+          this.selectCount +
+          " 条用户数据密码为【123456】?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          resetPassword(ids).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.clearSelectAll();
+              this.getUserList();
+            }
+          });
+        }
+      });
+    },
+    cancelUser() {
+      this.userModalVisible = false;
+    },
+    submitUser() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (this.modalType == 0) {
+            // 添加用户 避免编辑后传入id
+            delete this.form.id;
+            delete this.form.status;
+            if (this.form.password == "" || this.form.password == undefined) {
+              this.errorPass = "密码不能为空";
+              return;
+            }
+            if (this.form.password.length < 6) {
+              this.errorPass = "密码长度不得少于6位";
+              return;
+            }
+            //todo
+            this.form.password = this.md5(this.form.password)
+
+            this.submitLoading = true;
+            addUser(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getUserList();
+                this.userModalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            this.submitLoading = true;
+            editOtherUser(this.form).then(res => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getUserList();
+                this.userModalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加用户";
+      this.$refs.form.resetFields();
+      this.$refs.depTree.setData("", "");
+      this.userModalVisible = true;
+    },
+    edit(v) {
+      this.form = JSON.parse(JSON.stringify(v));
+      this.modalType = 1;
+      this.modalTitle = "编辑用户";
+      this.$refs.form.resetFields();
+      // 转换null为""
+
+      for (let attr in this.form) {
+        if (this.form[attr] == null) {
+          this.form[attr] = "";
+        }
+      }
+
+
+      this.$refs.depTree.setData(this.form.departmentId, this.form.departmentTitle);
+      let selectRolesId = [];
+      if (this.form.roles) {
+        this.form.roles.forEach(function (e) {
+          selectRolesId.push(e.id);
+        });
+      }
+      this.form.roles = selectRolesId;
+      this.userModalVisible = true;
+    },
+    enable(v) {
+      let params = {
+        status: true
+      }
+      this.$Modal.confirm({
+        title: "确认启用",
+        content: "您确认要启用用户 " + v.username + " ?",
+        loading: true,
+        onOk: () => {
+          enableUser(v.id, params).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getUserList();
+            }
+          });
+        }
+      });
+    },
+    disable(v) {
+      let params = {
+        status: false
+      }
+      this.$Modal.confirm({
+        title: "确认禁用",
+        content: "您确认要禁用用户 " + v.username + " ?",
+        loading: true,
+        onOk: () => {
+          enableUser(v.id, params).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getUserList();
+            }
+          });
+        }
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除用户 " + v.username + " ?",
+        loading: true,
+        onOk: () => {
+          deleteUser(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getUserList();
+            }
+          });
+        }
+      });
+    },
+    showSelect(e) {
+      this.exportData = e;
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = "";
+          this.selectList.forEach(function (e) {
+            ids += e.id + ",";
+          });
+          ids = ids.substring(0, ids.length - 1);
+          deleteUser(ids).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.clearSelectAll();
+              this.getUserList();
+            }
+          });
+        }
+      });
+    }
+  },
+  mounted() {
+    // 计算高度
+    this.height = Number(document.documentElement.clientHeight - 230);
+    this.init();
+    this.getRoleList();
+  }
+};
+</script>
+
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/manager/vue.config.js b/manager/vue.config.js
new file mode 100644
index 00000000..b5be380c
--- /dev/null
+++ b/manager/vue.config.js
@@ -0,0 +1,98 @@
+const path = require("path");
+const CompressionPlugin = require("compression-webpack-plugin");
+
+const resolve = dir => {
+  return path.join(__dirname, dir);
+};
+
+module.exports = {
+  css: {
+    loaderOptions: {
+      // 向 CSS 相关的 loader 传递选项
+      less: {
+        lessOptions: {
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  devServer: {
+    port: 9999
+    // proxy: {
+    //     '/lili': {
+    //         target: 'http://127.0.0.1:8888',  // 请求本地 需要lili后台项目
+    //         ws: true
+    //     }
+    // }
+  },
+
+  chainWebpack: config => {
+    //  @ 对应 src目录
+    config.resolve.alias.set("@", resolve("src"));
+  },
+
+  // 打包时不生成.map文件 避免看到源码
+  productionSourceMap: false,
+
+  // 部署优化
+  configureWebpack: {
+    // 使用CDN
+    externals: {
+      vue: "Vue",
+      "vue-i18n": "VueI18n",
+      axios: "axios",
+      "vue-router": "VueRouter",
+      vuex: "Vuex",
+      "view-design": "iview",
+      xlsx: "XLSX",
+      dplayer: "DPlayer",
+      "print-js": "printJS",
+      html2canvas: "html2canvas",
+      "vue-json-pretty": "VueJsonPretty",
+      "vue-lazyload": "VueLazyload",
+      gitalk: "Gitalk",
+      "js-cookie": "Cookies",
+      wangEditor: "wangEditor",
+      quill: "Quill",
+      stompjs: "Stomp",
+      "sockjs-client": "SockJS",
+      vuedraggable: "vuedraggable"
+    },
+    // GZIP压缩
+    plugins: [
+      new CompressionPlugin({
+        test: /\.js$|\.html$|\.css/, // 匹配文件
+        threshold: 10240 // 对超过10k文件压缩
+      })
+    ],
+    optimization: {
+      runtimeChunk: "single",
+      splitChunks: {
+        chunks: "all",
+        maxInitialRequests: Infinity,
+        minSize: 20000,
+        cacheGroups: {
+          vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            name(module) {
+              // get the name. E.g. node_modules/packageName/not/this/part.js
+              // or node_modules/packageName
+              const packageName = module.context.match(
+                /[\\/]node_modules[\\/](.*?)([\\/]|$)/
+              )[1];
+              // npm package names are URL-safe, but some servers don't like @ symbols
+              return `npm.${packageName.replace("@", "")}`;
+            }
+          }
+        }
+      }
+    }
+  },
+
+  pluginOptions: {
+    "style-resources-loader": {
+      preProcessor: "scss",
+      patterns: [path.resolve(__dirname, "./src/styles/common.scss")]
+    }
+  }
+};
diff --git a/seller/.browserslistrc b/seller/.browserslistrc
new file mode 100644
index 00000000..bd3ad98e
--- /dev/null
+++ b/seller/.browserslistrc
@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8
\ No newline at end of file
diff --git a/seller/.editorconfig b/seller/.editorconfig
new file mode 100644
index 00000000..3454886e
--- /dev/null
+++ b/seller/.editorconfig
@@ -0,0 +1,14 @@
+# https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/seller/.eslintignore b/seller/.eslintignore
new file mode 100644
index 00000000..e6529fc0
--- /dev/null
+++ b/seller/.eslintignore
@@ -0,0 +1,4 @@
+build/*.js
+src/assets
+public
+dist
diff --git a/seller/.eslintrc.js b/seller/.eslintrc.js
new file mode 100644
index 00000000..c9775054
--- /dev/null
+++ b/seller/.eslintrc.js
@@ -0,0 +1,198 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}
diff --git a/seller/.gitignore b/seller/.gitignore
new file mode 100644
index 00000000..69316c53
--- /dev/null
+++ b/seller/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+dist/
+gifs/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+test/unit/coverage
+test/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
+yarn.lock
+package-lock.json
+yarn.lock
diff --git a/seller/Dockerfile b/seller/Dockerfile
new file mode 100644
index 00000000..d7e43746
--- /dev/null
+++ b/seller/Dockerfile
@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+RUN mkdir -p /app/
+COPY ./dist /app/
+COPY ./nginx.conf /etc/nginx/nginx.conf
+
+
+EXPOSE 80
diff --git a/seller/README.md b/seller/README.md
new file mode 100644
index 00000000..7532f2c9
--- /dev/null
+++ b/seller/README.md
@@ -0,0 +1,38 @@
+# LILISHOP-UI
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Run your tests
+```
+npm run test
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+详情点击 [https://cli.vuejs.org/zn/config/](https://cli.vuejs.org/zn/config/).
+
+####  login.vue页面，测试时不走权限，直接return  318行
+####  util.initRouter 方法，开发时注释掉登录验证，调用路由接口验证
+####  Main.vue 页面，241行，修改，避免报错
+
+#### main-components  头部，左侧所有内容
+
+#### lili-floor-renovation  楼层装修模块
+     
diff --git a/seller/babel.config.js b/seller/babel.config.js
new file mode 100644
index 00000000..2ea5d05b
--- /dev/null
+++ b/seller/babel.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  presets: [
+    [
+      '@vue/app',
+      {
+        useBuiltIns: 'entry'
+      }
+    ]
+  ]
+}
diff --git a/seller/docker.sh b/seller/docker.sh
new file mode 100644
index 00000000..6b059866
--- /dev/null
+++ b/seller/docker.sh
@@ -0,0 +1 @@
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.1 .
diff --git a/seller/nginx.conf b/seller/nginx.conf
new file mode 100644
index 00000000..c1d6be04
--- /dev/null
+++ b/seller/nginx.conf
@@ -0,0 +1,51 @@
+#这个文件给docker用的
+#user  nobody;
+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;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    client_max_body_size 10m;
+    gzip on;
+    gzip_min_length  5k;
+    gzip_buffers     4 16k;
+    gzip_http_version 1.0;
+    gzip_comp_level 4;
+    gzip_types       text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    gzip_vary on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root /app;
+            try_files $uri $uri/ /index.html $uri/ =404;
+            index  index.html index.htm;
+        }
+    }
+}
diff --git a/seller/package.json b/seller/package.json
new file mode 100644
index 00000000..2a49f091
--- /dev/null
+++ b/seller/package.json
@@ -0,0 +1,62 @@
+{
+  "name": "lilishop",
+  "version": "1.0.0",
+  "private": true,
+  "description": "lilishop-ui",
+  "author": "lili-platform",
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "0.0.7",
+    "@antv/g2": "^4.1.14",
+    "axios": "^0.21.1",
+    "core-js": "^3.6.5",
+    "countup.js": "^2.0.4",
+    "date-fns": "^1.30.1",
+    "dplayer": "^1.26.0",
+    "gitalk": "^1.6.2",
+    "html2canvas": "^1.0.0-rc.5",
+    "js-cookie": "^2.2.1",
+    "node-sass": "^4.14.1",
+    "pinyin": "^2.9.0",
+    "print-js": "^1.0.63",
+    "qrcodejs2": "0.0.2",
+    "quill": "^1.3.7",
+    "sass-loader": "^8.0.2",
+    "sockjs-client": "^1.4.0",
+    "stompjs": "^2.3.3",
+    "swiper": "^6.3.5",
+    "view-design": "^4.2.0",
+    "vue": "^2.6.10",
+    "vue-awesome": "^4.0.2",
+    "vue-awesome-swiper": "^4.1.1",
+    "vue-clipboard2": "^0.3.0",
+    "vue-cropper": "^0.4.9",
+    "vue-i18n": "^8.15.1",
+    "vue-json-pretty": "^1.4.1",
+    "vue-lazyload": "^1.3.3",
+    "vue-router": "^3.1.3",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "wangeditor": "^4.6.13",
+    "xlsx": "^0.16.2",
+    "xss": "^1.0.7"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.4.4",
+    "@vue/cli-plugin-router": "^4.4.4",
+    "@vue/cli-plugin-vuex": "^4.4.4",
+    "@vue/cli-service": "^4.4.4",
+    "compression-webpack-plugin": "^4.0.0",
+    "css-loader": "^5.0.1",
+    "less": "^3.12.2",
+    "less-loader": "^6.2.0",
+    "style-loader": "^2.0.0",
+    "style-resources-loader": "^1.3.2",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-template-compiler": "^2.6.10"
+  }
+}
diff --git a/seller/postcss.config.js b/seller/postcss.config.js
new file mode 100644
index 00000000..961986e2
--- /dev/null
+++ b/seller/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
diff --git a/seller/public/index.html b/seller/public/index.html
new file mode 100644
index 00000000..cb8c0207
--- /dev/null
+++ b/seller/public/index.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
+  <link rel="icon" href="./logo.ico" type="image/x-icon">
+  <title>lili store</title>
+  <meta name="keywords"
+    content="keywords">
+  <meta name="description"
+    content="description">
+  <!-- 部署CDN优化 -->
+  <script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vuex@3.1.2/dist/vuex.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.15.1/dist/vue-i18n.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/styles/iview.css">
+  <script src="https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/iview.min.js"></script>
+
+  <script src="https://cdn.jsdelivr.net/npm/vue-lazyload@1.3.3/vue-lazyload.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/xlsx@0.15.3/dist/xlsx.full.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/dplayer@1.25.0/dist/DPlayer.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/print-js@1.0.63/dist/print.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.0.0-rc.5/dist/html2canvas.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue-json-pretty@1.6.2/vue-json-pretty.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/gitalk@1.5.0/dist/gitalk.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/wangeditor@3.1.1/release/wangEditor.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/quill@1.3.7/dist/quill.snow.css">
+  <script src="https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.8.4/Sortable.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vuedraggable@2.23.2/dist/vuedraggable.umd.min.js"></script>
+  <script src="https://v.vaptcha.com/v3.js"></script>
+  <style>
+    .page-loading-wrap {
+      padding: 120px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-direction: column;
+    }
+
+    .half-circle-spinner,
+    .half-circle-spinner * {
+      box-sizing: border-box;
+    }
+
+    .half-circle-spinner {
+      width: 35px;
+      height: 35px;
+      border-radius: 100%;
+      position: relative;
+    }
+
+    .half-circle-spinner .circle {
+      content: "";
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 100%;
+      border: calc(35px / 10) solid transparent;
+    }
+
+    .half-circle-spinner .circle.circle-1 {
+      border-top-color: #5cadff;
+      animation: half-circle-spinner-animation 1s infinite;
+    }
+
+    .half-circle-spinner .circle.circle-2 {
+      border-bottom-color: #5cadff;
+      animation: half-circle-spinner-animation 1s infinite alternate;
+    }
+
+    @keyframes half-circle-spinner-animation {
+      0% {
+        transform: rotate(0deg);
+
+      }
+
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but lili-admin doesn't work properly without JavaScript enabled. Please enable it to
+      continue.</strong>
+  </noscript>
+  <div id="app">
+    <div class="page-loading-wrap">
+      <div class="half-circle-spinner">
+        <div class="circle circle-1"></div>
+        <div class="circle circle-2"></div>
+      </div>
+      <h4 style="margin-top:20px;">正在加载资源...</h4>
+    </div>
+  </div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
diff --git a/seller/public/logo.ico b/seller/public/logo.ico
new file mode 100644
index 00000000..136bd7e9
Binary files /dev/null and b/seller/public/logo.ico differ
diff --git a/seller/src/App.vue b/seller/src/App.vue
new file mode 100644
index 00000000..2a6fc3f5
--- /dev/null
+++ b/seller/src/App.vue
@@ -0,0 +1,46 @@
+<template>
+  <div id="main" class="app-main">
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  mounted() {},
+  beforeDestroy() {},
+  methods: {}
+};
+</script>
+
+<style>
+html,
+body {
+  width: 100%;
+  height: 100%;
+  background: #f0f0f0;
+}
+
+.app-main {
+  width: 100%;
+  height: 100%;
+}
+
+.br button {
+  margin-right: 5px;
+}
+
+.operation button {
+  margin-right: 5px;
+}
+
+.ivu-btn-text:focus {
+  box-shadow: none !important;
+}
+
+.ivu-tag {
+  cursor: pointer;
+}
+</style>
diff --git a/seller/src/api/address.js b/seller/src/api/address.js
new file mode 100644
index 00000000..ccbd6d84
--- /dev/null
+++ b/seller/src/api/address.js
@@ -0,0 +1,10 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
+
+
+// 传给后台citycode 获取城市街道等id
+export const handleRegion = (params) => {
+  return getRequest(`/address/region`,params)
+}
+
+
diff --git a/seller/src/api/common.js b/seller/src/api/common.js
new file mode 100644
index 00000000..aea5012d
--- /dev/null
+++ b/seller/src/api/common.js
@@ -0,0 +1,11 @@
+import {commonUrl, getRequest} from '@/libs/axios';
+
+// 通过id获取子地区
+export const getChildRegion = (id) => {
+  return getRequest(`${commonUrl}/common/region/item/${id}`);
+};
+
+// 点地图获取地址信息
+export const getRegion = (parpams) => {
+  return getRequest(`${commonUrl}/common/region/region`, parpams);
+};
diff --git a/seller/src/api/distribution.js b/seller/src/api/distribution.js
new file mode 100644
index 00000000..25f2d554
--- /dev/null
+++ b/seller/src/api/distribution.js
@@ -0,0 +1,72 @@
+
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
+
+
+//获取分销商品列表
+export const getDistributionGoods = (params) => {
+  return getRequest('/distributionGoods', params)
+}
+
+// 取消分销商品
+export const distributionGoodsCancel = (id) => {
+  return deleteRequest(`/distributionGoods/cancel/${id}`)
+}
+
+// 选择分销商品
+export const distributionGoodsCheck = (id,param) => {
+  return putRequest(`/distributionGoods/checked/${id}`,param)
+}
+
+
+//查询分销商
+export const getDistributionListData = (params) => {
+    return getRequest('/distribution/getByPage', params)
+}
+//审核分销商
+export const auditDistribution = (id, params) => {
+    return putRequest(`/distribution/audit/${id}`, params)
+}
+
+// 清退分销商
+export const retreatDistribution = (id, params) => {
+    return putRequest(`/distribution/retreat/${id}`, params)
+}
+
+// 恢复分销商
+export const resumeDistribution = (id, params) => {
+    return putRequest(`/distribution/resume/${id}`, params)
+}
+
+//保存更新分销设置
+export const saveDistributionSetting = (params) => {
+    return postRequest('/distribution/setting/insertOrUpdate', params)
+}
+
+//获取分销设置
+export const getDistributionSetting = (id, params) => {
+    return getRequest(`/distribution/setting/get/${id}`, params)
+}
+
+
+//获取分销订单列表
+export const getDistributionOrder = (params) => {
+    return getRequest('/distribution/order/getByPage', params)
+}
+
+
+//删除分销商品
+export const delDistributionGoods = (ids) => {
+    return deleteRequest(`/distribution/goods/delByIds/${ids}`)
+}
+//获取分销佣金信息
+export const getDistributionCash = (params) => {
+    return getRequest('/distribution/cash/getByPage', params)
+}
+//审核分销佣金申请
+export const auditDistributionCash = (id,params) => {
+    return postRequest(`/distribution/cash/audit/${id}`, params)
+}
+
+
+
diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js
new file mode 100644
index 00000000..c0daedaf
--- /dev/null
+++ b/seller/src/api/goods.js
@@ -0,0 +1,370 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  importRequest,
+  getRequestWithNoToken,
+  commonUrl
+} from "@/libs/axios";
+import config from "@/config";
+
+// 文件上传接口
+export const uploadFile = commonUrl + "/common/upload/file";
+// 验证码渲染图片接口
+export const drawCodeImage = "/common/captcha/draw/";
+// 获取菜单
+export const getMenuList = "/permission/getMenuList";
+// 获取数据字典
+export const getDictData = "/dictData/getByType/";
+// Websocket
+export const ws = "/ws";
+
+// 获取当前店铺分类
+export const getShopGoodsLabelList = () => {
+  return getRequest(`/goods/label`);
+};
+
+// 添加当前店铺分类
+export const addShopGoodsLabel = params => {
+  return postRequest(`/goods/label`, params);
+};
+
+// 修改当前店铺分类
+export const editShopGoodsLabel = params => {
+  return putRequest(`/goods/label`, params);
+};
+
+// 删除当前店铺分类
+export const delCategdelShopGoodsLabel = id => {
+  return deleteRequest(`/goods/label/${id}`);
+};
+
+//  根据goodsId分页获取商品列表
+export const getQueryGoodsIdGoodsList = goodsId => {
+  return getRequest(`/goods/sku/${goodsId}/list`);
+};
+
+//  获取商品分页列表
+export const getGoodsSkuListDataSeller = params => {
+  return getRequest("/goods/sku/list", params);
+};
+
+//  获取商品品牌分页列表
+export const getUserListData = params => {
+  return getRequest("/goods/brand/getByPage", params);
+};
+//  添加或修改品牌设置
+export const insertOrUpdateBrand = params => {
+  return postRequest("/goods/brand/insertOrUpdate", params);
+};
+// 启用品牌
+export const enableBrand = (id, params) => {
+  return postRequest(`/goods/brand/enable/${id}`, params);
+};
+// 禁用品牌
+export const disableBrand = (id, params) => {
+  return postRequest(`/goods/brand/disable/${id}`, params);
+};
+//根据分类id获取关联品牌
+export const getCategoryBrandListData = (category_id, params) => {
+  return getRequest(`/category/brand/${category_id}`, params);
+};
+//保存获取关联品牌
+export const saveCategoryBrand = (category_id, params) => {
+  return postRequest(`/category/brand/${category_id}`, params);
+};
+//保存获取关联规格
+export const saveCategorySpec = (category_id, params) => {
+  return postRequest(`/goods/category/spec/${category_id}`, params);
+};
+
+//获取所有可用品牌
+export const getBrandListData = params => {
+  return getRequest("/goods/brand/all", params);
+};
+// 获取所有可用规格
+export const getSpecificationList = params => {
+  return getRequest("/goods/spec/all", params);
+};
+
+// 获取店铺分类列表数据
+export const getAllList = id => {
+  return getRequest(`/goods/label/get/${id}`);
+};
+
+//  添加商品分类
+export const insertCategory = params => {
+  return postRequest("/goods/category/insertCategory", params);
+};
+//  添加商品分类
+export const updateCategory = params => {
+  return postRequest("/goods/category/updateCategory", params);
+};
+//删除商品分类
+export const delCategory = id => {
+  return deleteRequest(`/goods/category/del/${id}`);
+};
+// 启用分类
+export const enableCategory = (id, type) => {
+  return postRequest(`/goods/category/enable/${id}`, type);
+};
+// 禁用分类
+export const disableCategory = (id, type) => {
+  return postRequest(`/goods/category/disable/${id}`, type);
+};
+
+//  获取商品规格分页列表
+export const getSpecListData = params => {
+  return getRequest("/goods/spec/list", params);
+};
+//  添加或修改规格设置
+export const insertOrUpdateSpec = params => {
+  return postRequest("/goods/spec/edit", params);
+};
+//根据分类id获取关联规格
+export const getCategorySpecListData = (category_id, params) => {
+  return getRequest(`/goods/category/spec/${category_id}`, params);
+};
+//删除gUI个
+export const delSpec = (id, params) => {
+  return deleteRequest(`/goods/spec/del/${id}`, params);
+};
+//  获取商品规格值列表
+export const getSpecValuesListData = (id, params) => {
+  return getRequest(`/goods/spec-values/values/${id}`, params);
+};
+//  添加商品规格值
+export const saveSpecValues = (id, params) => {
+  return postRequest(`/goods/spec-values/save/${id}`, params);
+};
+
+// 查询某分类下的全部子分类列表
+export const getGoodsCategory = parent_id => {
+  return getRequest(`/goods/category/${parent_id}/all-children`);
+};
+
+//  获取商品sku分页列表
+export const getGoodsSkuData = params => {
+  return getRequest("/goods/sku/list", params);
+};
+
+//  获取商品分页列表
+export const getGoodsListData = params => {
+  return getRequest("/goods/list", params);
+};
+//  获取待审核商品分页列表
+export const getAuthGoodsListData = params => {
+  return getRequest("/goods/auth/list", params);
+};
+
+//  审核商品
+export const authGoods = (id, params) => {
+  return putRequest(`/goods/${id}/auth`, params);
+};
+
+/**
+ * 发布商品 查询商品品类 分级查询（商城商品品类）
+ * @param ids
+ * @param params
+ * @returns {Promise<any>}
+ */
+export const getGoodsCategoryLevelList = (ids, params) => {
+  return getRequest(`/goods/category/${ids}/children`, params);
+};
+
+// 获取全部经营类目
+export const getGoodsCategoryAll = () => {
+  return getRequest(`/goods/category/all`);
+};
+
+// 获取当前店铺分类
+export const getShopGoodsLabelListSeller = () => {
+  return getRequest(`/goods/label`);
+};
+
+//查询分类绑定参数信息
+export const getCategoryParamsListData = (id, params) => {
+  return getRequest(`/goods/category/parameters/${id}`, params);
+};
+//查询商品绑定参数信息
+export const getCategoryParamsByGoodsId = (goodsId, categoryId) => {
+  return getRequest(`/goods/parameters/${goodsId}/${categoryId}`);
+};
+//更新或者保存参数
+export const insertOrUpdateParams = params => {
+  return postRequest("/goods/parameters/save", params);
+};
+//删除参数
+export const deleteParams = (id, params) => {
+  return deleteRequest(`/goods/parameters/${id}`, params);
+};
+//更新或者保存参数组
+export const insertOrUpdateParamsGroup = params => {
+  return postRequest("/goods/category/parameters/save", params);
+};
+//删除参数组
+export const deleteParamsGroup = (id, params) => {
+  return deleteRequest(`/goods/category/parameters/${id}`, params);
+};
+
+//保存获取关联规格
+export const getGoodsSpecInfo = (category_id, params) => {
+  return getRequest(`/goods/category/spec/goods/${category_id}`, params);
+};
+
+//获取sku列表
+export const getSkuPage = params => {
+  return getRequest(`/goodsSku/getByPage`, params);
+};
+
+//  获取商品规格值列表
+export const getSpecValuesListSellerData = (id, params) => {
+  return getRequest(`/goods/spec-values/values/${id}`, params);
+};
+//  添加商品规格值
+export const saveSpecValuesSeller = (id, params) => {
+  return postRequest(`/goods/spec-values/save/${id}`, params);
+};
+
+//  获取商品规格分页列表
+export const getSpecListSellerData = params => {
+  return getRequest("/goods/spec/page", params);
+};
+//  添加或修改规格设置
+export const insertSpecSeller = params => {
+  return postRequest("/goods/spec", params);
+};
+
+//  更新商品库存
+export const updateGoodsSkuStocks = params => {
+  return putRequest("/goods/update/stocks", params, {
+    "Content-Type": "application/json"
+  });
+};
+//  获取商品分页列表
+export const getGoodsListDataSeller = params => {
+  return getRequest("/goods/list", params);
+};
+//  获取商品告警分页列表
+export const getGoodsListDataByStockSeller = params => {
+  return getRequest("/goods/list/stock", params);
+};
+//  获取商品详情
+export const getGoods = id => {
+  return getRequest(`/goods/get/${id}`);
+};
+//  上架商品
+export const upGoods = params => {
+  return putRequest(`/goods/up`, params);
+};
+// 删除商品
+export const deleteGoods = params => {
+  return putRequest(`/goods/delete`, params);
+};
+//  下架商品
+export const lowGoods = params => {
+  return putRequest(`/goods/under`, params);
+};
+
+// 获取商品单位列表
+export const getGoodsUnitList = () => {
+  return getRequest(`/goods/unit`);
+};
+//根据分类id获取关联品牌
+export const getCategoryBrandListDataSeller = (category_id, params) => {
+  return getRequest(`/goods/category/${category_id}/brands`, params);
+};
+
+export function createGoods(params) {
+  return postRequest("/goods/create", params, {
+    "Content-Type": "application/json"
+  });
+}
+
+export function editGoods(goodsId, params) {
+  return putRequest(`/goods/update/${goodsId}`, params, {
+    "Content-Type": "application/json"
+  });
+}
+
+// 获取草稿商品分页列表
+export const getDraftGoodsListData = params => {
+  return getRequest("/draft/goods/page", params);
+};
+
+// 获取草稿商品详情
+export const getDraftGoodsDetail = id => {
+  return getRequest(`/draft/goods/${id}`);
+};
+
+// 保存草稿商品
+export function saveDraftGoods(params) {
+  return postRequest("/draft/goods/save", params, {
+    "Content-Type": "application/json"
+  });
+}
+
+// 删除草稿商品
+export const deleteDraftGoods = id => {
+  return deleteRequest(`/draft/goods/${id}`);
+};
+
+//查询分类绑定参数信息
+export const getCategoryParamsListDataSeller = (id, params) => {
+  return getRequest(`/goods/category/parameters/${id}`, params);
+};
+
+//保存获取关联规格
+export const getGoodsSpecInfoSeller = (category_id, params) => {
+  return getRequest(`/goods/category/spec/goods/${category_id}`, params);
+};
+
+//批量设置运费模板
+export const batchShipTemplate = params => {
+  return putRequest(`/goods/freight`, params);
+};
+
+
+// 获取订单统计图表
+export const getOrderChart = params => {
+  return getRequest(`/statistics/order`, params);
+};
+
+// 订单统计概览
+export const getOrderOverView = params => {
+  return getRequest(`/statistics/order/overview`, params);
+};
+
+// 统计相关订单统计
+
+export const statisticsOrderList = params => {
+  return getRequest(`/statistics/order/order`, params);
+};
+
+// 统计相关退单统计
+
+export const statisticsOrderRefundList = params => {
+  return getRequest(`/statistics/order/refund`, params);
+};
+
+// 获取行业统计列表
+export const goodsCategoryStatistics = params => {
+  return getRequest(`/statistics/goods/getCategoryByPage`, params);
+};
+
+// 获取统计列表,排行前一百的数据
+export const goodsStatistics = params => {
+  return getRequest(`/statistics/goods`, params);
+};
+
+// 获取退款统计列表
+export const refundStatistics = params => {
+  return getRequest(`/statistics/refund/order/getByPage`, params);
+};
+
+// 获取退款统计金额
+export const refundPriceStatistics = params => {
+  return getRequest(`/statistics/refund/order/getPrice`, params);
+};
diff --git a/seller/src/api/index.js b/seller/src/api/index.js
new file mode 100644
index 00000000..6d1f870b
--- /dev/null
+++ b/seller/src/api/index.js
@@ -0,0 +1,273 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  getRequestWithNoToken,
+  postRequestWithNoToken,
+  commonUrl,
+  baseUrl
+} from "@/libs/axios";
+
+// 文件上传接口
+export const uploadFile = commonUrl + "/common/upload/file";
+// 验证码渲染图片接口
+export const drawCodeImage = commonUrl + "/common/captcha/draw/";
+// 获取菜单
+export const getMenuList = baseUrl + "/permission/getMenuList";
+
+//获取所有city
+export const getAllCity = (params) => {
+  return getRequest(commonUrl+'/common/region/allCity', params)
+}
+
+// 登陆
+export const getHomeNotice = params => {
+  return getRequest("/article/getByPage?type=STORE_ARTICLE&pageSize=15");
+};
+
+
+
+// 登陆
+export const getSellerHomeData = params => {
+  return getRequest("/statistics/index", params);
+};
+
+
+// 登陆
+export const login = params => {
+  return postRequestWithNoToken("/login/userLogin", params);
+};
+// 获取用户登录信息
+export const userInfo = params => {
+  return getRequest("/user/info", params);
+};
+// 获取登录信息
+export const userMsg = params => {
+  return getRequest('/settings', params)
+}
+// 注册
+export const regist = params => {
+  return postRequest("/user/regist", params);
+};
+// 初始化验证码
+export const initCaptcha = params => {
+  return getRequestWithNoToken("/common/captcha/init", params);
+};
+// 发送登录短信验证码
+export const sendLoginSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendLoginSms/${mobile}`, params);
+};
+// 发送注册短信验证码
+export const sendRegistSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendRegistSms/${mobile}`, params);
+};
+// 发送重置密码短信验证码
+export const sendResetSms = (mobile, params) => {
+  return getRequest(`${commonUrl}/common/captcha/sendResetSms/${mobile}`, params);
+};
+// 发送修改绑定手机短信验证码
+export const sendEditMobileSms = (mobile, params) => {
+  return getRequest(`/common/captcha/sendEditMobileSms/${mobile}`, params);
+};
+// 通过手机重置密码
+export const resetByMobile = params => {
+  return postRequest("/user/resetByMobile", params);
+};
+// 发送重置密码邮件验证码
+export const sendResetEmail = (email, params) => {
+  return getRequest(`/email/sendResetCode/${email}`, params);
+};
+// 发送修改绑定邮件验证码
+export const sendEditEmail = (email, params) => {
+  return getRequest(`/email/sendEditCode/${email}`, params);
+};
+// 通过邮件重置密码
+export const resetByEmail = params => {
+  return postRequest("/email/resetByEmail", params);
+};
+// 短信验证码登录
+export const smsLogin = params => {
+  return postRequest("/user/smsLogin", params);
+};
+// IP天气信息
+export const ipInfo = params => {
+  return getRequest("/common/ip/info", params);
+};
+// 个人中心编辑
+export const userInfoEdit = params => {
+  return postRequest("/user/edit", params);
+};
+// 个人中心发送修改邮箱验证邮件
+export const sendCodeEmail = (email, params) => {
+  return getRequest(`/email/sendCode/${email}`, params);
+};
+// 个人中心发送修改邮箱验证邮件
+export const editEmail = params => {
+  return postRequest("/email/editEmail", params);
+};
+// 个人中心修改密码
+export const changePass = params => {
+  return postRequest("/login/modifyPass", params);
+};
+// 个人中心修改手机
+export const changeMobile = params => {
+  return postRequest("/user/changeMobile", params);
+};
+// 获取绑定账号信息
+export const relatedInfo = (username, params) => {
+  return getRequest(`/relate/getRelatedInfo/${username}`, params);
+};
+// 解绑账号
+export const unRelate = params => {
+  return postRequest("/relate/delByIds", params);
+};
+// 分页获取绑定账号信息
+export const getRelatedListData = params => {
+  return getRequest("/relate/findByCondition", params);
+};
+
+// 获取用户数据 多条件
+export const getUserListData = params => {
+  return getRequest("/user/getByCondition", params);
+};
+// 通过用户名搜索
+export const searchUserByName = (username, params) => {
+  return getRequest("/user/searchByName/" + username, params);
+};
+// 获取全部用户数据
+export const getAllUserData = params => {
+  return getRequest("/user/getAll", params);
+};
+
+// 添加用户
+export const addUser = params => {
+  return postRequest("/user/admin/add", params);
+};
+// 编辑用户
+export const editUser = params => {
+  return postRequest("/user/admin/edit", params);
+};
+// 启用用户
+export const enableUser = (id, params) => {
+  return postRequest(`/user/admin/enable/${id}`, params);
+};
+// 禁用用户
+export const disableUser = (id, params) => {
+  return postRequest(`/user/admin/disable/${id}`, params);
+};
+// 删除用户
+export const deleteUser = (ids, params) => {
+  return deleteRequest(`/user/delByIds/${ids}`, params);
+};
+// 重置用户密码
+export const resetUserPass = params => {
+  return postRequest("/user/resetPass", params);
+};
+/****************************** 权限结束 */
+
+// 分页获取日志数据
+export const getLogListData = params => {
+  return getRequest("/log/getAllByPage", params);
+};
+// 分页获取消息数据
+export const getMessageData = params => {
+  return getRequest("/message/getByCondition", params);
+};
+// 获取单个消息详情
+export const getMessageDataById = (id, params) => {
+  return getRequest(`/message/get/${id}`, params);
+};
+// 添加消息
+export const addMessage = params => {
+  return postRequest("/message/add", params);
+};
+// 编辑消息
+export const editMessage = params => {
+  return postRequest("/message/edit", params);
+};
+// 回收站还原消息
+export const reductionMessage = (ids, params) => {
+  return putRequest(`/message/${ids}/reduction`, params);
+};
+// 彻底删除消息
+export const clearMessage = (ids, params) => {
+  return deleteRequest(`/message/${ids}`, params);
+};
+// 已读消息放入回收站
+export const deleteMessage = (ids, params) => {
+  return deleteRequest(`/message/${ids}/delete`, params);
+};
+// 分页获取消息推送数据
+export const getMessageSendData = params => {
+  return getRequest("/message", params);
+};
+// 进入消息中心首次加载全部数据
+export const getAllMessage = params => {
+  return getRequest("/message/all", params);
+};
+// 已读消息
+export const read = (id) => {
+  return putRequest(`/message/${id}/read`);
+};
+// 删除发送消息
+export const deleteMessageSend = (ids, params) => {
+  return deleteRequest(`/messageSend/delByIds/${ids}`, params);
+};
+
+// 分页获取文件数据
+export const getFileListData = params => {
+  return getRequest("/file", params);
+};
+
+
+// 复制文件
+export const copyFile = params => {
+  return postRequest("/file/copy", params);
+};
+// 重命名文件
+export const renameFile = params => {
+  return postRequest("/file/rename", params);
+};
+// 删除文件
+export const deleteFile = (ids, params) => {
+  return deleteRequest(`/file/delete/${ids}`, params);
+};
+// 下载文件
+export const aliDownloadFile = (fKey, params) => {
+  return getRequest(`/file/ali/download/${fKey}`, params);
+};
+
+
+// base64上传
+export const base64Upload = params => {
+  return postRequest("/upload/file", params);
+};
+
+
+
+
+// 添加商品计量单位
+export const addGoodsUnit = (params) => {
+  return postRequest(`/goods/goodsUnit`, params);
+};
+// 分页获取商品计量单位
+export const getGoodsUnitPage = (params) => {
+  return getRequest(`/goods/goodsUnit`, params);
+};
+// 编辑商品计量单位
+export const updateGoodsUnit = (id, params) => {
+  return putRequest(`/goods/goodsUnit/${id}`, params);
+};
+// 删除商品计量单位
+export const delGoodsUnit = (ids) => {
+  return deleteRequest(`/goods/goodsUnit/delete/${ids}`);
+};
+
+//
+export const handleRefreshToken = (token) => {
+  return getRequestWithNoToken(`/login/refresh/${token}`);
+};
+
+
diff --git a/seller/src/api/logistics.js b/seller/src/api/logistics.js
new file mode 100644
index 00000000..e08c989d
--- /dev/null
+++ b/seller/src/api/logistics.js
@@ -0,0 +1,34 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  importRequest,
+  getRequestWithNoToken
+} from "@/libs/axios";
+
+
+
+// 分页获取物流公司
+export const getLogisticsPage = params => {
+  return getRequest(`/logistics/getByPage`, params);
+};
+// 删除
+export const delLogistics = id => {
+  return deleteRequest(`/logistics/delete/${id}`);
+};
+// 添加
+export const addLogistics = params => {
+  return postRequest(`/logistics/save`,params);
+};
+// 通过id查询详情
+export const getLogisticsDetail = id => {
+  return getRequest(`/logistics/get/${id}`);
+};
+// 编辑
+export const updateLogistics = (id,params) => {
+  return putRequest(`/logistics/${id}`,params);
+};
+
+
diff --git a/seller/src/api/member.js b/seller/src/api/member.js
new file mode 100644
index 00000000..61573102
--- /dev/null
+++ b/seller/src/api/member.js
@@ -0,0 +1,91 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, putRequest, postRequest} from "@/libs/axios";
+
+// 分页获取会员评价
+export const getMemberReview = params => {
+  return getRequest("/memberEvaluation", params);
+};
+
+// 根据id获取评价详情
+export const getMemberInfoReview = id => {
+  return getRequest(`/memberEvaluation/get/${id}`);
+};
+
+//回复评价信息
+export const replyMemberReview = (id, params) => {
+  return putRequest(`/memberEvaluation/reply/${id}`, params);
+};
+
+// 获取会员注册统计列表
+export const getStatisticsList = params => {
+  return getRequest("/statistics/view/list", params);
+};
+
+//   获取分页
+export const getMember = params => {
+  return getRequest("/member/getByPage", params);
+};
+
+
+//  添加或修改
+export const insertOrUpdateSpec = params => {
+  return postRequest("/memberNoticeSenter/insertOrUpdate", params);
+};
+//删除gUI个
+export const delSpec = (id, params) => {
+  return deleteRequest(`/goods/spec/del/${id}`, params);
+};
+
+//  获取会员列表
+export const getMemberListData = params => {
+  return getRequest("/member", params);
+};
+
+//  获取会员详情
+export const getMemberInfoData = id => {
+  return getRequest(`/member/${id}`);
+};
+
+//  修改会员基本信息
+export const updateMember = params => {
+  return putRequest(`/member`, params);
+};
+
+//  添加会员基本信息
+export const addMember = params => {
+  return postRequest(`/member`, params);
+};
+
+//  获取会员列表
+export const getMemberAll = () => {
+  return getRequest("/member/getAll");
+};
+
+//  增加或修改会员列表
+export const operationMemberListData = params => {
+  return postRequest("/member/insertOrUpdate", params);
+};
+
+//  增加或修改会员列表
+export const deleteMemberListData = ids => {
+  return deleteRequest(`/member/delByIds/${ids}`);
+};
+// 获取充值记录列表数据
+export const getUserRecharge = params => {
+  return getRequest("/recharge", params);
+};
+
+// 获取预存款明细列表数据
+export const getUserDeposit = params => {
+  return getRequest("/deposit", params);
+};
+
+// 获取提现申请列表数据
+export const getUserWithdrawApply = params => {
+  return getRequest("/members/withdraw-apply", params);
+};
+
+// 审核提现申请
+export const withdrawApply = params => {
+  return postRequest("/members/withdraw-apply", params);
+};
diff --git a/seller/src/api/open.js b/seller/src/api/open.js
new file mode 100644
index 00000000..afccf925
--- /dev/null
+++ b/seller/src/api/open.js
@@ -0,0 +1,48 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+
+
+// 认证
+export const authorize = (params) => {
+    return getRequest('/oauth2/authorize', params)
+}
+// 认证过
+export const authorized = (params) => {
+    return getRequest('/oauth2/authorized', params)
+}
+// 获取token
+export const token = (params) => {
+    return getRequest('/oauth2/token', params)
+}
+// 获取user信息
+export const user = (params) => {
+    return getRequest('/oauth2/user', params)
+}
+
+// 获取随机secretKey
+export const getSecretKey = (params) => {
+    return getRequest('/client/getSecretKey', params)
+}
+// 获取客户端
+export const getClientDataList = (params) => {
+    return getRequest('/client/getByCondition', params)
+}
+// 添加客户端
+export const addClient = (params) => {
+    return postRequest('/client/save', params)
+}
+// 编辑客户端
+export const updateClient = (params) => {
+    return putRequest('/client/update', params)
+}
+// 删除客户端
+export const deleteClient = (ids, params) => {
+    return deleteRequest(`/client/delByIds/${ids}`, params)
+}
+
+
+
+
+
+
+
diff --git a/seller/src/api/order.js b/seller/src/api/order.js
new file mode 100644
index 00000000..f18c4d2c
--- /dev/null
+++ b/seller/src/api/order.js
@@ -0,0 +1,116 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest} from '@/libs/axios';
+
+
+// 获取普通订单列表
+export const getOrderList = (params) => {
+  return getRequest(`/orders`, params)
+}
+
+// 获取普通订单详细信息
+export const getOrderDetail = (sn) => {
+  return getRequest(`/orders/${sn}`)
+}
+
+// 调整订单金额
+export const modifyOrderPrice = (sn, params) => {
+  return putRequest(`/orders/update/${sn}/price`, params)
+}
+
+// 取消订单
+export const cancelOrder = (sn, params) => {
+  return postRequest(`/orders/${sn}/cancel`, params)
+}
+
+// 修改收货地址
+export const editOrderConsignee = (sn, params) => {
+  return postRequest(`/orders/update/${sn}/consignee`, params)
+}
+//获取投诉列表
+export const getComplainPage = (params) => {
+  return getRequest(`/complain`, params)
+}
+
+//获取投诉详情
+export const getComplainDetail = (id) => {
+  return getRequest(`/complain/${id}`)
+}
+
+//添加交易投诉对话
+export const addOrderComplaint = (params) => {
+  return postRequest(`/complain/communication/`, params)
+}
+
+//添加交易投诉对话
+export const appeal = (params) => {
+  return putRequest(`/complain/appeal`, params)
+}
+
+//获取订单日志
+export const getOrderLog = (sn, params) => {
+  return getRequest(`/orderLog/${sn}`, params)
+}
+
+// 订单发货
+export const orderDelivery = (sn, params) => {
+  return postRequest(`/orders/${sn}/delivery`, params)
+}
+
+// 获取商家选中的物流公司
+export const getLogisticsChecked = () => {
+  return getRequest(`/logistics/getChecked`)
+}
+
+// 订单核验
+export const orderTake = (sn, params) => {
+  return postRequest(`/orders/${sn}/take`, params)
+}
+
+// 售后服务单
+export const afterSaleOrderPage = (params) => {
+  return getRequest(`/afterSale/page`, params)
+}
+
+// 售后服务单详情
+export const afterSaleOrderDetail = (sn) => {
+  return getRequest(`/afterSale/${sn}`)
+}
+
+// 商家审核
+export const afterSaleSellerReview = (sn, params) => {
+  return putRequest(`/afterSale/review/${sn}`, params)
+}
+
+// 商家确认收货
+export const afterSaleSellerConfirm = (sn, params) => {
+  return putRequest(`/afterSale/confirm/${sn}`, params)
+}
+
+// 商家换货业务发货
+export const afterSaleSellerDelivery = (sn, params) => {
+  return postRequest(`/afterSale/${sn}/delivery`, params)
+}
+//查询物流
+export const getTraces = (sn, params) => {
+  return postRequest(`/orders/getTraces/${sn}`, params)
+}
+//售后单查询物流
+export const getSellerDeliveryTraces = (sn, params) => {
+  return getRequest(`/afterSale/getSellerDeliveryTraces/${sn}`, params)
+}
+//售后单查询物流
+export const getAfterSaleTraces = (sn, params) => {
+  return getRequest(`/afterSale/getDeliveryTraces/${sn}`, params)
+}
+//获取发票列表
+export const getReceiptPage = (params) => {
+  return getRequest(`/receipt`, params)
+}
+
+//获取发票列表
+export const invoicing = (id) => {
+  return postRequest(`receipt/${id}/invoicing`)
+}
+
+
+
diff --git a/seller/src/api/other.js b/seller/src/api/other.js
new file mode 100644
index 00000000..fd8c5ce1
--- /dev/null
+++ b/seller/src/api/other.js
@@ -0,0 +1,69 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  importRequest,
+  getRequestWithNoToken,
+  putRequestWithNoForm,
+  postRequestWithNoForm,
+} from "@/libs/axios";
+
+/**
+ * 楼层装修设置
+ *
+ */
+export const setHomeSetup = params => {
+
+  return postRequest("/pageData/add", params);
+};
+
+/**
+ * 获取页面信息
+ *
+ */
+export const getHomeData = params => {
+
+  return getRequest(`/pageData/${params}`);
+};
+
+
+/**
+ * 查询楼层装修
+ *
+ */
+export const getHomeList = params => {
+
+  return getRequest("/pageData/pageDataList", params);
+};
+
+
+/**
+ * 修改楼层装修
+ *
+ */
+export const updateHome = (id,params) => {
+
+  return putRequest(`/pageData/update/${id}`, params);
+};
+
+/**
+ * 删除楼层装修
+ *
+ */
+export const removePageHome = (id) => {
+
+  return deleteRequest(`/pageData/removePageData/${id}`);
+};
+
+
+/**
+ * 发布页面
+ *
+ */
+export const releasePageHome = (id) => {
+
+  return putRequest(`/pageData/releasePageData`,id);
+};
+
diff --git a/seller/src/api/pages.js b/seller/src/api/pages.js
new file mode 100644
index 00000000..f3879c77
--- /dev/null
+++ b/seller/src/api/pages.js
@@ -0,0 +1,113 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
+
+//保存导航栏
+export const save = (params) => {
+    return postRequest('/siteNavigation/save', params)
+}
+//保存导航栏
+export const update = (params) => {
+    return postRequest('/siteNavigation/update', params)
+}
+//查询导航栏
+export const getNavigationData = (params) => {
+    return getRequest('/siteNavigation/getByPage', params)
+}
+//禁用导航栏
+export const disableNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/disable/${ids}`)
+}
+//启用导航栏
+export const enableNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/enable/${ids}`)
+}
+//删除导航栏
+export const delNavigation = (ids) => {
+    return deleteRequest(`/siteNavigation/remove/${ids}`)
+}
+
+//
+export const saveFocus = (params) => {
+    return deleteRequest('/siteNavigation/remove/${ids}', params)
+}
+
+//查询焦点图
+export const getFocusData = (params) => {
+    return getRequest('/focus/getByPage', params)
+}
+//查询焦点图
+export const saveFocusData = (params) => {
+    return postRequest('/focus/insertOrUpdate', params)
+}
+//禁用导航栏
+export const disableFocus = (ids) => {
+    return putRequest(`/focus/disable/${ids}`)
+}
+//启用导航栏
+export const enableFocus = (ids) => {
+    return putRequest(`/focus/enable/${ids}`)
+}
+//删除导航栏
+export const delFocus = (ids) => {
+    return deleteRequest(`/focus/delByIds/${ids}`)
+}
+
+//根据店铺编号查询页面数据（店铺编号为0则为平台）
+export const getPageData = (id) => {
+    return getRequest(`/page/get/${id}`)
+}
+
+//保存页面数据
+export const savePageData = (params) => {
+    return postRequest('/page/insertOrUpdate', params)
+}
+//获取分类列表数据
+export const getArticleCategory = (parent_id) => {
+  return getRequest(`/article-category/${parent_id}/all-children`)
+}
+//文章分类添加
+export const saveArticleCategory = (params) => {
+    return postRequest('/article-category', params)
+}
+
+//删除文章分类
+export const delArticleCategory = (id) => {
+    return deleteRequest(`/article-category/${id}`)
+}
+//修改文章分类
+export const updateArticleCategory = (params, id) => {
+    return putRequest(`/article-category/update/${id}`, params)
+}
+//文章添加
+export const saveArticle = (params) => {
+    return postRequest('/article', params)
+}
+//文章修改
+export const updateArticle = (params) => {
+    return putRequest(`/article/update/${params.id}`, params)
+}
+//查看文章
+export const seeArticle = (id) => {
+    return getRequest(`/article/${id}`)
+}
+//获取文章列表数据
+export const getArticle = (params) => {
+    return getRequest('/article/getByPage', params)
+}
+
+
+
+
+//删除文章数据
+export const delArticle = (ids) => {
+    return deleteRequest(`/article/delByIds/${ids}`)
+}
+
+
+
+
+
+
+
+
+
diff --git a/seller/src/api/platform.js b/seller/src/api/platform.js
new file mode 100644
index 00000000..71a4214a
--- /dev/null
+++ b/seller/src/api/platform.js
@@ -0,0 +1,15 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken } from '@/libs/axios';
+
+// 验证码渲染图片接口
+export const drawCodeImage = "/lili/common/captcha/draw/"
+
+
+// 获取kuaidi配置
+export const getParams = (params) => {
+    return getRequest('/platformSetting/get/'+params)
+}
+// 编辑kuaidi配置
+export const editParams = (params,method) => {
+    return postRequest('/platformSetting/insertOrUpdate/'+method, params)
+}
\ No newline at end of file
diff --git a/seller/src/api/promotion.js b/seller/src/api/promotion.js
new file mode 100644
index 00000000..aaa436a5
--- /dev/null
+++ b/seller/src/api/promotion.js
@@ -0,0 +1,131 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+
+// 获取拼团列表
+export const getPintuanList = (params) => {
+    return getRequest('/promotion/pintuan', params)
+}
+// 新建 拼团
+export const savePintuan = (params) => {
+    return postRequest('/promotion/pintuan', params,{'Content-type': 'application/json'})
+}
+// 编辑 拼团
+export const editPintuan = (params) => {
+    return putRequest('/promotion/pintuan', params,{'Content-type': 'application/json'})
+}
+// 手动开启拼团活动
+export const openPintuan = (pintuanId, params) => {
+    return putRequest(`/promotion/pintuan/open/${pintuanId}`, params)
+}
+
+// 手动关闭拼团活动
+export const closePintuan = (pintuanId) => {
+    return putRequest(`/promotion/pintuan/close/${pintuanId}`)
+}
+
+// 删除拼团活动
+export const deletePintuan = (pintuanId) => {
+    return deleteRequest(`/promotion/pintuan/${pintuanId}`)
+}
+
+// 根据id获取拼团信息
+export const getPintuanDetail = (id) => {
+    return getRequest(`/promotion/pintuan/${id}`)
+}
+
+// 获取拼团商品列表
+export const getPintuanGoodsList = (params) => {
+    return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`,params)
+}
+
+// 新增优惠券
+export const saveShopCoupon = (params) => {
+    return postRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+}
+
+// 修改优惠券
+export const editShopCoupon = (params) => {
+    return putRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+}
+
+// 获取优惠券列表
+export const getShopCouponList = (params) => {
+    return getRequest('/promotion/coupon', params)
+}
+
+//  更新优惠券状态
+export const updateCouponStatus = ( params) => {
+    return putRequest(`/promotion/coupon/status`, params)
+}
+
+//  作废优惠券
+export const deleteShopCoupon = (ids) => {
+    return deleteRequest(`/promotion/coupon/${ids}`)
+}
+//  上架优惠券
+export const upShopCoupon = (ids, params) => {
+    return postRequest(`/promotion/coupon/up/${ids}`, params)
+}
+//  获取单个优惠券
+export const getShopCoupon = (id) => {
+    return getRequest(`/promotion/coupon/${id}`)
+}
+
+// 获取优惠券领取详情
+export const getMemberReceiveCouponList = (id) => {
+    return getRequest(`/promotion/memberCoupon/getByPage/${id}`)
+}
+//  作废会员优惠券
+export const deleteMemberReceiveCoupon = (ids, params) => {
+    return deleteRequest(`/promotion/memberCoupon/delByIds/${ids}`, params)
+}
+
+// 限时秒杀活动列表
+export const seckillList = (params) => {
+    return getRequest(`/promotion/seckill`,params)
+}
+
+// 限时秒杀活动商品
+export const seckillGoodsList = (params) => {
+    return getRequest(`/promotion/seckill/apply`,params)
+}
+
+// 添加限时抢购 商品
+export const setSeckillGoods = (params) => {
+    return postRequest(`/promotion/seckill/apply/${params.seckillId}`,params.applyVos,{'Content-type': 'application/json'})
+}
+
+// 添加限时抢购 商品
+export const removeSeckillGoods = (seckillId, ids) => {
+    return deleteRequest(`/promotion/seckill/apply/${seckillId}/${ids}`)
+}
+
+// 限时秒杀活动详情
+export const seckillDetail = (seckillId) => {
+    return getRequest(`/promotion/seckill/${seckillId}`)
+}
+
+// 满减满赠活动列表
+export const getFullDiscountList = (params) => {
+    return getRequest(`/promotion/fullDiscount`,params)
+}
+
+// 新增满减活动
+export const newFullDiscount = (params) => {
+    return postRequest(`/promotion/fullDiscount`,params,{'Content-type': 'application/json'})
+}
+
+// 编辑满减活动
+export const editFullDiscount = (params) => {
+    return putRequest(`/promotion/fullDiscount`,params,{'Content-type': 'application/json'})
+}
+
+// 通过id获取满减活动
+export const getFullDiscountById = (id) => {
+    return getRequest(`/promotion/fullDiscount/${id}`)
+}
+
+// 删除满减活动
+export const delFullDiscount = (id) => {
+    return deleteRequest(`/promotion/fullDiscount/${id}`)
+}
\ No newline at end of file
diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js
new file mode 100644
index 00000000..67146076
--- /dev/null
+++ b/seller/src/api/shops.js
@@ -0,0 +1,123 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
+
+// Vaptcha ID
+export const vaptchaID = "5dce36188713b71e70a41eb7"
+// 文件上传接口
+export const uploadFile = "/upload/file"
+// 验证码渲染图片接口
+export const drawCodeImage = "/common/captcha/draw/"
+// 获取菜单
+export const getMenuList = "/permission/getMenuList"
+// 获取数据字典
+export const getDictData = "/dictData/getByType/"
+// Websocket
+export const ws = "/ws"
+
+
+//查询店铺列表
+export const getShopListData = (params) => {
+  return getRequest('/shop', params)
+}
+// 获取结算单分页
+export const getBillPage = (params) => {
+  return getRequest(`/bill/getByPage`, params)
+}
+
+// 获取商家结算单流水分页
+export const getSellerFlow = (id, params) => {
+  return getRequest(`/bill/${id}/getStoreFlow`, params)
+}
+
+// 商家核对结算单
+export const reconciliation = (id, params) => {
+  return putRequest(`/bill/check/${id}/`, params)
+}
+
+// 获取商家分销订单流水分页
+export const getDistributionFlow = (id, params) => {
+  return getRequest(`/bill/${id}/getDistributionFlow`, params)
+}
+
+// 获取商家结算单详细
+export const getBillDetail = (id, params) => {
+  return getRequest(`/bill/get/${id}`, params)
+}
+
+// 获取所有物流公司
+export const getLogistics = (id, params) => {
+  return getRequest(`/logistics`, params)
+}
+
+// 开启物流公司
+export const logisticsChecked = (id, params) => {
+  return postRequest(`/logistics/${id}`, params)
+}
+
+// 关闭开启物流公司
+export const logisticsUnChecked = (id, params) => {
+  return deleteRequest(`/logistics/${id}`, params)
+}
+// 获取商家自提点
+export const getShopAddress = (id, params) => {
+  return getRequest(`/storeAddress/`, params)
+}
+
+// 修改商家自提点
+export const editShopAddress = (id, params) => {
+  return putRequest(`/storeAddress/${id}`, params)
+}
+
+// 添加商品自提点
+export const addShopAddress = (params) => {
+  return postRequest(`/storeAddress/`, params)
+}
+
+// 添加商品自提点
+export const deleteShopAddress = (id) => {
+  return deleteRequest(`/storeAddress/${id}`)
+}
+
+// 获取商家详细信息
+export const getShopInfo = () => {
+  return getRequest(`/settings`)
+}
+
+// 保存商家详细信息
+export const saveShopInfo = (params) => {
+  return putRequest(`/settings`, params)
+}
+
+//获取商家退货地址
+export const getRefundGoodsAddress = () => {
+  return getRequest(`/settings/storeAfterSaleAddress`)
+}
+//修改商家退货地址
+export const saveRefundGoodsAddress = (params) => {
+  return putRequest(`/settings/storeAfterSaleAddress`, params)
+}
+
+//修改保存库存预警数
+export const updateStockWarning = (params) => {
+  return putRequest(`/settings/updateStockWarning`, params)
+}
+//查询运费模板
+export const getShipTemplate = () => {
+  return getRequest(`/freightTemplate`)
+}
+//删除运费模板
+export const deleteShipTemplate = (id) => {
+  return deleteRequest(`/freightTemplate/${id}`)
+}
+//新增运费模板
+export const addShipTemplate = (params, headers) => {
+  return postRequest(`/freightTemplate`, params, headers)
+}
+
+//新增运费模板
+export const editShipTemplate = (id, params, headers) => {
+  return putRequest(`/freightTemplate/${id}`, params, headers)
+}
+
+
+
diff --git a/seller/src/api/statistics.js b/seller/src/api/statistics.js
new file mode 100644
index 00000000..d6a8666a
--- /dev/null
+++ b/seller/src/api/statistics.js
@@ -0,0 +1,20 @@
+// 统一请求路径前缀在libs/axios.js中修改
+import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
+
+//商品统计
+export const getGoodsStatisticsData = (params) => {
+  return getRequest(`/statistics/goods`, params)
+}
+
+//获取订单统计金额
+export const getOrderStatisticsPrice = (params) => {
+  return getRequest(`/statistics/order/getPrice`, params)
+}
+
+//订单统计列表
+export const getOrderStatistics = (params) => {
+  return getRequest(`/statistics/order/getByPage`, params)
+}
+
+
+
diff --git a/seller/src/assets/background.png b/seller/src/assets/background.png
new file mode 100644
index 00000000..aa00436e
Binary files /dev/null and b/seller/src/assets/background.png differ
diff --git a/seller/src/assets/background.svg b/seller/src/assets/background.svg
new file mode 100644
index 00000000..6a9539d7
--- /dev/null
+++ b/seller/src/assets/background.svg
@@ -0,0 +1 @@
+<svg height="100%" width="100%" id="svg" viewBox="0 0 1440 400" xmlns="http://www.w3.org/2000/svg" class="transition duration-300 ease-in-out delay-150"><defs><linearGradient id="gradient"><stop offset="5%" stop-color="#fab741ff"></stop><stop offset="95%" stop-color="#f78da7ff"></stop></linearGradient></defs><path d="M 0,400 C 0,400 0,200 0,200 C 45.64618509382542,216.47686725610436 91.29237018765085,232.9537345122087 133,241 C 174.70762981234915,249.0462654877913 212.47670434322208,248.66192920726948 257,220 C 301.5232956567779,191.33807079273052 352.80081243946097,134.39854865871342 396,148 C 439.19918756053903,161.60145134128658 474.3200458989338,245.7438761578768 511,266 C 547.6799541010662,286.2561238421232 585.9190039648037,242.62594670977953 635,230 C 684.0809960351963,217.37405329022047 744.0039382418512,235.75233700300504 792,247 C 839.9960617581488,258.24766299699496 876.0652430677914,262.3647052782003 912,253 C 947.9347569322086,243.63529472179968 983.7350894869837,220.78884188419372 1025,189 C 1066.2649105130163,157.21115811580628 1112.9943989842734,116.47992718502479 1162,127 C 1211.0056010157266,137.5200728149752 1262.2873145759218,199.2914493757072 1309,220 C 1355.7126854240782,240.7085506242928 1397.8563427120391,220.3542753121464 1440,200 C 1440,200 1440,400 1440,400 Z" stroke="none" stroke-width="0" fill="url(#gradient)" class="transition-all duration-300 ease-in-out delay-150"></path></svg>
diff --git a/seller/src/assets/dashboard/console.png b/seller/src/assets/dashboard/console.png
new file mode 100644
index 00000000..4eec7618
Binary files /dev/null and b/seller/src/assets/dashboard/console.png differ
diff --git a/seller/src/assets/dashboard/department.png b/seller/src/assets/dashboard/department.png
new file mode 100644
index 00000000..52d61492
Binary files /dev/null and b/seller/src/assets/dashboard/department.png differ
diff --git a/seller/src/assets/dashboard/fee.png b/seller/src/assets/dashboard/fee.png
new file mode 100644
index 00000000..a745dd49
Binary files /dev/null and b/seller/src/assets/dashboard/fee.png differ
diff --git a/seller/src/assets/dashboard/user.png b/seller/src/assets/dashboard/user.png
new file mode 100644
index 00000000..2e755b1f
Binary files /dev/null and b/seller/src/assets/dashboard/user.png differ
diff --git a/seller/src/assets/decorate/delete.png b/seller/src/assets/decorate/delete.png
new file mode 100644
index 00000000..eff5bc3f
Binary files /dev/null and b/seller/src/assets/decorate/delete.png differ
diff --git a/seller/src/assets/decorate/edit.png b/seller/src/assets/decorate/edit.png
new file mode 100644
index 00000000..9d639a9f
Binary files /dev/null and b/seller/src/assets/decorate/edit.png differ
diff --git a/seller/src/assets/decorate/phone.png b/seller/src/assets/decorate/phone.png
new file mode 100644
index 00000000..9bab6a44
Binary files /dev/null and b/seller/src/assets/decorate/phone.png differ
diff --git a/seller/src/assets/decorate/poplarGoods.png b/seller/src/assets/decorate/poplarGoods.png
new file mode 100644
index 00000000..b3b2a7ab
Binary files /dev/null and b/seller/src/assets/decorate/poplarGoods.png differ
diff --git a/seller/src/assets/festival_icon.png b/seller/src/assets/festival_icon.png
new file mode 100644
index 00000000..eec2f202
Binary files /dev/null and b/seller/src/assets/festival_icon.png differ
diff --git a/seller/src/assets/iPhoneX_model.png b/seller/src/assets/iPhoneX_model.png
new file mode 100644
index 00000000..bca24f1e
Binary files /dev/null and b/seller/src/assets/iPhoneX_model.png differ
diff --git a/seller/src/assets/img-error.png b/seller/src/assets/img-error.png
new file mode 100644
index 00000000..dada769a
Binary files /dev/null and b/seller/src/assets/img-error.png differ
diff --git a/seller/src/assets/lili.png b/seller/src/assets/lili.png
new file mode 100644
index 00000000..9335dee1
Binary files /dev/null and b/seller/src/assets/lili.png differ
diff --git a/seller/src/assets/loading.gif b/seller/src/assets/loading.gif
new file mode 100644
index 00000000..cc66fd30
Binary files /dev/null and b/seller/src/assets/loading.gif differ
diff --git a/seller/src/assets/loading2.gif b/seller/src/assets/loading2.gif
new file mode 100644
index 00000000..2a07a208
Binary files /dev/null and b/seller/src/assets/loading2.gif differ
diff --git a/seller/src/assets/loading3.gif b/seller/src/assets/loading3.gif
new file mode 100644
index 00000000..f1d2d763
Binary files /dev/null and b/seller/src/assets/loading3.gif differ
diff --git a/seller/src/assets/logo-min.png b/seller/src/assets/logo-min.png
new file mode 100644
index 00000000..6de196a8
Binary files /dev/null and b/seller/src/assets/logo-min.png differ
diff --git a/seller/src/assets/logo.png b/seller/src/assets/logo.png
new file mode 100644
index 00000000..993ca619
Binary files /dev/null and b/seller/src/assets/logo.png differ
diff --git a/seller/src/assets/logo1.png b/seller/src/assets/logo1.png
new file mode 100644
index 00000000..6fba9abe
Binary files /dev/null and b/seller/src/assets/logo1.png differ
diff --git a/seller/src/assets/nav/1.jpg b/seller/src/assets/nav/1.jpg
new file mode 100644
index 00000000..de03b9f6
Binary files /dev/null and b/seller/src/assets/nav/1.jpg differ
diff --git a/seller/src/assets/nav/2.jpg b/seller/src/assets/nav/2.jpg
new file mode 100644
index 00000000..29bce4bb
Binary files /dev/null and b/seller/src/assets/nav/2.jpg differ
diff --git a/seller/src/assets/nav/3.jpg b/seller/src/assets/nav/3.jpg
new file mode 100644
index 00000000..433e4f4a
Binary files /dev/null and b/seller/src/assets/nav/3.jpg differ
diff --git a/seller/src/assets/nav/4.jpg b/seller/src/assets/nav/4.jpg
new file mode 100644
index 00000000..64083220
Binary files /dev/null and b/seller/src/assets/nav/4.jpg differ
diff --git a/seller/src/assets/nav/5.jpg b/seller/src/assets/nav/5.jpg
new file mode 100644
index 00000000..4265656d
Binary files /dev/null and b/seller/src/assets/nav/5.jpg differ
diff --git a/seller/src/assets/nav/nav_showimg1.jpg b/seller/src/assets/nav/nav_showimg1.jpg
new file mode 100644
index 00000000..f13f536e
Binary files /dev/null and b/seller/src/assets/nav/nav_showimg1.jpg differ
diff --git a/seller/src/assets/nav/nav_showimg2.jpg b/seller/src/assets/nav/nav_showimg2.jpg
new file mode 100644
index 00000000..9def75e0
Binary files /dev/null and b/seller/src/assets/nav/nav_showimg2.jpg differ
diff --git a/seller/src/assets/play.png b/seller/src/assets/play.png
new file mode 100644
index 00000000..49fad9f5
Binary files /dev/null and b/seller/src/assets/play.png differ
diff --git a/seller/src/assets/seckillBg.png b/seller/src/assets/seckillBg.png
new file mode 100644
index 00000000..16415eaf
Binary files /dev/null and b/seller/src/assets/seckillBg.png differ
diff --git a/seller/src/assets/selected.png b/seller/src/assets/selected.png
new file mode 100644
index 00000000..0c751f7f
Binary files /dev/null and b/seller/src/assets/selected.png differ
diff --git a/seller/src/assets/title.png b/seller/src/assets/title.png
new file mode 100644
index 00000000..41f68d8c
Binary files /dev/null and b/seller/src/assets/title.png differ
diff --git a/seller/src/assets/vaptcha-loading.gif b/seller/src/assets/vaptcha-loading.gif
new file mode 100644
index 00000000..08010d23
Binary files /dev/null and b/seller/src/assets/vaptcha-loading.gif differ
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
new file mode 100644
index 00000000..23c53700
--- /dev/null
+++ b/seller/src/config/index.js
@@ -0,0 +1,48 @@
+export default {
+  /**
+   * @description 配置显示在浏览器标签的title
+   */
+  title: "Lili电商",
+  /**
+   * @description token在Cookie中存储的天数，默认1天
+   */
+  cookieExpires: 1,
+  /**
+   * @description 是否使用国际化，默认为false
+   *              如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
+   *              用来在菜单中显示文字
+   */
+  useI18n: true,
+
+  /**
+   * @description api请求基础路径
+   */
+  api_dev: {
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn',
+    // common: 'http://192.168.0.103:9000',
+
+    // seller: 'http://192.168.0.103:8889',
+  },
+  api_prod: {
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+  },
+  /**
+   *  @description api请求基础路径前缀
+   */
+  baseUrlPrefix: "/store",
+  /**
+   * @description 需要加载的插件
+   */
+  plugin: {
+    "error-store": {
+      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
+      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
+    }
+  }
+};
diff --git a/seller/src/libs/RegExp.js b/seller/src/libs/RegExp.js
new file mode 100644
index 00000000..bb823209
--- /dev/null
+++ b/seller/src/libs/RegExp.js
@@ -0,0 +1,47 @@
+/**
+ * 各种正则表达式
+ * mobile   手机号
+ * email    电子邮箱
+ * password 密码【6-20位】
+ * integer  正整数【不包含0】
+ * money    金钱
+ * TINumber 纳税识别号
+ * IDCard   身份证
+ * userName 账户名称【汉字、字母、数字、“-”、“_”的组合】
+ * URL      URL
+ * TEL      固定电话
+ */
+
+// 手机号
+export const mobile = /^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/
+
+// 电子邮箱
+export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+// 密码【6-20位】
+export const password = /^[@A-Za-z0-9!#$%^&*.~,]{6,20}$/
+
+// 正整数【不包含0】
+export const integer = /^[1-9]\d*$/
+
+// 正整数【包含0】
+export const Integer = /^[0-9]\d*$/
+
+// 金钱
+export const money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+
+// 纳税识别号
+export const TINumber = /^((\d{6}[0-9A-Z]{9})|([0-9A-Za-z]{2}\d{6}[0-9A-Za-z]{10,12}))$/
+
+// 身份证
+export const IDCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+
+// 账户名称【汉字、字母、数字、“-”、“_”的组合】
+export const userName = /[A-Za-z0-9_\-\u4e00-\u9fa5]$/
+
+// URL
+export const URL =
+  /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+
+// 固话
+export const TEL = /0\d{2,3}-\d{7,8}/
diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js
new file mode 100644
index 00000000..23a4b710
--- /dev/null
+++ b/seller/src/libs/axios.js
@@ -0,0 +1,337 @@
+import axios from "axios";
+import config from "@/config";
+import { getStore, setStore } from "./storage";
+import { router } from "../router/index";
+import { Message } from "view-design";
+import Cookies from "js-cookie";
+import {handleRefreshToken} from "@/api/index"
+
+// 统一请求路径前缀
+export const baseUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller) + config.baseUrlPrefix;
+export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common);
+
+var isRefreshToken = 0;
+const refreshToken = getTokenDebounce()
+const service = axios.create({
+  timeout: 10000,
+  baseURL: baseUrl
+})
+service.interceptors.request.use(
+  config => {
+    if (config.method == 'get') {
+      config.params = {
+        _t: Date.parse(new Date()) / 1000,
+        ...config.params
+      }
+    }
+    return config;
+  },
+  err => {
+    Message.error("请求超时");
+    return Promise.resolve(err);
+  }
+);
+
+// http response 拦截器
+service.interceptors.response.use(
+  response => {
+    const data = response.data;
+    // 根据返回的code值来做不同的处理(和后端约定)
+    if (!data.success && data.message) {
+      Message.error(data.message);
+    }
+    switch (data.code) {
+      case 400:
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("系统异常");
+        }
+        break;
+      case 401:
+        // 未登录 清除已登录状态
+        Cookies.set("userInfo", "");
+        setStore("accessToken", "");
+        if (router.history.current.name != "login") {
+          if (data.message !== null) {
+            Message.error(data.message);
+          } else {
+            Message.error("未知错误，请重新登录");
+          }
+          router.push("/login");
+        }
+        break;
+      case 403:
+        // 权限不足
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("权限不足");
+        }
+        break;
+      case 500:
+        // 系统异常
+        if (data.message !== null) {
+          Message.error(data.message);
+        } else {
+          Message.error("系统异常");
+        }
+        break;
+      default:
+        return data;
+    }
+  },
+  async error => {
+    // 返回状态码不为200时候的错误处理
+
+    if (error.response) {
+      if (error.response.status === 401) {
+        // 这种情况一般调到登录页
+      } else if (error.response.status === 403) {
+        isRefreshToken++;
+        if(isRefreshToken === 1) {
+          const getTokenRes = await refreshToken();
+          if (getTokenRes === 'success') { // 刷新token
+            if (isRefreshToken === 1) {
+              error.response.config.headers.accessToken = getStore('accessToken')
+              return service(error.response.config)
+            } else {
+              router.go(0)
+            }
+          } else {
+            Cookies.set("userInfo", "");
+            router.push('/login')
+          }
+          isRefreshToken = 0
+        }
+      } else {
+        // 其他错误处理
+        Message.error(error.response.data.message)
+      }
+    }
+
+    /* router.push("/login") */
+    return Promise.resolve(error);
+  }
+);
+
+// 防抖闭包来一波
+function getTokenDebounce() {
+  let lock = false
+  let success = false
+  return function () {
+    if (!lock) {
+      lock = true
+      let oldRefreshToken = getStore("refreshToken");
+      handleRefreshToken(oldRefreshToken).then(res => {
+        if (res.code === 200) {
+          let {
+            accessToken,
+            refreshToken
+          } = res.result;
+          setStore("accessToken", accessToken);
+          setStore("refreshToken", refreshToken);
+
+          success = true
+          lock = false
+        } else {
+          success = false
+          lock = false
+          // router.push('/login')
+        }
+      }).catch((err) => {
+        success = false
+        lock = false
+      })
+    }
+    return new Promise(resolve => {
+      // 一直看lock,直到请求失败或者成功
+      const timer = setInterval(() => {
+        if (!lock) {
+          clearInterval(timer)
+          if (success) {
+            resolve('success')
+          } else {
+            resolve('fail')
+          }
+        }
+      }, 500) // 轮询时间间隔
+    })
+  }
+}
+
+export const getRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "get",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const postRequest = (url, params, headers) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+    transformRequest: headers
+      ? undefined
+      : [
+          function(data) {
+            let ret = "";
+            for (let it in data) {
+              ret +=
+                encodeURIComponent(it) +
+                "=" +
+                encodeURIComponent(data[it]) +
+                "&";
+            }
+            ret = ret.substring(0, ret.length - 1);
+            return ret;
+          }
+        ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    }
+  });
+};
+
+/** 不带form表单不带transformRequest */
+export const postRequestWithNoForm = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+// export const postRequestWithHeaders = (url, params) => {
+//   let accessToken = getStore("accessToken");
+//   return axios({
+//     method: "post",
+//     url: `${url}`,
+//     data: params,
+
+//     headers: {
+//       accessToken: accessToken,
+//       "Content-Type": "application/x-www-form-urlencoded"
+//     }
+//   });
+// };
+
+export const putRequest = (url, params,headers) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "put",
+    url: `${url}`,
+    data: params,
+    transformRequest: headers
+    ? undefined
+    : [
+        function(data) {
+          let ret = "";
+          for (let it in data) {
+            ret +=
+              encodeURIComponent(it) +
+              "=" +
+              encodeURIComponent(data[it]) +
+              "&";
+          }
+          ret = ret.substring(0, ret.length - 1);
+          return ret;
+        }
+      ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    }
+  });
+};
+
+export const putRequestWithNoForm = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "put",
+    url: `${url}`,
+    data: params,
+
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const deleteRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "delete",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const importRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    data: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+export const uploadFileRequest = (url, params) => {
+  let accessToken = getStore("accessToken");
+  return service({
+    method: "post",
+    url: `${url}`,
+    params: params,
+    headers: {
+      accessToken: accessToken
+    }
+  });
+};
+
+/**
+ * 无需token验证的请求 避免旧token过期导致请求失败
+ * @param {*} url
+ * @param {*} params
+ */
+export const getRequestWithNoToken = (url, params) => {
+  return service({
+    method: "get",
+    url: `${url}`,
+    params: params
+  });
+};
+
+/**
+ * 无需token验证的请求 避免旧token过期导致请求失败
+ * @param {*} url
+ * @param {*} params
+ */
+export const postRequestWithNoToken = (url, params) => {
+  return service({
+    method: "post",
+    url: `${url}`,
+    params: params
+  });
+};
+
diff --git a/seller/src/libs/dictUtil.js b/seller/src/libs/dictUtil.js
new file mode 100644
index 00000000..9f3d0fbb
--- /dev/null
+++ b/seller/src/libs/dictUtil.js
@@ -0,0 +1,32 @@
+import axios from 'axios';
+import { getDictData } from '@/api/index';
+
+let dictUtil = {
+
+};
+
+// 获取常用的数据字典保存至vuex
+dictUtil.initDictData = function (vm) {
+    // axios.get(getDictData + "sex").then(res => {
+    //     if(res.success){
+    //         vm.$store.commit("setSex", res.result);
+    //     }
+    // });
+    // axios.get(getDictData + "message_type").then(res => {
+    //     if(res.success){
+    //         vm.$store.commit("setMessageType", res.result);
+    //     }
+    // });
+    // axios.get(getDictData + "priority").then(res => {
+    //     if(res.success){
+    //         vm.$store.commit("setPriority", res.result);
+    //     }
+    // });
+    // axios.get(getDictData + "leave_type").then(res => {
+    //     if(res.success){
+    //         vm.$store.commit("setLeaveType", res.result);
+    //     }
+    // });
+};
+
+export default dictUtil;
diff --git a/seller/src/libs/emoji.js b/seller/src/libs/emoji.js
new file mode 100644
index 00000000..8643b079
--- /dev/null
+++ b/seller/src/libs/emoji.js
@@ -0,0 +1,77 @@
+// 新浪表情包api https://api.weibo.com/2/emotions.json?source=1362404091
+export const sina = [
+    {
+        alt: "[坏笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/4d/2018new_huaixiao_org.png"
+    },
+    {
+        alt: "[笑cry]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/4a/2018new_xiaoku_org.png"
+    },
+    {
+        alt: "[拜拜]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/fd/2018new_baibai_org.png"
+    },
+    {
+        alt: "[微笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/e3/2018new_weixioa02_org.png"
+    },
+    {
+        alt: "[偷笑]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/71/2018new_touxiao_org.png"
+    },
+    {
+        alt: "[亲亲]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/2c/2018new_qinqin_org.png"
+    },
+    {
+        alt: "[太开心]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/1e/2018new_taikaixin_org.png"
+    },
+    {
+        alt: "[挤眼]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/43/2018new_jiyan_org.png"
+    },
+    {
+        alt: "[可怜]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/96/2018new_kelian_org.png"
+    },
+    {
+        alt: "[可爱]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/09/2018new_keai_org.png"
+    },
+    {
+        alt: "[doge]",
+        src: "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/a1/2018new_doge02_org.png"
+    },
+    {
+        alt: "[二哈]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/22/2018new_erha_org.png"
+    },
+    {
+        alt: "[喵喵]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/7b/2018new_miaomiao_org.png"
+    },
+    {
+        alt: "[摊手]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/62/2018new_tanshou_org.png"
+    },
+    {
+        alt: "[跪了]",
+        src:
+            "http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/75/2018new_gui_org.png"
+    }
+]
\ No newline at end of file
diff --git a/seller/src/libs/excel.js b/seller/src/libs/excel.js
new file mode 100644
index 00000000..4acb2791
--- /dev/null
+++ b/seller/src/libs/excel.js
@@ -0,0 +1,102 @@
+import XLSX from 'xlsx';
+
+function auto_width(ws, data){
+    /*set worksheet max width per col*/
+    const colWidth = data.map(row => row.map(val => {
+        /*if null/undefined*/
+        if (val == null) {
+            return {'wch': 10};
+        }
+        /*if chinese*/
+        else if (val.toString().charCodeAt(0) > 255) {
+            return {'wch': val.toString().length * 2};
+        } else {
+            return {'wch': val.toString().length};
+        }
+    }))
+    /*start in the first row*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+        for (let j = 0; j < colWidth[i].length; j++) {
+            if (result[j]['wch'] < colWidth[i][j]['wch']) {
+                result[j]['wch'] = colWidth[i][j]['wch'];
+            }
+        }
+    }
+    ws['!cols'] = result;
+}
+
+function json_to_array(key, jsonData){
+    return jsonData.map(v => key.map(j => { return v[j] }));
+}
+
+// fix data,return string
+function fixdata(data) {
+    let o = ''
+    let l = 0
+    const w = 10240
+    for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+    o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+    return o
+}
+
+// get head from excel file,return array
+function get_header_row(sheet) {
+    const headers = []
+    const range = XLSX.utils.decode_range(sheet['!ref'])
+    let C
+    const R = range.s.r /* start in the first row */
+    for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+        var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+        var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
+    }
+    return headers
+}
+
+export const export_table_to_excel= (id, filename) => {
+    const table = document.getElementById(id);
+    const wb = XLSX.utils.table_to_book(table);
+    XLSX.writeFile(wb, filename);
+}
+
+export const export_json_to_excel = ({data, key, title, filename, autoWidth}) => {
+    const wb = XLSX.utils.book_new();
+    data.unshift(title);
+    const ws = XLSX.utils.json_to_sheet(data, {header: key, skipHeader: true});
+    if(autoWidth){
+        const arr = json_to_array(key, data);
+        auto_width(ws, arr);
+    }
+    XLSX.utils.book_append_sheet(wb, ws, filename);
+    XLSX.writeFile(wb, filename + '.xlsx');
+}
+
+export const export_array_to_excel = ({key, data, title, filename, autoWidth}) => {
+    const wb = XLSX.utils.book_new();
+    const arr = json_to_array(key, data);
+    arr.unshift(title);
+    const ws = XLSX.utils.aoa_to_sheet(arr);
+    if(autoWidth){
+        auto_width(ws, arr);
+    }
+    XLSX.utils.book_append_sheet(wb, ws, filename);
+    XLSX.writeFile(wb, filename + '.xlsx');
+}
+
+export const read = (data, type) => {
+    const workbook = XLSX.read(data, { type: type });
+    const firstSheetName = workbook.SheetNames[0];
+    const worksheet = workbook.Sheets[firstSheetName];
+    const header = get_header_row(worksheet);
+    const results = XLSX.utils.sheet_to_json(worksheet);
+    return {header, results};
+}
+
+export default {
+  export_table_to_excel,
+  export_array_to_excel,
+  export_json_to_excel,
+  read
+}
diff --git a/seller/src/libs/hasPermission.js b/seller/src/libs/hasPermission.js
new file mode 100644
index 00000000..5e1f42b8
--- /dev/null
+++ b/seller/src/libs/hasPermission.js
@@ -0,0 +1,14 @@
+const hasPermission = {
+    install (Vue, options) {
+        Vue.directive('has', {
+            inserted (el, binding, vnode) {
+                let permTypes = vnode.context.$route.meta.permTypes;
+                if (permTypes&&!permTypes.includes(binding.value)) {
+                    el.parentNode.removeChild(el);
+                }
+            }
+        });
+    }
+};
+
+export default hasPermission;
diff --git a/seller/src/libs/hasRole.js b/seller/src/libs/hasRole.js
new file mode 100644
index 00000000..4fadf551
--- /dev/null
+++ b/seller/src/libs/hasRole.js
@@ -0,0 +1,16 @@
+import { getStore } from './storage';
+
+const hasRole = {
+    install (Vue, options) {
+        Vue.directive('hasRole', {
+            inserted (el, binding) {
+                let roles = getStore("roles");
+                if (roles&&!roles.includes(binding.value)) {
+                    el.parentNode.removeChild(el);
+                }
+            }
+        });
+    }
+};
+
+export default hasRole;
diff --git a/seller/src/libs/icon.js b/seller/src/libs/icon.js
new file mode 100644
index 00000000..b1fa5323
--- /dev/null
+++ b/seller/src/libs/icon.js
@@ -0,0 +1,3513 @@
+export const icons = [
+    {
+        "icons": [
+            "ios-add-circle-outline"
+        ],
+        "tags": [
+            "circle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-add-circle",
+            "md-add-circle"
+        ],
+        "tags": [
+            "add",
+            "circle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-add",
+            "md-add"
+        ],
+        "tags": [
+            "add",
+            "include",
+            "invite",
+            "plus"
+        ]
+    },
+    {
+        "icons": [
+            "ios-alarm",
+            "md-alarm"
+        ],
+        "tags": [
+            "alarm"
+        ]
+    },
+    {
+        "icons": [
+            "ios-albums",
+            "md-albums"
+        ],
+        "tags": [
+            "albums",
+            "boxes",
+            "slides",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-alert",
+            "md-alert"
+        ],
+        "tags": [
+            "!",
+            "alert",
+            "attention",
+            "exclamation",
+            "notice",
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-american-football",
+            "md-american-football"
+        ],
+        "tags": [
+            "american",
+            "football"
+        ]
+    },
+    {
+        "icons": [
+            "ios-analytics",
+            "md-analytics"
+        ],
+        "tags": [
+            "analytics",
+            "data",
+            "metrics",
+            "track"
+        ]
+    },
+    {
+        "icons": [
+            "ios-aperture",
+            "md-aperture"
+        ],
+        "tags": [
+            "aperture",
+            "dark",
+            "images",
+            "levels",
+            "light",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-apps",
+            "md-apps"
+        ],
+        "tags": [
+            "apps",
+            "applications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-appstore",
+            "md-appstore"
+        ],
+        "tags": [
+            "appstore",
+            "store"
+        ]
+    },
+    {
+        "icons": [
+            "ios-archive",
+            "md-archive"
+        ],
+        "tags": [
+            "archive",
+            "email"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-back",
+            "md-arrow-back"
+        ],
+        "tags": [
+            "arrow",
+            "back",
+            "chevron",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-down",
+            "md-arrow-down"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "down"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropdown-circle",
+            "md-arrow-dropdown-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropdown"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropdown",
+            "md-arrow-dropdown"
+        ],
+        "tags": [
+            "arrow",
+            "dropdown"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropleft-circle",
+            "md-arrow-dropleft-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropleft"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropleft",
+            "md-arrow-dropleft"
+        ],
+        "tags": [
+            "arrow",
+            "dropleft"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropright-circle",
+            "md-arrow-dropright-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropright"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropright",
+            "md-arrow-dropright"
+        ],
+        "tags": [
+            "arrow",
+            "dropright"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropup-circle",
+            "md-arrow-dropup-circle"
+        ],
+        "tags": [
+            "arrow",
+            "circle",
+            "dropup"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-dropup",
+            "md-arrow-dropup"
+        ],
+        "tags": [
+            "arrow",
+            "dropup"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-forward",
+            "md-arrow-forward"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "forward",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-back",
+            "md-arrow-round-back"
+        ],
+        "tags": [
+            "arrow",
+            "back",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-down",
+            "md-arrow-round-down"
+        ],
+        "tags": [
+            "arrow",
+            "down",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-forward",
+            "md-arrow-round-forward"
+        ],
+        "tags": [
+            "arrow",
+            "forward",
+            "round"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-round-up",
+            "md-arrow-round-up"
+        ],
+        "tags": [
+            "arrow",
+            "round",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-arrow-up",
+            "md-arrow-up"
+        ],
+        "tags": [
+            "arrow",
+            "chevron",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-at",
+            "md-at"
+        ],
+        "tags": [
+            "@",
+            "at"
+        ]
+    },
+    {
+        "icons": [
+            "ios-attach",
+            "md-attach"
+        ],
+        "tags": [
+            "attach"
+        ]
+    },
+    {
+        "icons": [
+            "ios-backspace",
+            "md-backspace"
+        ],
+        "tags": [
+            "backspace"
+        ]
+    },
+    {
+        "icons": [
+            "ios-barcode",
+            "md-barcode"
+        ],
+        "tags": [
+            "barcode",
+            "camera",
+            "reader"
+        ]
+    },
+    {
+        "icons": [
+            "ios-baseball",
+            "md-baseball"
+        ],
+        "tags": [
+            "baseball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-basket",
+            "md-basket"
+        ],
+        "tags": [
+            "basket"
+        ]
+    },
+    {
+        "icons": [
+            "ios-basketball",
+            "md-basketball"
+        ],
+        "tags": [
+            "basketball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-charging",
+            "md-battery-charging"
+        ],
+        "tags": [
+            "battery",
+            "charging"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-dead",
+            "md-battery-dead"
+        ],
+        "tags": [
+            "battery",
+            "dead"
+        ]
+    },
+    {
+        "icons": [
+            "ios-battery-full",
+            "md-battery-full"
+        ],
+        "tags": [
+            "battery",
+            "full"
+        ]
+    },
+    {
+        "icons": [
+            "ios-beaker",
+            "md-beaker"
+        ],
+        "tags": [
+            "beaker",
+            "flask",
+            "mixture",
+            "potion"
+        ]
+    },
+    {
+        "icons": [
+            "ios-beer",
+            "md-beer"
+        ],
+        "tags": [
+            "beer",
+            "drink",
+            "eat",
+            "food"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bicycle",
+            "md-bicycle"
+        ],
+        "tags": [
+            "bicycle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bluetooth",
+            "md-bluetooth"
+        ],
+        "tags": [
+            "bluetooth",
+            "cloud",
+            "connection"
+        ]
+    },
+    {
+        "icons": [
+            "ios-boat",
+            "md-boat"
+        ],
+        "tags": [
+            "boat"
+        ]
+    },
+    {
+        "icons": [
+            "ios-body",
+            "md-body"
+        ],
+        "tags": [
+            "body"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bonfire",
+            "md-bonfire"
+        ],
+        "tags": [
+            "bonfire",
+            "heat",
+            "hot"
+        ]
+    },
+    {
+        "icons": [
+            "ios-book",
+            "md-book"
+        ],
+        "tags": [
+            "book",
+            "read"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bookmark",
+            "md-bookmark"
+        ],
+        "tags": [
+            "bookmark",
+            "favorite",
+            "save",
+            "tag"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bookmarks",
+            "md-bookmarks"
+        ],
+        "tags": [
+            "bookmarks",
+            "favorite"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bowtie",
+            "md-bowtie"
+        ],
+        "tags": [
+            "bowtie"
+        ]
+    },
+    {
+        "icons": [
+            "ios-briefcase",
+            "md-briefcase"
+        ],
+        "tags": [
+            "briefcase",
+            "folder",
+            "organize"
+        ]
+    },
+    {
+        "icons": [
+            "ios-browsers",
+            "md-browsers"
+        ],
+        "tags": [
+            "browsers",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-brush",
+            "md-brush"
+        ],
+        "tags": [
+            "brush"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bug",
+            "md-bug"
+        ],
+        "tags": [
+            "bug",
+            "develop",
+            "error",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-build",
+            "md-build"
+        ],
+        "tags": [
+            "build"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bulb",
+            "md-bulb"
+        ],
+        "tags": [
+            "bulb"
+        ]
+    },
+    {
+        "icons": [
+            "ios-bus",
+            "md-bus"
+        ],
+        "tags": [
+            "bus"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cafe",
+            "md-cafe"
+        ],
+        "tags": [
+            "cafe"
+        ]
+    },
+    {
+        "icons": [
+            "ios-calculator",
+            "md-calculator"
+        ],
+        "tags": [
+            "arithmatic",
+            "calculator",
+            "math"
+        ]
+    },
+    {
+        "icons": [
+            "ios-calendar",
+            "md-calendar"
+        ],
+        "tags": [
+            "calendar",
+            "date",
+            "month",
+            "week"
+        ]
+    },
+    {
+        "icons": [
+            "ios-call",
+            "md-call"
+        ],
+        "tags": [
+            "call",
+            "telephone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-camera",
+            "md-camera"
+        ],
+        "tags": [
+            "camera",
+            "image",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-car",
+            "md-car"
+        ],
+        "tags": [
+            "car"
+        ]
+    },
+    {
+        "icons": [
+            "ios-card",
+            "md-card"
+        ],
+        "tags": [
+            "$",
+            "card",
+            "cash",
+            "credit",
+            "debit",
+            "dollars",
+            "money",
+            "price",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cart",
+            "md-cart"
+        ],
+        "tags": [
+            "cart"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cash",
+            "md-cash"
+        ],
+        "tags": [
+            "$",
+            "cash",
+            "credit",
+            "debit",
+            "dollars",
+            "money",
+            "price",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-chatboxes",
+            "md-chatboxes"
+        ],
+        "tags": [
+            "chatboxes",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-chatbubbles",
+            "md-chatbubbles"
+        ],
+        "tags": [
+            "chatbubbles",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkbox-outline",
+            "md-checkbox-outline"
+        ],
+        "tags": [
+            "checkbox",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkbox",
+            "md-checkbox"
+        ],
+        "tags": [
+            "checkbox",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark-circle-outline",
+            "md-checkmark-circle-outline"
+        ],
+        "tags": [
+            "checkmark",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark-circle",
+            "md-checkmark-circle"
+        ],
+        "tags": [
+            "checkmark",
+            "circle",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-checkmark",
+            "md-checkmark"
+        ],
+        "tags": [
+            "checkmark",
+            "success"
+        ]
+    },
+    {
+        "icons": [
+            "ios-clipboard",
+            "md-clipboard"
+        ],
+        "tags": [
+            "clipboard",
+            "write"
+        ]
+    },
+    {
+        "icons": [
+            "ios-clock",
+            "md-clock"
+        ],
+        "tags": [
+            "clock",
+            "time"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close-circle-outline"
+        ],
+        "tags": [
+            "close",
+            "cicle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close-circle",
+            "md-close-circle"
+        ],
+        "tags": [
+            "circle",
+            "close"
+        ]
+    },
+    {
+        "icons": [
+            "ios-close",
+            "md-close"
+        ],
+        "tags": [
+            "close",
+            "delete",
+            "remove"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-circle",
+            "md-cloud-circle"
+        ],
+        "tags": [
+            "circle",
+            "cloud"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-done",
+            "md-cloud-done"
+        ],
+        "tags": [
+            "cloud",
+            "done"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-download",
+            "md-cloud-download"
+        ],
+        "tags": [
+            "cloud",
+            "download",
+            "storage"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-outline",
+            "md-cloud-outline"
+        ],
+        "tags": [
+            "cloud"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud-upload",
+            "md-cloud-upload"
+        ],
+        "tags": [
+            "cloud",
+            "storage",
+            "upload"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloud",
+            "md-cloud"
+        ],
+        "tags": [
+            "cloud",
+            "storage",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloudy-night",
+            "md-cloudy-night"
+        ],
+        "tags": [
+            "cloudy",
+            "night",
+            "overcast",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cloudy",
+            "md-cloudy"
+        ],
+        "tags": [
+            "cloudy",
+            "overcast",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code-download",
+            "md-code-download"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "download",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code-working",
+            "md-code-working"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "hacker",
+            "program",
+            "working"
+        ]
+    },
+    {
+        "icons": [
+            "ios-code",
+            "md-code"
+        ],
+        "tags": [
+            "code",
+            "develop",
+            "hacker",
+            "program"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cog",
+            "md-cog"
+        ],
+        "tags": [
+            "cog",
+            "gear",
+            "options",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-fill",
+            "md-color-fill"
+        ],
+        "tags": [
+            "color",
+            "fill"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-filter",
+            "md-color-filter"
+        ],
+        "tags": [
+            "color",
+            "filter"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-palette",
+            "md-color-palette"
+        ],
+        "tags": [
+            "color",
+            "palette"
+        ]
+    },
+    {
+        "icons": [
+            "ios-color-wand",
+            "md-color-wand"
+        ],
+        "tags": [
+            "color",
+            "wand"
+        ]
+    },
+    {
+        "icons": [
+            "ios-compass",
+            "md-compass"
+        ],
+        "tags": [
+            "compass",
+            "directions",
+            "location",
+            "navigation"
+        ]
+    },
+    {
+        "icons": [
+            "ios-construct",
+            "md-construct"
+        ],
+        "tags": [
+            "construct"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contact",
+            "md-contact"
+        ],
+        "tags": [
+            "contact",
+            "people",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contacts",
+            "md-contacts"
+        ],
+        "tags": [
+            "contacts",
+            "people",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contract",
+            "md-contract"
+        ],
+        "tags": [
+            "contract"
+        ]
+    },
+    {
+        "icons": [
+            "ios-contrast",
+            "md-contrast"
+        ],
+        "tags": [
+            "contrast",
+            "dark",
+            "images",
+            "levels",
+            "light",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-copy",
+            "md-copy"
+        ],
+        "tags": [
+            "copy",
+            "duplicate",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-create",
+            "md-create"
+        ],
+        "tags": [
+            "create"
+        ]
+    },
+    {
+        "icons": [
+            "ios-crop",
+            "md-crop"
+        ],
+        "tags": [
+            "crop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cube",
+            "md-cube"
+        ],
+        "tags": [
+            "box",
+            "container",
+            "cube",
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-cut",
+            "md-cut"
+        ],
+        "tags": [
+            "cut"
+        ]
+    },
+    {
+        "icons": [
+            "ios-desktop",
+            "md-desktop"
+        ],
+        "tags": [
+            "desktop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-disc",
+            "md-disc"
+        ],
+        "tags": [
+            "cd",
+            "disc",
+            "vinyl"
+        ]
+    },
+    {
+        "icons": [
+            "ios-document",
+            "md-document"
+        ],
+        "tags": [
+            "document",
+            "file",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-done-all",
+            "md-done-all"
+        ],
+        "tags": [
+            "all",
+            "done"
+        ]
+    },
+    {
+        "icons": [
+            "ios-download",
+            "md-download"
+        ],
+        "tags": [
+            "download",
+            "export"
+        ]
+    },
+    {
+        "icons": [
+            "ios-easel",
+            "md-easel"
+        ],
+        "tags": [
+            "easel"
+        ]
+    },
+    {
+        "icons": [
+            "ios-egg",
+            "md-egg"
+        ],
+        "tags": [
+            "baby",
+            "bird",
+            "birth",
+            "egg",
+            "twitter"
+        ]
+    },
+    {
+        "icons": [
+            "ios-exit",
+            "md-exit"
+        ],
+        "tags": [
+            "exit"
+        ]
+    },
+    {
+        "icons": [
+            "ios-expand",
+            "md-expand"
+        ],
+        "tags": [
+            "expand"
+        ]
+    },
+    {
+        "icons": [
+            "ios-eye-off",
+            "md-eye-off"
+        ],
+        "tags": [
+            "eye",
+            "off"
+        ]
+    },
+    {
+        "icons": [
+            "ios-eye",
+            "md-eye"
+        ],
+        "tags": [
+            "exposed",
+            "eye",
+            "look",
+            "see",
+            "view"
+        ]
+    },
+    {
+        "icons": [
+            "ios-fastforward",
+            "md-fastforward"
+        ],
+        "tags": [
+            "fastforward",
+            "jump",
+            "next",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-female",
+            "md-female"
+        ],
+        "tags": [
+            "dudette",
+            "female",
+            "girl",
+            "lady"
+        ]
+    },
+    {
+        "icons": [
+            "ios-filing",
+            "md-filing"
+        ],
+        "tags": [
+            "archive",
+            "filing"
+        ]
+    },
+    {
+        "icons": [
+            "ios-film",
+            "md-film"
+        ],
+        "tags": [
+            "film"
+        ]
+    },
+    {
+        "icons": [
+            "ios-finger-print",
+            "md-finger-print"
+        ],
+        "tags": [
+            "finger",
+            "print"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flag",
+            "md-flag"
+        ],
+        "tags": [
+            "favorite",
+            "flag",
+            "marker"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flame",
+            "md-flame"
+        ],
+        "tags": [
+            "fire",
+            "flame",
+            "heat",
+            "hot"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flash",
+            "md-flash"
+        ],
+        "tags": [
+            "flash",
+            "lightning",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flask",
+            "md-flask"
+        ],
+        "tags": [
+            "bubbles",
+            "flask",
+            "mixture",
+            "potion"
+        ]
+    },
+    {
+        "icons": [
+            "ios-flower",
+            "md-flower"
+        ],
+        "tags": [
+            "flower"
+        ]
+    },
+    {
+        "icons": [
+            "ios-folder-open",
+            "md-folder-open"
+        ],
+        "tags": [
+            "folder",
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-folder",
+            "md-folder"
+        ],
+        "tags": [
+            "file",
+            "folder"
+        ]
+    },
+    {
+        "icons": [
+            "ios-football",
+            "md-football"
+        ],
+        "tags": [
+            "football",
+            "soccer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-funnel",
+            "md-funnel"
+        ],
+        "tags": [
+            "funnel",
+            "sort"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-branch",
+            "md-git-branch"
+        ],
+        "tags": [
+            "branch",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-commit",
+            "md-git-commit"
+        ],
+        "tags": [
+            "commit",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-compare",
+            "md-git-compare"
+        ],
+        "tags": [
+            "compare",
+            "git"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-merge",
+            "md-git-merge"
+        ],
+        "tags": [
+            "git",
+            "merge"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-network",
+            "md-git-network"
+        ],
+        "tags": [
+            "git",
+            "network"
+        ]
+    },
+    {
+        "icons": [
+            "ios-git-pull-request",
+            "md-git-pull-request"
+        ],
+        "tags": [
+            "git",
+            "pull",
+            "request"
+        ]
+    },
+    {
+        "icons": [
+            "ios-glasses",
+            "md-glasses"
+        ],
+        "tags": [
+            "glasses",
+            "look",
+            "reading",
+            "see",
+            "steve"
+        ]
+    },
+    {
+        "icons": [
+            "ios-globe",
+            "md-globe"
+        ],
+        "tags": [
+            "globe"
+        ]
+    },
+    {
+        "icons": [
+            "ios-grid",
+            "md-grid"
+        ],
+        "tags": [
+            "grid",
+            "menu"
+        ]
+    },
+    {
+        "icons": [
+            "ios-hammer",
+            "md-hammer"
+        ],
+        "tags": [
+            "hammer",
+            "options",
+            "settings",
+            "tools"
+        ]
+    },
+    {
+        "icons": [
+            "ios-hand",
+            "md-hand"
+        ],
+        "tags": [
+            "hand",
+            "stop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-happy",
+            "md-happy"
+        ],
+        "tags": [
+            "fun",
+            "good",
+            "happy",
+            "like",
+            "yes"
+        ]
+    },
+    {
+        "icons": [
+            "ios-headset",
+            "md-headset"
+        ],
+        "tags": [
+            "headset"
+        ]
+    },
+    {
+        "icons": [
+            "ios-heart",
+            "md-heart"
+        ],
+        "tags": [
+            "heart",
+            "love"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help-buoy",
+            "md-help-buoy"
+        ],
+        "tags": [
+            "?",
+            "buoy",
+            "help",
+            "question"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help-circle",
+            "md-help-circle"
+        ],
+        "tags": [
+            "circle",
+            "help"
+        ]
+    },
+    {
+        "icons": [
+            "ios-help",
+            "md-help"
+        ],
+        "tags": [
+            "?",
+            "help",
+            "information",
+            "question"
+        ]
+    },
+    {
+        "icons": [
+            "ios-home",
+            "md-home"
+        ],
+        "tags": [
+            "home",
+            "house"
+        ]
+    },
+    {
+        "icons": [
+            "ios-ice-cream",
+            "md-ice-cream"
+        ],
+        "tags": [
+            "cream",
+            "ice"
+        ]
+    },
+    {
+        "icons": [
+            "ios-image",
+            "md-image"
+        ],
+        "tags": [
+            "camera",
+            "image",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-images",
+            "md-images"
+        ],
+        "tags": [
+            "images",
+            "photo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-infinite",
+            "md-infinite"
+        ],
+        "tags": [
+            "forever",
+            "infinite",
+            "loop"
+        ]
+    },
+    {
+        "icons": [
+            "ios-information-circle",
+            "md-information-circle"
+        ],
+        "tags": [
+            "circle",
+            "information"
+        ]
+    },
+    {
+        "icons": [
+            "ios-information",
+            "md-information"
+        ],
+        "tags": [
+            "help",
+            "information",
+            "knowledge"
+        ]
+    },
+    {
+        "icons": [
+            "ios-jet",
+            "md-jet"
+        ],
+        "tags": [
+            "fly",
+            "jet",
+            "plane"
+        ]
+    },
+    {
+        "icons": [
+            "ios-key",
+            "md-key"
+        ],
+        "tags": [
+            "access",
+            "key"
+        ]
+    },
+    {
+        "icons": [
+            "ios-keypad",
+            "md-keypad"
+        ],
+        "tags": [
+            "keypad",
+            "type"
+        ]
+    },
+    {
+        "icons": [
+            "ios-laptop",
+            "md-laptop"
+        ],
+        "tags": [
+            "apple",
+            "laptop",
+            "macbook",
+            "osx"
+        ]
+    },
+    {
+        "icons": [
+            "ios-leaf",
+            "md-leaf"
+        ],
+        "tags": [
+            "green",
+            "leaf",
+            "nature",
+            "plant",
+            "recycle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-link",
+            "md-link"
+        ],
+        "tags": [
+            "anchor",
+            "attach",
+            "chain",
+            "href",
+            "link"
+        ]
+    },
+    {
+        "icons": [
+            "ios-list-box",
+            "md-list-box"
+        ],
+        "tags": [
+            "box",
+            "list"
+        ]
+    },
+    {
+        "icons": [
+            "ios-list",
+            "md-list"
+        ],
+        "tags": [
+            "list"
+        ]
+    },
+    {
+        "icons": [
+            "ios-locate",
+            "md-locate"
+        ],
+        "tags": [
+            "gps",
+            "locate",
+            "maps",
+            "navigate"
+        ]
+    },
+    {
+        "icons": [
+            "ios-lock",
+            "md-lock"
+        ],
+        "tags": [
+            "lock"
+        ]
+    },
+    {
+        "icons": [
+            "ios-log-in",
+            "md-log-in"
+        ],
+        "tags": [
+            "in",
+            "log",
+            "signin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-log-out",
+            "md-log-out"
+        ],
+        "tags": [
+            "log",
+            "out",
+            "signout"
+        ]
+    },
+    {
+        "icons": [
+            "ios-magnet",
+            "md-magnet"
+        ],
+        "tags": [
+            "attraction",
+            "magnet",
+            "sticky"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mail-open",
+            "md-mail-open"
+        ],
+        "tags": [
+            "mail",
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mail",
+            "md-mail"
+        ],
+        "tags": [
+            "email",
+            "mail"
+        ]
+    },
+    {
+        "icons": [
+            "ios-male",
+            "md-male"
+        ],
+        "tags": [
+            "boy",
+            "dude",
+            "guy",
+            "male",
+            "male"
+        ]
+    },
+    {
+        "icons": [
+            "ios-man",
+            "md-man"
+        ],
+        "tags": [
+            "boy",
+            "dude",
+            "guy",
+            "male",
+            "man"
+        ]
+    },
+    {
+        "icons": [
+            "ios-map",
+            "md-map"
+        ],
+        "tags": [
+            "gps",
+            "map",
+            "navigation",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medal",
+            "md-medal"
+        ],
+        "tags": [
+            "medal"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medical",
+            "md-medical"
+        ],
+        "tags": [
+            "medical"
+        ]
+    },
+    {
+        "icons": [
+            "ios-medkit",
+            "md-medkit"
+        ],
+        "tags": [
+            "case",
+            "disease",
+            "firstaid",
+            "health",
+            "medkit",
+            "sick"
+        ]
+    },
+    {
+        "icons": [
+            "ios-megaphone",
+            "md-megaphone"
+        ],
+        "tags": [
+            "megaphone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-menu",
+            "md-menu"
+        ],
+        "tags": [
+            "menu"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mic-off",
+            "md-mic-off"
+        ],
+        "tags": [
+            "mic",
+            "noise",
+            "off",
+            "sound",
+            "speaker",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-mic",
+            "md-mic"
+        ],
+        "tags": [
+            "mic",
+            "noise",
+            "sound",
+            "speaker",
+            "talk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-microphone",
+            "md-microphone"
+        ],
+        "tags": [
+            "microphone",
+            "music",
+            "noise",
+            "recorde",
+            "sound",
+            "speak"
+        ]
+    },
+    {
+        "icons": [
+            "ios-moon",
+            "md-moon"
+        ],
+        "tags": [
+            "dark",
+            "moon",
+            "night",
+            "sky"
+        ]
+    },
+    {
+        "icons": [
+            "ios-more",
+            "md-more"
+        ],
+        "tags": [
+            "more",
+            "options"
+        ]
+    },
+    {
+        "icons": [
+            "ios-move",
+            "md-move"
+        ],
+        "tags": [
+            "move"
+        ]
+    },
+    {
+        "icons": [
+            "ios-musical-note",
+            "md-musical-note"
+        ],
+        "tags": [
+            "listening",
+            "musical",
+            "noise",
+            "note",
+            "play",
+            "sound"
+        ]
+    },
+    {
+        "icons": [
+            "ios-musical-notes",
+            "md-musical-notes"
+        ],
+        "tags": [
+            "listening",
+            "musical",
+            "noise",
+            "notes",
+            "play",
+            "sound"
+        ]
+    },
+    {
+        "icons": [
+            "ios-navigate",
+            "md-navigate"
+        ],
+        "tags": [
+            "gps",
+            "location",
+            "map",
+            "navigate",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications-off",
+            "md-notifications-off"
+        ],
+        "tags": [
+            "notifications",
+            "off"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications-outline",
+            "md-notifications-outline"
+        ],
+        "tags": [
+            "notifications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-notifications",
+            "md-notifications"
+        ],
+        "tags": [
+            "notifications"
+        ]
+    },
+    {
+        "icons": [
+            "ios-nuclear",
+            "md-nuclear"
+        ],
+        "tags": [
+            "danger",
+            "hazard",
+            "nuclear",
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-nutrition",
+            "md-nutrition"
+        ],
+        "tags": [
+            "nutrition"
+        ]
+    },
+    {
+        "icons": [
+            "ios-open",
+            "md-open"
+        ],
+        "tags": [
+            "open"
+        ]
+    },
+    {
+        "icons": [
+            "ios-options",
+            "md-options"
+        ],
+        "tags": [
+            "options"
+        ]
+    },
+    {
+        "icons": [
+            "ios-outlet",
+            "md-outlet"
+        ],
+        "tags": [
+            "computer",
+            "digital",
+            "electricity",
+            "outlet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paper-plane",
+            "md-paper-plane"
+        ],
+        "tags": [
+            "paper",
+            "plane"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paper",
+            "md-paper"
+        ],
+        "tags": [
+            "feed",
+            "paper",
+            "paper"
+        ]
+    },
+    {
+        "icons": [
+            "ios-partly-sunny",
+            "md-partly-sunny"
+        ],
+        "tags": [
+            "partly",
+            "sunny"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pause",
+            "md-pause"
+        ],
+        "tags": [
+            "break",
+            "freeze",
+            "hold",
+            "music",
+            "pause"
+        ]
+    },
+    {
+        "icons": [
+            "ios-paw",
+            "md-paw"
+        ],
+        "tags": [
+            "paw"
+        ]
+    },
+    {
+        "icons": [
+            "ios-people",
+            "md-people"
+        ],
+        "tags": [
+            "head",
+            "human",
+            "people",
+            "person",
+            "stalker",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-person-add",
+            "md-person-add"
+        ],
+        "tags": [
+            "add",
+            "head",
+            "human",
+            "member",
+            "new",
+            "person",
+            "staff",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-person",
+            "md-person"
+        ],
+        "tags": [
+            "head",
+            "human",
+            "person",
+            "staff",
+            "users"
+        ]
+    },
+    {
+        "icons": [
+            "ios-phone-landscape",
+            "md-phone-landscape"
+        ],
+        "tags": [
+            "landscape",
+            "phone"
+        ]
+    },
+    {
+        "icons": [
+            "ios-phone-portrait",
+            "md-phone-portrait"
+        ],
+        "tags": [
+            "phone",
+            "portrait"
+        ]
+    },
+    {
+        "icons": [
+            "ios-photos",
+            "md-photos"
+        ],
+        "tags": [
+            "images",
+            "photos",
+            "square",
+            "stills"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pie",
+            "md-pie"
+        ],
+        "tags": [
+            "cog",
+            "options",
+            "pie",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pin",
+            "md-pin"
+        ],
+        "tags": [
+            "gps",
+            "navigation",
+            "pin"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pint",
+            "md-pint"
+        ],
+        "tags": [
+            "pint"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pizza",
+            "md-pizza"
+        ],
+        "tags": [
+            "drink",
+            "eat",
+            "food",
+            "pizza"
+        ]
+    },
+    {
+        "icons": [
+            "ios-planet",
+            "md-planet"
+        ],
+        "tags": [
+            "globe",
+            "home",
+            "nature",
+            "planet",
+            "planet",
+            "space"
+        ]
+    },
+    {
+        "icons": [
+            "ios-play",
+            "md-play"
+        ],
+        "tags": [
+            "arrow",
+            "music",
+            "play",
+            "right",
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-podium",
+            "md-podium"
+        ],
+        "tags": [
+            "award",
+            "compete",
+            "competition",
+            "lose",
+            "podium",
+            "win"
+        ]
+    },
+    {
+        "icons": [
+            "ios-power",
+            "md-power"
+        ],
+        "tags": [
+            "off",
+            "on",
+            "power"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pricetag",
+            "md-pricetag"
+        ],
+        "tags": [
+            "$",
+            "commerce",
+            "items",
+            "money",
+            "pricetag",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pricetags",
+            "md-pricetags"
+        ],
+        "tags": [
+            "$",
+            "commerce",
+            "items",
+            "money",
+            "pricetags",
+            "shopping"
+        ]
+    },
+    {
+        "icons": [
+            "ios-print",
+            "md-print"
+        ],
+        "tags": [
+            "print"
+        ]
+    },
+    {
+        "icons": [
+            "ios-pulse",
+            "md-pulse"
+        ],
+        "tags": [
+            "hot",
+            "live",
+            "pulse",
+            "rate"
+        ]
+    },
+    {
+        "icons": [
+            "ios-qr-scanner",
+            "md-qr-scanner"
+        ],
+        "tags": [
+            "qr",
+            "reader",
+            "scanner"
+        ]
+    },
+    {
+        "icons": [
+            "ios-quote",
+            "md-quote"
+        ],
+        "tags": [
+            "chat",
+            "quotation",
+            "quote"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio-button-off",
+            "md-radio-button-off"
+        ],
+        "tags": [
+            "button",
+            "off",
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio-button-on",
+            "md-radio-button-on"
+        ],
+        "tags": [
+            "button",
+            "on",
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-radio",
+            "md-radio"
+        ],
+        "tags": [
+            "radio"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rainy",
+            "md-rainy"
+        ],
+        "tags": [
+            "cloud",
+            "rainy",
+            "water",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-recording",
+            "md-recording"
+        ],
+        "tags": [
+            "film",
+            "recording",
+            "tape",
+            "voicemail"
+        ]
+    },
+    {
+        "icons": [
+            "ios-redo",
+            "md-redo"
+        ],
+        "tags": [
+            "forward",
+            "redo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-refresh-circle",
+            "md-refresh-circle"
+        ],
+        "tags": [
+            "circle",
+            "refresh"
+        ]
+    },
+    {
+        "icons": [
+            "ios-refresh",
+            "md-refresh"
+        ],
+        "tags": [
+            "refresh",
+            "reload",
+            "renew",
+            "reset"
+        ]
+    },
+    {
+        "icons": [
+            "ios-remove-circle",
+            "md-remove-circle"
+        ],
+        "tags": [
+            "circle",
+            "remove"
+        ]
+    },
+    {
+        "icons": [
+            "ios-remove",
+            "md-remove"
+        ],
+        "tags": [
+            "minus",
+            "remove",
+            "subtract"
+        ]
+    },
+    {
+        "icons": [
+            "ios-reorder",
+            "md-reorder"
+        ],
+        "tags": [
+            "reorder"
+        ]
+    },
+    {
+        "icons": [
+            "ios-repeat",
+            "md-repeat"
+        ],
+        "tags": [
+            "repeat"
+        ]
+    },
+    {
+        "icons": [
+            "ios-resize",
+            "md-resize"
+        ],
+        "tags": [
+            "resize"
+        ]
+    },
+    {
+        "icons": [
+            "ios-restaurant",
+            "md-restaurant"
+        ],
+        "tags": [
+            "restaurant"
+        ]
+    },
+    {
+        "icons": [
+            "ios-return-left",
+            "md-return-left"
+        ],
+        "tags": [
+            "left",
+            "return"
+        ]
+    },
+    {
+        "icons": [
+            "ios-return-right",
+            "md-return-right"
+        ],
+        "tags": [
+            "return",
+            "right"
+        ]
+    },
+    {
+        "icons": [
+            "ios-reverse-camera",
+            "md-reverse-camera"
+        ],
+        "tags": [
+            "camera",
+            "picture",
+            "reverse"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rewind",
+            "md-rewind"
+        ],
+        "tags": [
+            "back",
+            "music",
+            "previous",
+            "rewind"
+        ]
+    },
+    {
+        "icons": [
+            "ios-ribbon",
+            "md-ribbon"
+        ],
+        "tags": [
+            "ribbon"
+        ]
+    },
+    {
+        "icons": [
+            "ios-rose",
+            "md-rose"
+        ],
+        "tags": [
+            "rose"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sad",
+            "md-sad"
+        ],
+        "tags": [
+            "bad",
+            "cry",
+            "no",
+            "sad"
+        ]
+    },
+    {
+        "icons": [
+            "ios-school",
+            "md-school"
+        ],
+        "tags": [
+            "school"
+        ]
+    },
+    {
+        "icons": [
+            "ios-search",
+            "md-search"
+        ],
+        "tags": [
+            "magnifyingglass",
+            "search"
+        ]
+    },
+    {
+        "icons": [
+            "ios-send",
+            "md-send"
+        ],
+        "tags": [
+            "email",
+            "paper",
+            "send"
+        ]
+    },
+    {
+        "icons": [
+            "ios-settings",
+            "md-settings"
+        ],
+        "tags": [
+            "options",
+            "settings"
+        ]
+    },
+    {
+        "icons": [
+            "ios-share-alt",
+            "md-share-alt"
+        ],
+        "tags": [
+            "alt",
+            "share"
+        ]
+    },
+    {
+        "icons": [
+            "ios-share",
+            "md-share"
+        ],
+        "tags": [
+            "share"
+        ]
+    },
+    {
+        "icons": [
+            "ios-shirt",
+            "md-shirt"
+        ],
+        "tags": [
+            "shirt"
+        ]
+    },
+    {
+        "icons": [
+            "ios-shuffle",
+            "md-shuffle"
+        ],
+        "tags": [
+            "random",
+            "shuffle"
+        ]
+    },
+    {
+        "icons": [
+            "ios-skip-backward",
+            "md-skip-backward"
+        ],
+        "tags": [
+            "backward",
+            "music",
+            "previous",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-skip-forward",
+            "md-skip-forward"
+        ],
+        "tags": [
+            "forward",
+            "music",
+            "next",
+            "skip"
+        ]
+    },
+    {
+        "icons": [
+            "ios-snow",
+            "md-snow"
+        ],
+        "tags": [
+            "snow"
+        ]
+    },
+    {
+        "icons": [
+            "ios-speedometer",
+            "md-speedometer"
+        ],
+        "tags": [
+            "drive",
+            "level",
+            "speed",
+            "speedometer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-square-outline",
+            "md-square-outline"
+        ],
+        "tags": [
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-square",
+            "md-square"
+        ],
+        "tags": [
+            "square"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star-half",
+            "md-star-half"
+        ],
+        "tags": [
+            "favorite",
+            "half",
+            "rate",
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star-outline",
+            "md-star-outline"
+        ],
+        "tags": [
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-star",
+            "md-star"
+        ],
+        "tags": [
+            "favorite",
+            "star"
+        ]
+    },
+    {
+        "icons": [
+            "ios-stats",
+            "md-stats"
+        ],
+        "tags": [
+            "stats"
+        ]
+    },
+    {
+        "icons": [
+            "ios-stopwatch",
+            "md-stopwatch"
+        ],
+        "tags": [
+            "stopwatch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-subway",
+            "md-subway"
+        ],
+        "tags": [
+            "subway"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sunny",
+            "md-sunny"
+        ],
+        "tags": [
+            "light",
+            "sky",
+            "sunny",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-swap",
+            "md-swap"
+        ],
+        "tags": [
+            "swap"
+        ]
+    },
+    {
+        "icons": [
+            "ios-switch",
+            "md-switch"
+        ],
+        "tags": [
+            "switch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-sync",
+            "md-sync"
+        ],
+        "tags": [
+            "sync"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tablet-landscape",
+            "md-tablet-landscape"
+        ],
+        "tags": [
+            "landscape",
+            "tablet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tablet-portrait",
+            "md-tablet-portrait"
+        ],
+        "tags": [
+            "portrait",
+            "tablet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-tennisball",
+            "md-tennisball"
+        ],
+        "tags": [
+            "tennisball"
+        ]
+    },
+    {
+        "icons": [
+            "ios-text",
+            "md-text"
+        ],
+        "tags": [
+            "text"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thermometer",
+            "md-thermometer"
+        ],
+        "tags": [
+            "cold",
+            "heat",
+            "hot",
+            "mercury",
+            "temperature",
+            "thermometer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thumbs-down",
+            "md-thumbs-down"
+        ],
+        "tags": [
+            "down",
+            "thumbs"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thumbs-up",
+            "md-thumbs-up"
+        ],
+        "tags": [
+            "thumbs",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-thunderstorm",
+            "md-thunderstorm"
+        ],
+        "tags": [
+            "cloudy",
+            "lightning",
+            "overcast",
+            "rain",
+            "sky",
+            "storm",
+            "thunderstorm",
+            "weather",
+            "whether"
+        ]
+    },
+    {
+        "icons": [
+            "ios-time",
+            "md-time"
+        ],
+        "tags": [
+            "clock",
+            "hour",
+            "minute",
+            "second",
+            "time",
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-timer",
+            "md-timer"
+        ],
+        "tags": [
+            "clock",
+            "timer"
+        ]
+    },
+    {
+        "icons": [
+            "ios-train",
+            "md-train"
+        ],
+        "tags": [
+            "train"
+        ]
+    },
+    {
+        "icons": [
+            "ios-transgender",
+            "md-transgender"
+        ],
+        "tags": [
+            "transgender"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trash",
+            "md-trash"
+        ],
+        "tags": [
+            "close",
+            "delete",
+            "remove",
+            "trash"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trending-down",
+            "md-trending-down"
+        ],
+        "tags": [
+            "down",
+            "trending"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trending-up",
+            "md-trending-up"
+        ],
+        "tags": [
+            "trending",
+            "up"
+        ]
+    },
+    {
+        "icons": [
+            "ios-trophy",
+            "md-trophy"
+        ],
+        "tags": [
+            "award",
+            "compete",
+            "competition",
+            "lose",
+            "trophy",
+            "win"
+        ]
+    },
+    {
+        "icons": [
+            "ios-umbrella",
+            "md-umbrella"
+        ],
+        "tags": [
+            "dry",
+            "rain",
+            "shelter",
+            "umbrella",
+            "wet"
+        ]
+    },
+    {
+        "icons": [
+            "ios-undo",
+            "md-undo"
+        ],
+        "tags": [
+            "reply",
+            "undo"
+        ]
+    },
+    {
+        "icons": [
+            "ios-unlock",
+            "md-unlock"
+        ],
+        "tags": [
+            "unlock"
+        ]
+    },
+    {
+        "icons": [
+            "ios-videocam",
+            "md-videocam"
+        ],
+        "tags": [
+            "camera",
+            "film",
+            "movie",
+            "videocam"
+        ]
+    },
+    {
+        "icons": [
+            "ios-volume-mute",
+            "md-volume-mute"
+        ],
+        "tags": [
+            "mute",
+            "sound",
+            "volume"
+        ]
+    },
+    {
+        "icons": [
+            "ios-volume-off",
+            "md-volume-off"
+        ],
+        "tags": [
+            "off",
+            "volume"
+        ]
+    },
+    {
+        "icons": [
+            "ios-walk",
+            "md-walk"
+        ],
+        "tags": [
+            "walk"
+        ]
+    },
+    {
+        "icons": [
+            "ios-warning",
+            "md-warning"
+        ],
+        "tags": [
+            "warning"
+        ]
+    },
+    {
+        "icons": [
+            "ios-watch",
+            "md-watch"
+        ],
+        "tags": [
+            "watch"
+        ]
+    },
+    {
+        "icons": [
+            "ios-water",
+            "md-water"
+        ],
+        "tags": [
+            "water"
+        ]
+    },
+    {
+        "icons": [
+            "ios-wifi",
+            "md-wifi"
+        ],
+        "tags": [
+            "bars",
+            "connection",
+            "internet",
+            "wifi"
+        ]
+    },
+    {
+        "icons": [
+            "ios-wine",
+            "md-wine"
+        ],
+        "tags": [
+            "wine"
+        ]
+    },
+    {
+        "icons": [
+            "ios-woman",
+            "md-woman"
+        ],
+        "tags": [
+            "dudette",
+            "female",
+            "girl",
+            "lady",
+            "woman"
+        ]
+    },
+    {
+        "icons": [
+            "logo-android"
+        ],
+        "tags": [
+            "android"
+        ]
+    },
+    {
+        "icons": [
+            "logo-angular"
+        ],
+        "tags": [
+            "angular"
+        ]
+    },
+    {
+        "icons": [
+            "logo-apple"
+        ],
+        "tags": [
+            "apple"
+        ]
+    },
+    {
+        "icons": [
+            "logo-bitcoin"
+        ],
+        "tags": [
+            "bitcoin"
+        ]
+    },
+    {
+        "icons": [
+            "logo-buffer"
+        ],
+        "tags": [
+            "buffer"
+        ]
+    },
+    {
+        "icons": [
+            "logo-chrome"
+        ],
+        "tags": [
+            "chrome"
+        ]
+    },
+    {
+        "icons": [
+            "logo-codepen"
+        ],
+        "tags": [
+            "codepen"
+        ]
+    },
+    {
+        "icons": [
+            "logo-css3"
+        ],
+        "tags": [
+            "css3"
+        ]
+    },
+    {
+        "icons": [
+            "logo-designernews"
+        ],
+        "tags": [
+            "designernews"
+        ]
+    },
+    {
+        "icons": [
+            "logo-dribbble"
+        ],
+        "tags": [
+            "dribbble"
+        ]
+    },
+    {
+        "icons": [
+            "logo-dropbox"
+        ],
+        "tags": [
+            "dropbox"
+        ]
+    },
+    {
+        "icons": [
+            "logo-euro"
+        ],
+        "tags": [
+            "euro"
+        ]
+    },
+    {
+        "icons": [
+            "logo-facebook"
+        ],
+        "tags": [
+            "facebook"
+        ]
+    },
+    {
+        "icons": [
+            "logo-foursquare"
+        ],
+        "tags": [
+            "foursquare"
+        ]
+    },
+    {
+        "icons": [
+            "logo-freebsd-devil"
+        ],
+        "tags": [
+            "freebsd-devil"
+        ]
+    },
+    {
+        "icons": [
+            "logo-github"
+        ],
+        "tags": [
+            "github"
+        ]
+    },
+    {
+        "icons": [
+            "logo-google"
+        ],
+        "tags": [
+            "google"
+        ]
+    },
+    {
+        "icons": [
+            "logo-googleplus"
+        ],
+        "tags": [
+            "googleplus"
+        ]
+    },
+    {
+        "icons": [
+            "logo-hackernews"
+        ],
+        "tags": [
+            "hackernews"
+        ]
+    },
+    {
+        "icons": [
+            "logo-html5"
+        ],
+        "tags": [
+            "html5"
+        ]
+    },
+    {
+        "icons": [
+            "logo-instagram"
+        ],
+        "tags": [
+            "instagram"
+        ]
+    },
+    {
+        "icons": [
+            "logo-javascript"
+        ],
+        "tags": [
+            "javascript"
+        ]
+    },
+    {
+        "icons": [
+            "logo-linkedin"
+        ],
+        "tags": [
+            "linkedin"
+        ]
+    },
+    {
+        "icons": [
+            "logo-markdown"
+        ],
+        "tags": [
+            "markdown"
+        ]
+    },
+    {
+        "icons": [
+            "logo-nodejs"
+        ],
+        "tags": [
+            "nodejs"
+        ]
+    },
+    {
+        "icons": [
+            "logo-octocat"
+        ],
+        "tags": [
+            "octocat"
+        ]
+    },
+    {
+        "icons": [
+            "logo-pinterest"
+        ],
+        "tags": [
+            "pinterest"
+        ]
+    },
+    {
+        "icons": [
+            "logo-playstation"
+        ],
+        "tags": [
+            "playstation"
+        ]
+    },
+    {
+        "icons": [
+            "logo-python"
+        ],
+        "tags": [
+            "python"
+        ]
+    },
+    {
+        "icons": [
+            "logo-reddit"
+        ],
+        "tags": [
+            "reddit"
+        ]
+    },
+    {
+        "icons": [
+            "logo-rss"
+        ],
+        "tags": [
+            "rss"
+        ]
+    },
+    {
+        "icons": [
+            "logo-sass"
+        ],
+        "tags": [
+            "sass"
+        ]
+    },
+    {
+        "icons": [
+            "logo-skype"
+        ],
+        "tags": [
+            "skype"
+        ]
+    },
+    {
+        "icons": [
+            "logo-snapchat"
+        ],
+        "tags": [
+            "snapchat"
+        ]
+    },
+    {
+        "icons": [
+            "logo-steam"
+        ],
+        "tags": [
+            "steam"
+        ]
+    },
+    {
+        "icons": [
+            "logo-tumblr"
+        ],
+        "tags": [
+            "tumblr"
+        ]
+    },
+    {
+        "icons": [
+            "logo-tux"
+        ],
+        "tags": [
+            "tux"
+        ]
+    },
+    {
+        "icons": [
+            "logo-twitch"
+        ],
+        "tags": [
+            "twitch"
+        ]
+    },
+    {
+        "icons": [
+            "logo-twitter"
+        ],
+        "tags": [
+            "twitter"
+        ]
+    },
+    {
+        "icons": [
+            "logo-usd"
+        ],
+        "tags": [
+            "usd"
+        ]
+    },
+    {
+        "icons": [
+            "logo-vimeo"
+        ],
+        "tags": [
+            "vimeo"
+        ]
+    },
+    {
+        "icons": [
+            "logo-whatsapp"
+        ],
+        "tags": [
+            "whatsapp"
+        ]
+    },
+    {
+        "icons": [
+            "logo-windows"
+        ],
+        "tags": [
+            "windows"
+        ]
+    },
+    {
+        "icons": [
+            "logo-wordpress"
+        ],
+        "tags": [
+            "wordpress"
+        ]
+    },
+    {
+        "icons": [
+            "logo-xbox"
+        ],
+        "tags": [
+            "xbox"
+        ]
+    },
+    {
+        "icons": [
+            "logo-yahoo"
+        ],
+        "tags": [
+            "yahoo"
+        ]
+    },
+    {
+        "icons": [
+            "logo-yen"
+        ],
+        "tags": [
+            "yen"
+        ]
+    },
+    {
+        "icons": [
+            "logo-youtube"
+        ],
+        "tags": [
+            "youtube"
+        ]
+    }
+]
diff --git a/seller/src/libs/importTemplate.js b/seller/src/libs/importTemplate.js
new file mode 100644
index 00000000..9d073595
--- /dev/null
+++ b/seller/src/libs/importTemplate.js
@@ -0,0 +1,82 @@
+// 导入表格模版数据
+export const userColumns = [
+    {
+        title: "username",
+        key: "username"
+    },
+    {
+        title: "password",
+        key: "password"
+    },
+    {
+        title: "avatar",
+        key: "avatar"
+    },
+    {
+        title: "departmentId",
+        key: "departmentId"
+    },
+    {
+        title: "mobile",
+        key: "mobile"
+    },
+    {
+        title: "email",
+        key: "email"
+    },
+    {
+        title: "sex",
+        key: "sex"
+    },
+    {
+        title: "address",
+        key: "address"
+    },
+    {
+        title: "type",
+        key: "type"
+    },
+    {
+        title: "status",
+        key: "status"
+    },
+    {
+        title: "delFlag",
+        key: "delFlag"
+    },
+    {
+        title: "defaultRole",
+        key: "defaultRole"
+    }
+]
+
+export const userData = [
+    {
+        username: "【记得删除该说明行】唯一用户名不能为空",
+        password: "密码不能为空",
+        avatar: "头像图片链接",
+        departmentId: "部门表主键id",
+        email: "邮箱",
+        mobile: "手机",
+        sex: "性别 0(女) 1(男)",
+        address: "地址数据省市编号 请勿乱填",
+        type: "用户类型 0(普通用户) 1(管理员)",
+        status: "用户状态 0(正常) -1(禁用)",
+        delFlag: "删除标志 0(正常) 1(已删)",
+        defaultRole: "角色 0(不分配默认角色) 1(分配默认注册用户角色)"
+    },
+    {
+        username: "lili",
+        password: "123456",
+        avatar: "https://s1.ax1x.com/2018/05/19/CcdVQP.png",
+        departmentId: "40652338142121984",
+        email: "1012139570@qq.com",
+        sex: 1,
+        address: "[\"510000\",\"510100\",\"510104\"]",
+        mobile: "18782059038",
+        type: 0,
+        status: 0,
+        delFlag: 0,
+        defaultRole: 1
+    }
+]
\ No newline at end of file
diff --git a/seller/src/libs/lazyLoading.js b/seller/src/libs/lazyLoading.js
new file mode 100644
index 00000000..2f9fd414
--- /dev/null
+++ b/seller/src/libs/lazyLoading.js
@@ -0,0 +1,2 @@
+export default (url) =>()=>import(`@/views/${url}.vue`)
+
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
new file mode 100644
index 00000000..80c2ad5e
--- /dev/null
+++ b/seller/src/libs/routerJson.js
@@ -0,0 +1,706 @@
+export const result = [
+  {
+    name: "lili",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "商品",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    permTypes: [],
+    children: [
+      {
+        name: "goods-list",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "商品管理",
+        path: "",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "goods-operation",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "商品发布",
+            path: "goods-operation",
+            component: "goods-operation",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          },
+          {
+            name: "goods",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "商品列表",
+            path: "goods",
+            component: "goods/goods-seller/goods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          },
+          {
+            name: "daft-goods",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "草稿商品",
+            path: "daft-goods",
+            component: "goods/goods-seller/draftGoods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          },
+
+          {
+            path: "template-goods",
+            props: {type: "TEMPLATE"},
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "商品模版",
+            component: "goods/goods-seller/draftGoods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            name: "template-goods",
+            children: null,
+            permTypes: []
+          },
+          {
+            name: "category",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "店铺分类",
+            path: "category",
+            component: "goods/goods-manage/category",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          }
+        ]
+      }
+    ]
+  },
+
+  {
+    name: "order",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "订单",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    permTypes: [],
+    children: [
+      {
+        name: "order",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "订单管理",
+        path: "/order",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "order",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "商品订单",
+            path: "orderList",
+            component: "order/order/orderList",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          } 
+        ]
+      },
+      {
+        name: "memberComment",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "评价管理",
+        path: "/order",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "memberComment",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "评价管理",
+            path: "memberComment",
+            component: "member/memberComment",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          }
+        ]
+      },
+      {
+        name: "order",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "售后管理",
+        path: "/order",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "returnGoodsOrder",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "退货管理",
+            path: "returnGoodsOrder",
+            component: "order/after-order/returnGoodsOrder",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "returnMoneyOrder",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "退款管理",
+            path: "returnMoneyOrder",
+            component: "order/after-order/returnMoneyOrder",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "orderComplaint",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "投诉管理",
+            path: "orderComplaint",
+            component: "order/after-order/orderComplaint",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      }
+    ]
+  },
+
+  {
+    name: "bill",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "财务",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    permTypes: [],
+    children: [
+      {
+        name: "bill",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "财务管理",
+        path: "/bill",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "bill",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "财务对账",
+            path: "bill",
+            component: "shop/bill/accountStatementBill",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "storeBill",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "店铺结算",
+            path: "storeBill",
+            component: "shop/bill/storeBill",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      },
+
+      {
+        name: "receipt",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "发票管理",
+        path: "/bill",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "receipt",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "发票管理",
+            path: "receipt",
+            component: "order/receiptManager/receipt",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            children: null,
+            permTypes: []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    name: "promotion",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "营销",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    permTypes: [],
+    children: [
+      {
+        name: "promotion",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "平台活动",
+        path: "/promotion",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "pintuan",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "拼团活动",
+            path: "pintuan",
+            component: "promotion/pintuan/pintuan",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "seckill",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "秒杀活动",
+            path: "seckill",
+            component: "promotion/seckill/seckill",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      },
+      {
+        name: "promotion",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "商家活动",
+        path: "/promotion",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "full-cut",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "满额活动",
+            path: "full-cut",
+            component: "promotion/fullCut/full-cut",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "coupon",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "优惠券",
+            path: "coupon",
+            component: "promotion/coupon/coupon",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      },
+      {
+        name: "promotion",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "分销管理",
+        path: "/promotion",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "distributionGoods",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "分销商品",
+            path: "distributionGoods",
+            component: "distribution/distributionGoods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      }
+    ]
+  },
+
+  {
+    name: "statistics",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "统计",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    permTypes: [],
+    children: [
+      {
+        name: "statistics",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "统计管理",
+        path: "/statistics",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "goodsStatistics",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "商品统计",
+            path: "goodsStatistics",
+            component: "statistics/goods",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "orderStatistics",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "订单统计",
+            path: "orderStatistics",
+            component: "statistics/order",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "trafficStatistics",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "流量统计",
+            path: "trafficStatistics",
+            component: "statistics/traffic",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+
+        ]
+      }
+    ]
+  },
+
+  {
+    name: "settings",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "设置",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    children: [
+      {
+        name: "user-manage",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "页面设置",
+        path: "user-manage",
+        component: "sys/user-manage/userManage",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: []
+      },
+      {
+        name: "ship",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "配送设置",
+        path: "",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "shipTemplate",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "配送模板",
+            path: "shipTemplate",
+            component: "shop/ship/shipTemplate",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          },
+          {
+            name: "logistics",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "物流公司",
+            path: "logistics",
+            component: "shop/ship/logistics",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      },
+      {
+        name: "shop",
+        showAlways: false,
+        level: 1,
+        type: 0,
+        title: "店铺管理",
+        path: "/shop",
+        component: "Main",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        description: "",
+        buttonType: "",
+        children: [
+          {
+            name: "shopSetting",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "店铺设置",
+            path: "shopSetting",
+            component: "shop/shopSetting",
+            icon: "md-log-in",
+            isMenu: true,
+            url: null,
+            description: null,
+            buttonType: "",
+            children: null,
+            permTypes: []
+          },
+          {
+            name: "shopAddress",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "自提点管理",
+            path: "shopAddress",
+            component: "shop/shopAddress",
+            icon: "md-log-in",
+            isMenu: true,
+            url: null,
+            description: null,
+            buttonType: "",
+            children: null,
+            permTypes: []
+          }
+
+        ]
+      }
+    ]
+  },
+  {
+    name: "messages",
+    showAlways: true,
+    level: 0,
+    type: -1,
+    title: "消息",
+    path: "",
+    component: "",
+    icon: "md-home",
+    isMenu: true,
+    url: "",
+    description: "",
+    buttonType: "",
+    children: [
+      {
+        name: "user-manage",
+        showAlways: true,
+        level: 1,
+        type: 0,
+        title: "系统消息",
+        path: "user-manage",
+        component: "sys/user-manage/userManage",
+        icon: "md-person",
+        isMenu: true,
+        url: "",
+        permTypes: [],
+        children: [
+          {
+            name: "message_index",
+            showAlways: true,
+            level: 2,
+            type: 0,
+            title: "系统消息",
+            path: "message",
+            component: "message",
+            icon: "md-person",
+            isMenu: true,
+            url: "",
+            permTypes: [],
+            children: null
+          }
+        ]
+      }
+    ]
+  }
+];
diff --git a/seller/src/libs/storage.js b/seller/src/libs/storage.js
new file mode 100644
index 00000000..4602cab8
--- /dev/null
+++ b/seller/src/libs/storage.js
@@ -0,0 +1,30 @@
+/**
+ * 存储localStorage
+ */
+export const setStore = (name, content) => {
+    if (!name) return;
+    if (typeof content !== 'string') {
+        content = JSON.stringify(content);
+    }
+    window.localStorage.setItem(name, content);
+}
+
+/**
+ * 获取localStorage
+ */
+export const getStore = name => {
+    if (!name) return;
+    let v = window.localStorage.getItem(name);
+    if (v == null) {
+        return "";
+    }
+    return v;
+}
+
+/**
+ * 删除localStorage
+ */
+export const removeStore = name => {
+    if (!name) return;
+    window.localStorage.removeItem(name);
+}
diff --git a/seller/src/libs/table2excel.js b/seller/src/libs/table2excel.js
new file mode 100644
index 00000000..1569a9fd
--- /dev/null
+++ b/seller/src/libs/table2excel.js
@@ -0,0 +1,100 @@
+var idTmr;
+function getExplorer () {
+    var explorer = window.navigator.userAgent;
+    if (explorer.indexOf('MSIE') >= 0) {
+        // ie
+        return 'ie';
+    } else if (explorer.indexOf('Firefox') >= 0) {
+        // firefox
+        return 'Firefox';
+    } else if (explorer.indexOf('Chrome') >= 0) {
+        // Chrome
+        return 'Chrome';
+    } else if (explorer.indexOf('Opera') >= 0) {
+        // Opera
+        return 'Opera';
+    } else if (explorer.indexOf('Safari') >= 0) {
+        // Safari
+        return 'Safari';
+    };
+};
+function tranform (table, aId, name) {
+    let tableHead = table.$children[0].$el;
+    let tableBody = table.$children[1].$el;
+    let tableInnerHTML = '<thead><tr>';
+    if (table.$children.length !== 1) {
+        let len = tableBody.rows.length;
+        let i = -1;
+        while (i < len) {
+            if (i == -1) {
+                Array.from(tableHead.rows[0].children).forEach((td) => {
+                    tableInnerHTML = tableInnerHTML + '<th>' + td.children[0].children[0].innerHTML + '</th>';
+                });
+                tableInnerHTML += '</tr><thead><tbody>';
+            } else {
+                tableInnerHTML += '<tr>';
+                Array.from(tableBody.rows[i].children).forEach((td) => {
+                    tableInnerHTML = tableInnerHTML + '<td>' + td.children[0].children[0].innerHTML + '</td>';
+                });
+                tableInnerHTML += '</tr>';
+            }
+            i++;
+        }
+        tableInnerHTML += '</tbody>';
+    }
+
+    if (getExplorer() !== 'Safari' && name.substr(-1, 4) !== '.xls') {
+        name += '.xls';
+    }
+
+    if (getExplorer() == 'ie') {
+        var curTbl = table;
+        var oXL = new ActiveXObject('Excel.Application');
+        var oWB = oXL.Workbooks.Add();
+        var xlsheet = oWB.Worksheets(1);
+        var sel = document.body.createTextRange();
+        sel.moveToElementText(curTbl);
+        sel.select();
+        sel.execCommand('Copy');
+        xlsheet.Paste();
+        oXL.Visible = true;
+
+        try {
+            var fname = oXL.Application.GetSaveAsFilename('Excel.xls', 'Excel Spreadsheets (*.xls), *.xls');
+        } catch (e) {
+            print('Nested catch caught ' + e);
+        } finally {
+            oWB.SaveAs(fname);
+            // oWB.Close(savechanges = false);
+            oXL.Quit();
+            oXL = null;
+            idTmr = setInterval(Cleanup(), 1);
+        }
+    } else {
+        tableToExcel(tableInnerHTML, aId, name);
+    }
+}
+function Cleanup () {
+    window.clearInterval(idTmr);
+    // CollectGarbage();
+}
+let tableToExcel = (function () {
+    let uri = 'data:application/vnd.ms-excel;base64,';
+    let template = '<html><head><meta charset="UTF-8"></head><body><table>{table}</table></body></html>';
+    let base64 = function (s) { return window.btoa(unescape(encodeURIComponent(s))); };
+    let format = function (s, c) {
+        return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
+    };
+    return function (table, aId, name) {
+        let ctx = {worksheet: name || 'Worksheet', table: table};
+        document.getElementById(aId).href = uri + base64(format(template, ctx));
+        document.getElementById(aId).download = name;
+        document.getElementById(aId).click();
+    };
+})();
+
+const table2excel = {};
+
+table2excel.transform = tranform;
+
+export default table2excel;
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
new file mode 100644
index 00000000..53fe0a98
--- /dev/null
+++ b/seller/src/libs/util.js
@@ -0,0 +1,459 @@
+import axios from 'axios';
+import { getMenuList } from '@/api/index';
+import lazyLoading from './lazyLoading.js';
+import router from '@/router/index';
+import Cookies from "js-cookie";
+import { result } from './routerJson.js';
+
+let util = {
+
+};
+
+util.title = function (title) {
+    title = title || 'lili ';
+    window.document.title = title;
+};
+
+util.millsToTime = function (mills) {
+    if (!mills) {
+        return "";
+    }
+    let s = mills / 1000;
+    if (s < 60) {
+        return s.toFixed(0) + " 秒"
+    }
+    let m = s / 60;
+    if (m < 60) {
+        return m.toFixed(0) + " 分钟"
+    }
+    let h = m / 60;
+    if (h < 24) {
+        return h.toFixed(0) + " 小时"
+    }
+    let d = h / 24;
+    if (d < 30) {
+        return d.toFixed(0) + " 天"
+    }
+    let month = d / 30
+    if (month < 12) {
+        return month.toFixed(0) + " 个月"
+    }
+    let year = month / 12
+    return year.toFixed(0) + " 年"
+
+};
+
+util.inOf = function (arr, targetArr) {
+    let res = true;
+    arr.forEach(item => {
+        if (targetArr.indexOf(item) < 0) {
+            res = false;
+        }
+    });
+    return res;
+};
+
+util.oneOf = function (ele, targetArr) {
+    if (targetArr.indexOf(ele) >= 0) {
+        return true;
+    } else {
+        return false;
+    }
+};
+
+util.getRouterObjByName = function (routers, name) {
+    if (!name || !routers || !routers.length) {
+        return null;
+    }
+    let routerObj = null;
+    for (let item of routers) {
+        if (item.name == name) {
+            return item;
+        }
+        routerObj = util.getRouterObjByName(item.children, name);
+        if (routerObj) {
+            return routerObj;
+        }
+    }
+    return null;
+};
+
+util.handleTitle = function (vm, item) {
+    if (typeof item.title == 'object') {
+        return vm.$t(item.title.i18n);
+    } else {
+        return item.title;
+    }
+};
+
+util.setCurrentPath = function (vm, name) {
+    let title = '';
+    let isOtherRouter = false;
+    vm.$store.state.app.routers.forEach(item => {
+        if (item.children.length == 1) {
+            if (item.children[0].name == name) {
+                title = util.handleTitle(vm, item);
+                if (item.name == 'otherRouter') {
+                    isOtherRouter = true;
+                }
+            }
+        } else {
+            item.children.forEach(child => {
+                if (child.name == name) {
+                    title = util.handleTitle(vm, child);
+                    if (item.name == 'otherRouter') {
+                        isOtherRouter = true;
+                    }
+                }
+            });
+        }
+    });
+    let currentPathArr = [];
+    if (name == 'home_index') {
+        currentPathArr = [
+            {
+                title: util.handleTitle(vm, util.getRouterObjByName(vm.$store.state.app.routers, 'home_index')),
+                path: '',
+                name: 'home_index'
+            }
+        ];
+    } else if ((name.indexOf('_index') >= 0 || isOtherRouter) && name !== 'home_index') {
+        currentPathArr = [
+            {
+                title: util.handleTitle(vm, util.getRouterObjByName(vm.$store.state.app.routers, 'home_index')),
+                path: '/home',
+                name: 'home_index'
+            },
+            {
+                title: title,
+                path: '',
+                name: name
+            }
+        ];
+    } else {
+        let currentPathObj = vm.$store.state.app.routers.filter(item => {
+            if (item.children.length <= 1) {
+                return item.children[0].name == name;
+            } else {
+                let i = 0;
+                let childArr = item.children;
+                let len = childArr.length;
+                while (i < len) {
+                    if (childArr[i].name == name) {
+                        return true;
+                    }
+                    i++;
+                }
+                return false;
+            }
+        })[0];
+        if (currentPathObj.children.length <= 1 && currentPathObj.name == 'home') {
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '',
+                    name: 'home_index'
+                }
+            ];
+        } else if (currentPathObj.children.length <= 1 && currentPathObj.name !== 'home') {
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '/home',
+                    name: 'home_index'
+                },
+                {
+                    title: currentPathObj.title,
+                    path: '',
+                    name: name
+                }
+            ];
+        } else {
+            let childObj = currentPathObj.children.filter((child) => {
+                return child.name == name;
+            })[0];
+            currentPathArr = [
+                {
+                    title: '首页',
+                    path: '/home',
+                    name: 'home_index'
+                },
+                {
+                    title: currentPathObj.title,
+                    path: '',
+                    name: currentPathObj.name
+                },
+                {
+                    title: childObj.title,
+                    path: currentPathObj.path + '/' + childObj.path,
+                    name: name
+                }
+            ];
+        }
+    }
+    vm.$store.commit('setCurrentPath', currentPathArr);
+
+    return currentPathArr;
+};
+
+util.openNewPage = function (vm, name, argu, query) {
+    if (!vm.$store) {
+        return;
+    }
+    let storeOpenedList = vm.$store.state.app.storeOpenedList;
+    let openedPageLen = storeOpenedList.length;
+    let i = 0;
+    let tagHasOpened = false;
+    while (i < openedPageLen) {
+        if (name == storeOpenedList[i].name) { // 页面已经打开
+            vm.$store.commit('storeOpenedList', {
+                index: i,
+                argu: argu,
+                query: query
+            });
+            tagHasOpened = true;
+            break;
+        }
+        i++;
+    }
+    if (!tagHasOpened) {
+        let tag = vm.$store.state.app.tagsList.filter((item) => {
+            if (item.children) {
+                return name == item.children[0].name;
+            } else {
+                return name == item.name;
+            }
+        });
+        tag = tag[0];
+        if (tag) {
+            tag = tag.children ? tag.children[0] : tag;
+            if (argu) {
+                tag.argu = argu;
+            }
+            if (query) {
+                tag.query = query;
+            }
+            vm.$store.commit('increateTag', tag);
+        }
+    }
+    vm.$store.commit('setCurrentPageName', name);
+};
+
+util.toDefaultPage = function (routers, name, route, next) {
+    let len = routers.length;
+    let i = 0;
+    let notHandle = true;
+    while (i < len) {
+        if (routers[i].name == name && routers[i].children && routers[i].redirect == undefined) {
+            route.replace({
+                name: routers[i].children[0].name
+            });
+            notHandle = false;
+            next();
+            break;
+        }
+        i++;
+    }
+    if (notHandle) {
+        next();
+    }
+};
+
+// 将Csv文件解析为二维数组
+export const getArrayFromFile = (file) => {
+    let nameSplit = file.name.split('.')
+    let format = nameSplit[nameSplit.length - 1]
+    return new Promise((resolve, reject) => {
+        let reader = new FileReader()
+        reader.readAsText(file) // 以文本格式读取
+        let arr = []
+        reader.onload = function (evt) {
+            let data = evt.target.result // 读到的数据
+            let pasteData = data.trim()
+            arr = pasteData.split((/[\n\u0085\u2028\u2029]|\r\n?/g)).map(row => {
+                return row.split('\t')
+            }).map(item => {
+                return item[0].split(',')
+            })
+            if (format == 'csv') resolve(arr)
+            else reject(new Error('[Format Error]:不是Csv文件'))
+        }
+    })
+}
+
+// 将二维数组转为表格数据
+export const getTableDataFromArray = (array) => {
+    let columns = []
+    let tableData = []
+    if (array.length > 1) {
+        let titles = array.shift()
+        columns = titles.map(item => {
+            return {
+                title: item,
+                key: item
+            }
+        })
+        tableData = array.map(item => {
+            let res = {}
+            item.forEach((col, i) => {
+                res[titles[i]] = col
+            })
+            return res
+        })
+    }
+    return {
+        columns,
+        tableData
+    }
+}
+
+util.initRouter = function (vm) { // 初始化路由
+    const constRoutes = [];
+    const otherRoutes = [];
+
+    // 404路由需要和动态路由一起加载
+    const otherRouter = [{
+        path: '/*',
+        name: 'error-404',
+        meta: {
+            title: '404-页面不存在'
+        },
+        component: 'error-page/404'
+    }];
+    // 判断用户是否登录
+    let userInfo = Cookies.get('userInfo')
+    // if (!userInfo) {
+    //     // 未登录
+    //     return;
+    // }
+
+    if (!vm.$store.state.app.added) {
+        // 第一次加载 读取数据
+        let accessToken = window.localStorage.getItem('accessToken');
+        // 加载菜单
+        // axios.get(getMenuList, { headers: { 'accessToken': accessToken } }).then(res => {
+            // let menuData = res.result;
+            let menuData = result;
+            if (!menuData) {
+                return;
+            }
+            util.initAllMenuData(constRoutes, menuData);
+            util.initRouterNode(otherRoutes, otherRouter);
+            // 添加所有主界面路由
+            vm.$store.commit('updateAppRouter', constRoutes.filter(item => item.children.length > 0));
+            // 添加全局路由
+            vm.$store.commit('updateDefaultRouter', otherRoutes);
+            // 添加菜单路由
+            util.initMenuData(vm, menuData);
+            // 缓存数据 修改加载标识
+            window.localStorage.setItem('menuData', JSON.stringify(menuData));
+            vm.$store.commit('setAdded', true);
+        // });
+    } else {
+        // 读取缓存数据
+        let data = window.localStorage.getItem('menuData');
+        if (!data) {
+            vm.$store.commit('setAdded', false);
+            return;
+        }
+        let menuData = JSON.parse(data);
+        // 添加菜单路由
+        util.initMenuData(vm, menuData);
+    }
+};
+
+// 添加所有顶部导航栏下的菜单路由
+util.initAllMenuData = function (constRoutes, data) {
+
+    let allMenuData = [];
+    data.forEach(e => {
+        if (e.type == -1) {
+            e.children.forEach(item => {
+                allMenuData.push(item);
+            })
+        }
+    })
+    util.initRouterNode(constRoutes, allMenuData);
+}
+
+// 生成菜单格式数据
+util.initMenuData = function (vm, data) {
+    const menuRoutes = [];
+    let menuData = data;
+    // 顶部菜单
+    let navList = [];
+    menuData.forEach(e => {
+        let nav = {
+            name: e.name,
+            title: e.title,
+            icon: e.icon
+        }
+        navList.push(nav);
+    })
+    if (navList.length < 1) {
+        return;
+    }
+    // 存入vuex
+    vm.$store.commit('setNavList', navList);
+    let currNav = window.localStorage.getItem('currNav')
+    if (currNav) {
+        // 读取缓存title
+        for (var item of navList) {
+            if (item.name == currNav) {
+                vm.$store.commit('setCurrNavTitle', item.title);
+                break;
+            }
+        }
+    } else {
+        // 默认第一个
+        currNav = navList[0].name;
+        vm.$store.commit('setCurrNavTitle', navList[0].title);
+    }
+    vm.$store.commit('setCurrNav', currNav);
+    for (var item of menuData) {
+        if (item.name == currNav) {
+            // 过滤
+            menuData = item.children;
+            break;
+        }
+    }
+    util.initRouterNode(menuRoutes, menuData);
+    // 刷新界面菜单
+    vm.$store.commit('updateMenulist', menuRoutes.filter(item => item.children.length > 0));
+
+    let tagsList = [];
+    vm.$store.state.app.routers.map((item) => {
+        if (item.children.length <= 1) {
+            tagsList.push(item.children[0]);
+        } else {
+            tagsList.push(...item.children);
+        }
+    });
+    vm.$store.commit('setTagsList', tagsList);
+};
+
+// 生成路由节点
+util.initRouterNode = function (routers, data) {  // data为所有子菜单数据
+
+    for (var item of data) {
+        let menu = Object.assign({}, item);
+        // menu.component = import(`@/views/${menu.component}.vue`);
+        menu.component = lazyLoading(menu.component);
+
+        if (item.children && item.children.length > 0) {
+            menu.children = [];
+            util.initRouterNode(menu.children, item.children);
+        }
+
+        let meta = {};
+        // 给页面添加权限、标题、第三方网页链接
+        meta.permTypes = menu.permTypes ? menu.permTypes : null;
+        meta.title = menu.title ? menu.title + " - lilishop商家后台" : null;
+        meta.url = menu.url ? menu.url : null;
+        menu.meta = meta;
+
+        routers.push(menu);
+    }
+};
+
+export default util;
diff --git a/seller/src/libs/validate.js b/seller/src/libs/validate.js
new file mode 100644
index 00000000..7b6000aa
--- /dev/null
+++ b/seller/src/libs/validate.js
@@ -0,0 +1,80 @@
+/**
+ * 密码格式验证
+ * @param rule 验证规则（不少于6位）
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validatePassword = (rule, value, callback) => {
+  if (value.length < 6) {
+    callback(new Error('密码长度不得小于6位'));
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 手机号码格式验证
+ * @param rule 验证规则
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validateMobile = (rule, value, callback) => {
+  var reg = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+  if (!reg.test(value)) {
+    callback(new Error('手机号格式错误'));
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 身份证号码格式验证
+ * @param rule 验证规则（是否满足18位）
+ * @param value 需要验证的值
+ * @param callback 回调函数
+ */
+export const validateIDCard = (rule, value, callback) => {
+  const reg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+  if (!reg.test(value)) {
+    callback(new Error('身份证号码格式错误'));
+  } else {
+    callback();
+  }
+};
+
+
+// 验证是否整数
+export function isInteger(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('输入不可以为空'));
+    }
+    setTimeout(() => {
+        if (!Number(value)) {
+            callback(new Error('请输入正整数'));
+        } else {
+            const re = /^[0-9]*[1-9][0-9]*$/;
+            const rsCheck = re.test(value);
+            if (!rsCheck) {
+                callback(new Error('请输入正整数'));
+            } else {
+                callback();
+            }
+        }
+    }, 1000);
+}
+export function isMoney(rule, value, callback) {
+    if (!value) {
+        return callback(new Error('输入不可以为空'));
+    }
+    let re =/(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/;
+    const rsCheck = re.test(value);
+    if (!rsCheck) {
+        callback(new Error('请输入正整数'));
+    } else {
+        callback();
+    }
+}
+
+export function validatetoFixedNew(str) {
+    return str ;
+}
diff --git a/seller/src/libs/zh.json b/seller/src/libs/zh.json
new file mode 100644
index 00000000..70dcf56b
--- /dev/null
+++ b/seller/src/libs/zh.json
@@ -0,0 +1,20 @@
+{
+    "name": "zh",
+    "options": {
+        "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+        "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+        "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+        "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+        "toolbar": {
+            "exportToSVG": "下载图表 SVG",
+            "exportToPNG": "下载图表 PNG",
+            "menu": "菜单",
+            "selection": "选择",
+            "selectionZoom": "区域缩放",
+            "zoomIn": "缩小",
+            "zoomOut": "放大",
+            "pan": "移动",
+            "reset": "重置缩放"
+        }
+    }
+  }
\ No newline at end of file
diff --git a/seller/src/locale/index.js b/seller/src/locale/index.js
new file mode 100644
index 00000000..ea3e99f0
--- /dev/null
+++ b/seller/src/locale/index.js
@@ -0,0 +1,28 @@
+import Vue from 'vue';
+import VueI18n from 'vue-i18n';
+import zhLocale from './lang/zh-CN';
+import enLocale from './lang/en-US';
+import zhCnLocale from 'view-design/src/locale/lang/zh-CN';
+import enUsLocale from 'view-design/src/locale/lang/en-US';
+
+Vue.use(VueI18n);
+
+// 根据浏览器信息自动设置语言
+const navLang = navigator.language;
+const localLang = (navLang == 'zh-CN' || navLang == 'en-US') ? navLang : false;
+const lang = window.localStorage.lang || localLang || 'zh-CN';
+
+Vue.config.lang = lang;
+
+// 多语言配置 vue-i18n 6.x+
+Vue.locale = () => { };
+const messages = {
+    'zh-CN': Object.assign(zhCnLocale, zhLocale),
+    'en-US': Object.assign(enUsLocale, enLocale)
+};
+const i18n = new VueI18n({
+    locale: lang,
+    messages
+});
+
+export default i18n;
diff --git a/seller/src/locale/lang/en-US.js b/seller/src/locale/lang/en-US.js
new file mode 100644
index 00000000..eaaff0a1
--- /dev/null
+++ b/seller/src/locale/lang/en-US.js
@@ -0,0 +1,24 @@
+export default {
+    lili: 'lili',
+    usernameLogin: 'UsernameLogin',
+    mobileLogin: 'MobileLogin',
+    autoLogin: 'Auto Login',
+    forgetPass: 'Forget Password',
+    otherLogin: 'Sign in with',
+    regist: 'Register',
+    login: 'Login',
+    logining: 'Logining...',
+    home: 'home',
+    switchLangTitle: 'Switch Lang',
+    international: 'Switch Lang',
+    userCenter: 'Account Center',
+    changePass: 'Account Pass',
+    logout: 'Logout',
+    tagOption: 'Label Options',
+    closeAll: 'Close All',
+    closeOthers: 'Close Others',
+    help: 'Help',
+    privacy: 'Privacy',
+    terms: 'Terms',
+    rights: 'All Rights Reserved'
+};
diff --git a/seller/src/locale/lang/zh-CN.js b/seller/src/locale/lang/zh-CN.js
new file mode 100644
index 00000000..968673b1
--- /dev/null
+++ b/seller/src/locale/lang/zh-CN.js
@@ -0,0 +1,24 @@
+export default {
+    lili: 'lili',
+    usernameLogin: '账户密码登录',
+    mobileLogin: '手机号登录',
+    autoLogin: '自动登录',
+    forgetPass: '忘记密码',
+    otherLogin: '其他方式登录',
+    regist: '注册账户',
+    login: '登录',
+    logining: '登录中...',
+    home: '首页',
+    switchLangTitle: '切换语言',
+    international: '多语言切换',
+    userCenter: '个人中心',
+    changePass: '修改密码',
+    logout: '退出登录',
+    tagOption: '标签选项',
+    closeAll: '关闭全部',
+    closeOthers: '关闭其他',
+    help: '帮助',
+    privacy: '隐私',
+    terms: '条款',
+    rights: '版权所有'
+};
diff --git a/seller/src/main.js b/seller/src/main.js
new file mode 100644
index 00000000..1828a240
--- /dev/null
+++ b/seller/src/main.js
@@ -0,0 +1,87 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from "vue";
+import ViewUI from "view-design";
+import "./styles/theme.less";
+
+import "core-js/stable";
+import "regenerator-runtime/runtime";
+
+import App from "./App";
+import { router } from "./router/index";
+import store from "./store";
+import i18n from "@/locale";
+
+import {
+  getRequest,
+  postRequest,
+  putRequest,
+  deleteRequest,
+  importRequest,
+  uploadFileRequest
+} from "@/libs/axios";
+import { setStore, getStore, removeStore } from "@/libs/storage";
+
+import util from "@/libs/util";
+import dictUtil from "@/libs/dictUtil";
+
+import VueLazyload from "vue-lazyload";
+import VueClipboard from "vue-clipboard2";
+
+import * as filters from "@/utils/filters"; // global filter
+
+import { md5 } from "@/utils/md5.js";
+Vue.config.devtools = true;
+Vue.config.productionTip = false;
+Vue.use(VueLazyload, {
+  error: require("./assets/img-error.png"),
+  loading: require("./assets/loading2.gif")
+});
+Vue.use(ViewUI, {
+  i18n: (key, value) => i18n.t(key, value)
+});
+
+Vue.use(VueClipboard);
+
+// 挂载全局使用的方法
+Vue.prototype.getRequest = getRequest;
+Vue.prototype.postRequest = postRequest;
+Vue.prototype.putRequest = putRequest;
+Vue.prototype.deleteRequest = deleteRequest;
+Vue.prototype.importRequest = importRequest;
+Vue.prototype.uploadFileRequest = uploadFileRequest;
+Vue.prototype.setStore = setStore;
+Vue.prototype.getStore = getStore;
+Vue.prototype.removeStore = removeStore;
+Vue.prototype.md5 = md5;
+
+Array.prototype.remove = function(from, to) {
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
+};
+
+Object.keys(filters).forEach(key => {
+  Vue.filter(key, filters[key]);
+});
+/* eslint-disable no-new */
+new Vue({
+  el: "#app",
+  router,
+  store,
+  i18n,
+  render: h => h(App),
+  data: {
+    currentPageName: ""
+  },
+  mounted() {
+    // 初始化菜单
+    util.initRouter(this);
+    // 初始化全局数据字典
+    dictUtil.initDictData(this);
+    this.currentPageName = this.$route.name;
+    // 显示打开的页面的列表
+    this.$store.commit("setOpenedList");
+    this.$store.commit("initCachepage");
+  }
+});
diff --git a/seller/src/router/index.js b/seller/src/router/index.js
new file mode 100644
index 00000000..07268bff
--- /dev/null
+++ b/seller/src/router/index.js
@@ -0,0 +1,46 @@
+import Vue from 'vue';
+import ViewUI from 'view-design';
+import Util from '../libs/util';
+import VueRouter from 'vue-router';
+import Cookies from 'js-cookie';
+import {routers} from './router';
+
+Vue.use(VueRouter);
+
+// 路由配置
+const RouterConfig = {
+  mode: 'history',
+  routes: routers
+};
+
+export const router = new VueRouter(RouterConfig);
+
+router.beforeEach((to, from, next) => {
+  ViewUI.LoadingBar.start();
+  Util.title(to.meta.title);
+
+  next();
+
+  const name = to.name;
+
+  if (!Cookies.get('userInfo') && name !== 'login') {
+    // 判断是否已经登录且前往的页面不是登录页
+    next({
+      name: 'login'
+    });
+  } else if (Cookies.get('userInfo') && name === 'login') {
+    // 判断是否已经登录且前往的是登录页
+    Util.title();
+    next({
+      name: 'home_index'
+    });
+  } else {
+    Util.toDefaultPage([...routers], name, router, next);
+  }
+});
+
+router.afterEach((to) => {
+  Util.openNewPage(router.app, to.name, to.params, to.query);
+  ViewUI.LoadingBar.finish();
+  window.scrollTo(0, 0);
+});
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
new file mode 100644
index 00000000..38a5731a
--- /dev/null
+++ b/seller/src/router/router.js
@@ -0,0 +1,165 @@
+import Main from "@/views/Main.vue";
+
+// 不作为Main组件的子页面展示的页面单独写，如下
+export const loginRouter = {
+  path: "/login",
+  name: "login",
+  meta: {
+    title: "登录 - lili "
+  },
+  component: () => import("@/views/login.vue")
+};
+
+// 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
+export const otherRouter = {
+  path: "/",
+  name: "otherRouter",
+  redirect: "/home",
+  component: Main,
+  children: [
+    {
+      path: "home",
+      title: { i18n: "home" },
+      name: "home_index",
+      component: () => import("@/views/home/home.vue")
+    },
+    {
+      path: "change-password",
+      title: "修改密码",
+      name: "change_pass",
+      component: () => import("@/views/change-password/change-password.vue")
+    },
+    {
+      path: "message",
+      title: "消息中心",
+      name: "message_index",
+      component: () => import("@/views/message/message.vue")
+    },
+    {
+      path: "stock-goods",
+      title: "店铺端商品库存告警列表",
+      name: "stock-goods",
+      component: () => import("@/views/goods/goods-seller/goodsStock.vue")
+    },
+    {
+      path: "goods-operation",
+      title: "添加商品",
+      name: "goods-operation",
+      component: () => import("@/views/goods/goods-seller/goodsOperation.vue")
+    },
+    {
+      path: "goods-operation-edit",
+      title: "编辑商品",
+      name: "goods-operation-edit",
+      component: () => import("@/views/goods/goods-seller/goodsOperation.vue")
+    },
+    {
+      path: "goods-template-operation-edit",
+      title: "编辑模版",
+      name: "goods-template-operation-edit",
+      component: () => import("@/views/goods/goods-seller/goodsOperation.vue")
+    },
+    {
+      path: "goods-draft-operation-edit",
+      title: "编辑草稿",
+      name: "goods-draft-operation-edit",
+      component: () => import("@/views/goods/goods-seller/goodsOperation.vue")
+    },
+    {
+      path: "add-coupon",
+      title: "店铺优惠券",
+      name: "add-coupon",
+      component: () => import("@/views/promotion/coupon/couponPublish.vue")
+    },
+    {
+      path: "bill-detail",
+      title: "结算单详情",
+      name: "bill-detail",
+      component: () => import("@/views/shop/bill/billDetail.vue")
+    },
+    {
+      path: "seckill-goods",
+      title: "限时抢购商品",
+      name: "seckill-goods",
+      component: () => import("@/views/promotion/seckill/seckillGoods.vue")
+    },
+    {
+      path: "pintuan-goods",
+      title: "拼团商品",
+      name: "pintuan-goods",
+      component: () => import("@/views/promotion/pintuan/pintuanGoods.vue")
+    },
+    {
+      path: "new-pintuan",
+      title: "新增拼团",
+      name: "new-pintuan",
+      component: () => import("@/views/promotion/pintuan/newPintuan.vue")
+    },
+    {
+      path: "order-detail",
+      title: "订单详情",
+      name: "order-detail",
+      component: () => import("@/views/order/order/orderDetail.vue")
+    },
+    {
+      path: "order-complaint-detail",
+      title: "投诉详情",
+      name: "order-complaint-detail",
+      component: () =>
+        import("@/views/order/after-order/orderComplaintDetail.vue")
+    },
+    {
+      path: "return-goods-order-detail",
+      title: "售后详情",
+      name: "return-goods-order-detail",
+      component: () =>
+        import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
+    },
+    {
+      path: "full-cut",
+      title: "满优惠",
+      name: "full-cut",
+      component: () => import("@/views/promotion/fullCut/full-cut.vue")
+    },
+    {
+      path: "full-cut-detail",
+      title: "添加满优惠",
+      name: "full-cut-detail",
+      component: () => import("@/views/promotion/fullCut/newFullCut.vue")
+    },
+    {
+      path: "order-detail",
+      title: "订单详情",
+      name: "order-detail",
+      component: () => import("@/views/order/order/orderDetail.vue")
+    },
+    // {
+    //   path: "/*",
+    //   name: "error-404",
+    //   meta: {
+    //     title: "404-页面不存在"
+    //   },
+    //   component: () => import("@/views/error-page/404.vue")
+    // }
+  ]
+};
+
+export const page403 = {
+  path: "/403",
+  meta: {
+    title: "403-权限不足"
+  },
+  name: "error-403",
+  component: () => import("@/views/error-page/403.vue")
+};
+
+export const page500 = {
+  path: "/500",
+  meta: {
+    title: "500-服务端错误"
+  },
+  name: "error-500",
+  component: () => import("@/views/error-page/500.vue")
+};
+// 所有上面定义的路由都要写在下面的routers里
+export const routers = [loginRouter, otherRouter, page500, page403];
diff --git a/seller/src/store/index.js b/seller/src/store/index.js
new file mode 100644
index 00000000..2df323d7
--- /dev/null
+++ b/seller/src/store/index.js
@@ -0,0 +1,28 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+
+import app from './modules/app';
+import user from './modules/user';
+import dict from './modules/dict';
+
+Vue.use(Vuex);
+
+const store = new Vuex.Store({
+    state: {
+        // 状态
+
+    },
+    mutations: {
+        // 改变方法
+    },
+    actions: {
+
+    },
+    modules: {
+        app,
+        user,
+        dict
+    }
+});
+
+export default store;
diff --git a/seller/src/store/modules/app.js b/seller/src/store/modules/app.js
new file mode 100644
index 00000000..a0c3d292
--- /dev/null
+++ b/seller/src/store/modules/app.js
@@ -0,0 +1,177 @@
+import { otherRouter } from '@/router/router';
+import { router } from '@/router/index';
+import Util from '@/libs/util';
+import Cookies from 'js-cookie';
+import Vue from 'vue';
+
+const app = {
+    state: {
+        styleStore:"", //移动端楼层装修中选择风格存储
+        loading: false, // 全局加载动画
+        added: false, // 加载路由标识
+        navList: [], // 顶部菜单
+        currNav: "", // 当前顶部菜单name
+        currNavTitle: "", // 当前顶部菜单标题
+        cachePage: [],
+        lang: '',
+        isFullScreen: false,
+        openedSubmenuArr: [], // 要展开的菜单数组
+        menuTheme: 'dark', // 主题
+        themeColor: '',
+        storeOpenedList: [{
+            title: '首页',
+            path: '',
+            name: 'home_index'
+        }],
+        currentPageName: '',
+        currentPath: [
+            {
+                title: '首页',
+                path: '',
+                name: 'home_index'
+            }
+        ], 
+        // 面包屑数组 左侧菜单
+        menuList: [],
+        routers: [
+            otherRouter
+        ],
+        tagsList: [...otherRouter.children],
+        messageCount: 0,
+        // 在这里定义你不想要缓存的页面的name属性值(参见路由配置router.js)
+        dontCache: ['test', 'test']
+    },
+    mutations: {
+        // 动态添加主界面路由，需要缓存
+        updateAppRouter(state, routes) {
+            state.routers.push(...routes);
+            router.addRoutes(routes);
+        },
+        // 动态添加全局路由404、500等页面，不需要缓存
+        updateDefaultRouter(state, routes) {
+            router.addRoutes(routes);
+        },
+        setLoading(state, v) {
+            state.loading = v;
+        },
+        setAdded(state, v) {
+            state.added = v;
+        },
+        setNavList(state, list) {
+            state.navList = list;
+        },
+        setCurrNav(state, v) {
+            state.currNav = v;
+        },
+        setCurrNavTitle(state, v) {
+            state.currNavTitle = v;
+        },
+        setTagsList(state, list) {
+            state.tagsList.push(...list);
+        },
+        updateMenulist(state, routes) {
+            state.menuList = routes;
+        },
+        addOpenSubmenu(state, name) {
+            let hasThisName = false;
+            let isEmpty = false;
+            if (name.length == 0) {
+                isEmpty = true;
+            }
+            if (state.openedSubmenuArr.indexOf(name) > -1) {
+                hasThisName = true;
+            }
+            if (!hasThisName && !isEmpty) {
+                state.openedSubmenuArr.push(name);
+            }
+        },
+        closePage(state, name) {
+            state.cachePage.forEach((item, index) => {
+                if (item == name) {
+                    state.cachePage.splice(index, 1);
+                }
+            });
+        },
+        initCachepage(state) {
+            if (localStorage.cachePage) {
+                state.cachePage = JSON.parse(localStorage.cachePage);
+            }
+        },
+        removeTag(state, name) {
+            state.storeOpenedList.map((item, index) => {
+                if (item.name == name) {
+                    state.storeOpenedList.splice(index, 1);
+                }
+            });
+        },
+        storeOpenedList(state, get) {
+            let openedPage = state.storeOpenedList[get.index];
+            if (get.argu) {
+                openedPage.argu = get.argu;
+            }
+            if (get.query) {
+                openedPage.query = get.query;
+            }
+            state.storeOpenedList.splice(get.index, 1, openedPage);
+            localStorage.storeOpenedList = JSON.stringify(state.storeOpenedList);
+        },
+        clearAllTags(state) {
+            state.storeOpenedList.splice(1);
+            state.cachePage.length = 0;
+            localStorage.storeOpenedList = JSON.stringify(state.storeOpenedList);
+        },
+        clearOtherTags(state, vm) {
+            let currentName = vm.$route.name;
+            let currentIndex = 0;
+            state.storeOpenedList.forEach((item, index) => {
+                if (item.name == currentName) {
+                    currentIndex = index;
+                }
+            });
+            if (currentIndex == 0) {
+                state.storeOpenedList.splice(1);
+            } else {
+                state.storeOpenedList.splice(currentIndex + 1);
+                state.storeOpenedList.splice(1, currentIndex - 1);
+            }
+            let newCachepage = state.cachePage.filter(item => {
+                return item == currentName;
+            });
+            state.cachePage = newCachepage;
+            localStorage.storeOpenedList = JSON.stringify(state.storeOpenedList);
+        },
+        setOpenedList(state) {
+            state.storeOpenedList = localStorage.storeOpenedList ? JSON.parse(localStorage.storeOpenedList) : [otherRouter.children[0]];
+        },
+        setCurrentPath(state, pathArr) {
+            state.currentPath = pathArr;
+        },
+        setCurrentPageName(state, name) {
+            state.currentPageName = name;
+        },
+        setAvatarPath(state, path) {
+            localStorage.avatorImgPath = path;
+        },
+        switchLang(state, lang) {
+            state.lang = lang;
+            localStorage.lang = lang;
+            Vue.config.lang = lang;
+        },
+        clearOpenedSubmenu(state) {
+            state.openedSubmenuArr.length = 0;
+        },
+        setMessageCount(state, count) {
+            state.messageCount = count;
+        },
+        increateTag(state, tagObj) {
+            if (!Util.oneOf(tagObj.name, state.dontCache)) {
+                state.cachePage.push(tagObj.name);
+                localStorage.cachePage = JSON.stringify(state.cachePage);
+            }
+            state.storeOpenedList.push(tagObj);
+            localStorage.storeOpenedList = JSON.stringify(state.storeOpenedList);
+        }
+    }
+};
+
+export default app;
diff --git a/seller/src/store/modules/dict.js b/seller/src/store/modules/dict.js
new file mode 100644
index 00000000..13580af3
--- /dev/null
+++ b/seller/src/store/modules/dict.js
@@ -0,0 +1,26 @@
+const dict = {
+    state: {
+        // 经常需要读取的数据字典
+        sex: [],
+        messageType: [],
+        priority: [],
+        leaveType: []
+    },
+    mutations: {
+        // 设置值的改变方法
+        setSex(state, list) {
+            state.sex = list;
+        },
+        setMessageType(state, list) {
+            state.messageType = list;
+        },
+        setPriority(state, list) {
+            state.priority = list;
+        },
+        setLeaveType(state, list) {
+            state.leaveType = list;
+        },
+    }
+};
+
+export default dict;
diff --git a/seller/src/store/modules/user.js b/seller/src/store/modules/user.js
new file mode 100644
index 00000000..bd84c739
--- /dev/null
+++ b/seller/src/store/modules/user.js
@@ -0,0 +1,14 @@
+import Cookies from 'js-cookie';
+
+const user = {
+    state: {},
+    mutations: {
+        logout () {
+            Cookies.remove('userInfo');
+            // 清空打开的页面等数据
+            localStorage.clear();
+        }
+    }
+};
+
+export default user;
diff --git a/seller/src/styles/common.scss b/seller/src/styles/common.scss
new file mode 100644
index 00000000..41d2dd26
--- /dev/null
+++ b/seller/src/styles/common.scss
@@ -0,0 +1,195 @@
+$theme_color: #804ed1;
+
+
+//自动移滚动条样式
+::-webkit-scrollbar{
+  width: 1px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.3);
+}
+::-webkit-scrollbar-track{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.1);
+}
+
+
+.flex{
+  display: flex !important;
+
+}
+.flex_justify_content{
+  justify-content: center;
+}
+.flex_align_item{
+  align-items: center;
+}
+
+.global_text_left {
+  text-align: left;
+}
+.global_text_right {
+  text-align: right;
+}
+.global_float_left {
+  float: left;
+}
+.global_float_right {
+    float: right;
+}
+.clearfix::after{
+    content: '';
+    display: block;
+    clear: both;
+}
+.width_1200{width: 1200px;}
+.width_800{width: 800px;}
+.width_400{width: 400px;}
+.width_300{width: 300px;}
+.width_200{width: 200px;}
+.width_100{width: 100px;}
+
+.fz_12{font-size: 12px;}
+.fz_14{font-size: 14px;}
+.fz_16{font-size: 16px;}
+.fz_18{font-size: 18px;}
+.fw_bold{font-weight: bold;}
+
+.mb_20{margin-bottom: 20px;}
+.mt_20{margin-top: 20px;}
+.ml_20{margin-left: 20px;}
+.mr_20{margin-right: 20px;}
+
+.mb_10{margin-bottom: 10px;}
+.mt_10{margin-top: 10px;}
+.ml_10{margin-left: 10px;}
+.mr_10{margin-right: 10px;}
+
+.pb_20{padding-bottom: 20px;}
+.pt_20{padding-top: 20px;}
+.pl_20{padding-left: 20px;}
+.pr_20{padding-right: 20px;}
+
+.pb_10{padding-bottom: 10px;}
+.pt_10{padding-top: 10px;}
+.pl_10{padding-left: 10px;}
+.pr_10{padding-right: 10px;}
+
+ul,li{
+    list-style: none;
+}
+
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+
+/*
+ * @Author: LMR
+ * @Date: 2020-08-14 11:04:12
+ * @Last Modified by: LMR
+ * @Last Modified time: 2020-08-18 14:21:41
+ */
+
+// 主题颜色
+
+// 明亮主题颜色
+$primary_color: #2d8cf0;
+$primary_light_color: #0f1011;
+$primary_dark_color: #2b85e4;
+$success_color: #19be6b;
+$warning_color: #ff9900;
+$error_color: #ed3f14;
+$handle-btn-color: #438cde;
+
+$theme_color: #ed3f14;
+
+$border_color: #dddee1;
+$title_color: #8c8c8c;
+$light_title_color: #1c2438;
+$light_content_color: #495060;
+$light_sub_color: #80848f;
+$light_background_color: #f8f8f9;
+$light_white_background_color: #fff;
+// 暗黑主题颜色
+$dark_background_color: #141414;
+$dark_sub_background_color: #1d1d1d; //稍微浅一点的
+$dark_content_color: #d5d5d5;
+
+/***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
+
+// 背景颜色
+@mixin background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+// 辅助背景颜色
+@mixin sub_background_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_background_color;
+  }
+}
+
+@mixin white_background_color() {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  background-color: $light_white_background_color;
+  transition: 0.35s;
+  [data-theme="dark"] & {
+    background-color: $dark_sub_background_color;
+  }
+  [data-theme="light"] & {
+    background-color: $light_white_background_color;
+  }
+}
+
+// 正文颜色
+@mixin content_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_content_color;
+  }
+}
+
+// 辅助颜色
+@mixin sub_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_sub_color;
+  }
+}
+
+// 标题颜色
+@mixin title_color($color) {
+  /*通过该函数设置字体颜色，后期方便统一管理；*/
+  color: $color;
+  [data-theme="dark"] & {
+    color: $dark_content_color;
+  }
+  [data-theme="light"] & {
+    color: $light_title_color;
+  }
+}
diff --git a/seller/src/styles/table-common.scss b/seller/src/styles/table-common.scss
new file mode 100644
index 00000000..0b2396bc
--- /dev/null
+++ b/seller/src/styles/table-common.scss
@@ -0,0 +1,83 @@
+.search {
+    .operation {
+        margin-bottom: 2vh;
+    }
+
+    .select-count {
+        font-weight: 600;
+        color: #40a9ff;
+    }
+
+    .select-clear {
+        margin-left: 10px;
+    }
+
+    .page {
+        margin-top: 2vh;
+    }
+
+    .drop-down {
+        margin-left: 5px;
+    }
+}
+
+.tree-list {
+    position: relative;
+    min-height: 80px;
+}
+
+.drawer-footer {
+    z-index: 10;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    background: #fff;
+}
+
+.block-tool .ivu-tooltip,
+.block-tool .ivu-tooltip-rel {
+    display: block;
+}
+
+.block-pop .ivu-poptip,
+.block-pop .ivu-poptip-rel {
+    display: block;
+}
+
+.search-input{
+  width: 270px;
+  margin-right: 20px;
+}
+.ivu-form-item{
+  margin:8px 10px !important;
+}
+.search-form {
+  width: 100% !important;
+  display: flex;
+  align-items: center;
+  background-color: #F0F0F0;
+  padding: 10px;
+  margin: 0;
+  flex-wrap: wrap;
+  /deep/ .ivu-form-item{
+
+  }
+}
+.padding-row{
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.search-btn{
+  margin-left: 20px;
+}
+
+.div-zoom{
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  overflow: hidden;
+}
diff --git a/seller/src/styles/theme.less b/seller/src/styles/theme.less
new file mode 100644
index 00000000..1032cdb9
--- /dev/null
+++ b/seller/src/styles/theme.less
@@ -0,0 +1,9 @@
+@import "~view-design/src/styles/index.less";
+// iview 自定义样式
+
+@primary-color: #ed3f14;
+@table-thead-bg: #f8f8f9;
+@table-td-stripe-bg: #f8f8f9;
+@table-td-hover-bg: #ededed;
+@table-td-highlight-bg: #ededed;
+@font-size-base: 12px;
diff --git a/seller/src/styles/tree-common.scss b/seller/src/styles/tree-common.scss
new file mode 100644
index 00000000..2311877c
--- /dev/null
+++ b/seller/src/styles/tree-common.scss
@@ -0,0 +1,42 @@
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+
+  .select-title {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+
+  .select-clear {
+    margin-left: 10px;
+  }
+}
+
+.tree-bar {
+  overflow: auto;
+  margin-top: 5px;
+  position: relative;
+  min-height: 80px;
+}
+
+.tree-bar::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.tree-bar::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 0 2px #d1d1d1;
+  background: #e4e4e4;
+}
+
+.block-tool .ivu-tooltip,
+.block-tool .ivu-tooltip-rel {
+  display: block;
+}
+
+.block-pop .ivu-poptip,
+.block-pop .ivu-poptip-rel {
+  display: block;
+}
diff --git a/seller/src/utils/filters.js b/seller/src/utils/filters.js
new file mode 100644
index 00000000..f5b6f8a4
--- /dev/null
+++ b/seller/src/utils/filters.js
@@ -0,0 +1,118 @@
+/**
+ * 金钱单位置换  2999 --> 2,999.00
+ * @param val
+ * @param unit
+ * @param location
+ * @returns {*}
+ */
+export function unitPrice(val, unit, location) {
+  let price = formatPrice(val)
+  if (location === 'before') {
+    return price.substr(0, price.length - 3)
+  }
+  if (location === 'after') {
+    return price.substr(-2)
+  }
+  return (unit || '') + price
+}
+
+
+
+/**
+ * 货币格式化
+ * @param price
+ * @returns {string}
+ */
+export function formatPrice(price) {
+  if (typeof price !== 'number') return price
+  return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+}
+
+/**
+ * 处理unix时间戳，转换为可阅读时间格式
+ * @param unix
+ * @param format
+ * @returns {*|string}
+ */
+export function unixToDate(unix, format) {
+  let _format = format || 'yyyy-MM-dd hh:mm:ss'
+  const d = new Date(unix * 1000)
+  const o = {
+    'M+': d.getMonth() + 1,
+    'd+': d.getDate(),
+    'h+': d.getHours(),
+    'm+': d.getMinutes(),
+    's+': d.getSeconds(),
+    'q+': Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
+  }
+  if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (const k in o) if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  return _format
+}
+//是否格式化
+export function unixWhether(status) {
+  switch (status) {
+      case 'YES':
+        return "是"
+      case 'NO':
+        return "否"
+  }
+}
+
+export function unixSellerBillStatus(status_code) {
+  switch (status_code) {
+    case 'OUT':
+      return '已出账'
+    case 'CHECK':
+      return '已对账'
+    case 'EXAMINE':
+      return '已审核'
+    case 'PAY':
+      return '已结算'
+    case 'COMPLETE':
+      return '已完成'
+  }
+}
+export function unixSwitchStatus(status_code) {
+  switch (status_code) {
+    case 'OPEN':
+      return '开启'
+    case 'CLOSE':
+      return '关闭'
+  }
+}
+
+/**
+ * 13888888888 -> 138****8888
+ * @param mobile
+ * @returns {*}
+ */
+export function secrecyMobile(mobile) {
+  mobile = String(mobile)
+  if (!/\d{11}/.test(mobile)) {
+    return mobile
+  }
+  return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+}
+
+
+export function formatDate(date, fmt) {
+  if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+  };
+  for (let k in o) {
+      if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + '';
+          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+      }
+  }
+  return fmt;
+};
diff --git a/seller/src/utils/index.js b/seller/src/utils/index.js
new file mode 100644
index 00000000..6d4832f7
--- /dev/null
+++ b/seller/src/utils/index.js
@@ -0,0 +1,27 @@
+import * as regular from './regular'
+
+export {
+  regular
+}
+
+
+/**
+ * 数组对象深拷贝
+ * @param obj
+ * @returns {*}
+ */
+export default function cloneObj(obj) {
+  let str = null
+  let newobj = obj.constructor === Array ? [] : {}
+  if (typeof obj !== 'object') {
+    return
+  } else if (window && window.JSON) {
+    str = JSON.stringify(obj) // 系列化对象
+    newobj = JSON.parse(str) // 还原
+  } else {
+    for (var i in obj) {
+      newobj[i] = typeof obj[i] === 'object' ? cloneObj(obj[i]) : obj[i]
+    }
+  }
+  return newobj
+}
diff --git a/seller/src/utils/md5.js b/seller/src/utils/md5.js
new file mode 100644
index 00000000..e5741303
--- /dev/null
+++ b/seller/src/utils/md5.js
@@ -0,0 +1,223 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 1.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Code also contributed by Greg Holt
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y) {
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF)
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+  return (msw << 16) | (lsw & 0xFFFF)
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function rol(num, cnt) {
+  return (num << cnt) | (num >>> (32 - cnt))
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function cmn(q, a, b, x, s, t) {
+  return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b)
+}
+
+function ff(a, b, c, d, x, s, t) {
+  return cmn((b & c) | ((~b) & d), a, b, x, s, t)
+}
+
+function gg(a, b, c, d, x, s, t) {
+  return cmn((b & d) | (c & (~d)), a, b, x, s, t)
+}
+
+function hh(a, b, c, d, x, s, t) {
+  return cmn(b ^ c ^ d, a, b, x, s, t)
+}
+
+function ii(a, b, c, d, x, s, t) {
+  return cmn(c ^ (b | (~d)), a, b, x, s, t)
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, producing an array
+ * of little-endian words.
+ */
+function coreMD5(x) {
+  var a = 1732584193
+  var b = -271733879
+  var c = -1732584194
+  var d = 271733878
+
+  for (var i = 0; i < x.length; i += 16) {
+    var olda = a
+    var oldb = b
+    var oldc = c
+    var oldd = d
+
+    a = ff(a, b, c, d, x[i + 0], 7, -680876936)
+    d = ff(d, a, b, c, x[i + 1], 12, -389564586)
+    c = ff(c, d, a, b, x[i + 2], 17, 606105819)
+    b = ff(b, c, d, a, x[i + 3], 22, -1044525330)
+    a = ff(a, b, c, d, x[i + 4], 7, -176418897)
+    d = ff(d, a, b, c, x[i + 5], 12, 1200080426)
+    c = ff(c, d, a, b, x[i + 6], 17, -1473231341)
+    b = ff(b, c, d, a, x[i + 7], 22, -45705983)
+    a = ff(a, b, c, d, x[i + 8], 7, 1770035416)
+    d = ff(d, a, b, c, x[i + 9], 12, -1958414417)
+    c = ff(c, d, a, b, x[i + 10], 17, -42063)
+    b = ff(b, c, d, a, x[i + 11], 22, -1990404162)
+    a = ff(a, b, c, d, x[i + 12], 7, 1804603682)
+    d = ff(d, a, b, c, x[i + 13], 12, -40341101)
+    c = ff(c, d, a, b, x[i + 14], 17, -1502002290)
+    b = ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+    a = gg(a, b, c, d, x[i + 1], 5, -165796510)
+    d = gg(d, a, b, c, x[i + 6], 9, -1069501632)
+    c = gg(c, d, a, b, x[i + 11], 14, 643717713)
+    b = gg(b, c, d, a, x[i + 0], 20, -373897302)
+    a = gg(a, b, c, d, x[i + 5], 5, -701558691)
+    d = gg(d, a, b, c, x[i + 10], 9, 38016083)
+    c = gg(c, d, a, b, x[i + 15], 14, -660478335)
+    b = gg(b, c, d, a, x[i + 4], 20, -405537848)
+    a = gg(a, b, c, d, x[i + 9], 5, 568446438)
+    d = gg(d, a, b, c, x[i + 14], 9, -1019803690)
+    c = gg(c, d, a, b, x[i + 3], 14, -187363961)
+    b = gg(b, c, d, a, x[i + 8], 20, 1163531501)
+    a = gg(a, b, c, d, x[i + 13], 5, -1444681467)
+    d = gg(d, a, b, c, x[i + 2], 9, -51403784)
+    c = gg(c, d, a, b, x[i + 7], 14, 1735328473)
+    b = gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+    a = hh(a, b, c, d, x[i + 5], 4, -378558)
+    d = hh(d, a, b, c, x[i + 8], 11, -2022574463)
+    c = hh(c, d, a, b, x[i + 11], 16, 1839030562)
+    b = hh(b, c, d, a, x[i + 14], 23, -35309556)
+    a = hh(a, b, c, d, x[i + 1], 4, -1530992060)
+    d = hh(d, a, b, c, x[i + 4], 11, 1272893353)
+    c = hh(c, d, a, b, x[i + 7], 16, -155497632)
+    b = hh(b, c, d, a, x[i + 10], 23, -1094730640)
+    a = hh(a, b, c, d, x[i + 13], 4, 681279174)
+    d = hh(d, a, b, c, x[i + 0], 11, -358537222)
+    c = hh(c, d, a, b, x[i + 3], 16, -722521979)
+    b = hh(b, c, d, a, x[i + 6], 23, 76029189)
+    a = hh(a, b, c, d, x[i + 9], 4, -640364487)
+    d = hh(d, a, b, c, x[i + 12], 11, -421815835)
+    c = hh(c, d, a, b, x[i + 15], 16, 530742520)
+    b = hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+    a = ii(a, b, c, d, x[i + 0], 6, -198630844)
+    d = ii(d, a, b, c, x[i + 7], 10, 1126891415)
+    c = ii(c, d, a, b, x[i + 14], 15, -1416354905)
+    b = ii(b, c, d, a, x[i + 5], 21, -57434055)
+    a = ii(a, b, c, d, x[i + 12], 6, 1700485571)
+    d = ii(d, a, b, c, x[i + 3], 10, -1894986606)
+    c = ii(c, d, a, b, x[i + 10], 15, -1051523)
+    b = ii(b, c, d, a, x[i + 1], 21, -2054922799)
+    a = ii(a, b, c, d, x[i + 8], 6, 1873313359)
+    d = ii(d, a, b, c, x[i + 15], 10, -30611744)
+    c = ii(c, d, a, b, x[i + 6], 15, -1560198380)
+    b = ii(b, c, d, a, x[i + 13], 21, 1309151649)
+    a = ii(a, b, c, d, x[i + 4], 6, -145523070)
+    d = ii(d, a, b, c, x[i + 11], 10, -1120210379)
+    c = ii(c, d, a, b, x[i + 2], 15, 718787259)
+    b = ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+    a = safe_add(a, olda)
+    b = safe_add(b, oldb)
+    c = safe_add(c, oldc)
+    d = safe_add(d, oldd)
+  }
+  return [a, b, c, d]
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray) {
+  var hex_tab = "0123456789abcdef"
+  var str = ""
+  for (var i = 0; i < binarray.length * 4; i++) {
+    str += hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xF) +
+      hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xF)
+  }
+  return str
+}
+
+/*
+ * Convert an array of little-endian words to a base64 encoded string.
+ */
+function binl2b64(binarray) {
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+  var str = ""
+  for (var i = 0; i < binarray.length * 32; i += 6) {
+    str += tab.charAt(((binarray[i >> 5] << (i % 32)) & 0x3F) |
+      ((binarray[i >> 5 + 1] >> (32 - i % 32)) & 0x3F))
+  }
+  return str
+}
+
+/*
+ * Convert an 8-bit character string to a sequence of 16-word blocks, stored
+ * as an array, and append appropriate padding for MD4/5 calculation.
+ * If any of the characters are >255, the high byte is silently ignored.
+ */
+function str2binl(str) {
+  var nblk = ((str.length + 8) >> 6) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 2] |= (str.charCodeAt(i) & 0xFF) << ((i % 4) * 8)
+  blks[i >> 2] |= 0x80 << ((i % 4) * 8)
+  blks[nblk * 16 - 2] = str.length * 8
+  return blks
+}
+
+/*
+ * Convert a wide-character string to a sequence of 16-word blocks, stored as
+ * an array, and append appropriate padding for MD4/5 calculation.
+ */
+function strw2binl(str) {
+  var nblk = ((str.length + 4) >> 5) + 1 // number of 16-word blocks
+  var blks = new Array(nblk * 16)
+  for (var i = 0; i < nblk * 16; i++) blks[i] = 0
+  for (var i = 0; i < str.length; i++)
+    blks[i >> 1] |= str.charCodeAt(i) << ((i % 2) * 16)
+  blks[i >> 1] |= 0x80 << ((i % 2) * 16)
+  blks[nblk * 16 - 2] = str.length * 16
+  return blks
+}
+
+/*
+ * External interface
+ */
+function hexMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+function hexMD5w(str) {
+  return binl2hex(coreMD5(strw2binl(str)))
+}
+
+function b64MD5(str) {
+  return binl2b64(coreMD5(str2binl(str)))
+}
+
+function b64MD5w(str) {
+  return binl2b64(coreMD5(strw2binl(str)))
+}
+/* Backward compatibility */
+function calcMD5(str) {
+  return binl2hex(coreMD5(str2binl(str)))
+}
+
+module.exports = {
+  md5: hexMD5
+}
diff --git a/seller/src/utils/regular.js b/seller/src/utils/regular.js
new file mode 100644
index 00000000..05e78f2c
--- /dev/null
+++ b/seller/src/utils/regular.js
@@ -0,0 +1,59 @@
+/**
+ * 各种正则表达式
+ *
+ * qq       qq号
+ * name     汉字
+ * mobile   手机号
+ * email    电子邮箱
+ * password 密码【6-20位】
+ * integer  正整数【不包含0】
+ * money    金钱
+ * IDCard   身份证
+ * userName 账户名称【汉字、字母、数字、“-”、“_”的组合】
+ * URL      URL
+ * TEL      固定电话
+ */
+
+
+//qq
+export const qq = /^[1-9][0-9]{4,14}$/
+//汉字
+export const name = /^[\u4e00-\u9fa5]{0,}$/
+
+// 手机号
+export const mobile = /^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/
+
+// 电子邮箱
+export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+// 密码【6-20位】
+export const password = /^[@A-Za-z0-9!#$%^&*.~,]{6,20}$/
+
+// 正整数【不包含0】
+export const integer = /^[1-9]\d*$/
+
+// 正整数【包含0】
+export const Integer = /^[0-9]\d*$/
+
+// 折扣
+export const discount = /^((0\.[1-9]{1})|(([1-9]{1})(\.\d{1})?))$/
+
+// 0-100正整数
+export const rate = /^([0-9]{1,2}|100)$/
+
+// 金钱
+export const money = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+
+
+// 身份证
+export const IDCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+
+// 账户名称【汉字、字母、数字、“-”、“_”的组合】
+export const userName = /[A-Za-z0-9_\-\u4e00-\u9fa5]$/
+
+// URL
+export const URL =
+  /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+
+// 固话
+export const TEL = /0\d{2,3}-\d{7,8}/
diff --git a/seller/src/utils/validate.js b/seller/src/utils/validate.js
new file mode 100644
index 00000000..3fb13777
--- /dev/null
+++ b/seller/src/utils/validate.js
@@ -0,0 +1,21 @@
+import * as regExp from "./regular";
+
+//表单中必须输入汉字
+export function validateNeedName(rule, value, callback) {
+  const name = regExp.name;
+  if (name.test(value)) {
+    callback();
+  } else {
+    return callback(new Error("请输入汉字"));
+  }
+}
+
+//表单中输入手机号验证
+export function validateMobile(rule, value, callback) {
+  const mobile = regExp.mobile;
+  if (mobile.test(value)) {
+    callback();
+  } else {
+    return callback(new Error("手机号输入错误！"));
+  }
+}
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
new file mode 100644
index 00000000..434db17e
--- /dev/null
+++ b/seller/src/views/Main.vue
@@ -0,0 +1,206 @@
+<style lang="scss" scoped>
+@import "./main.scss";
+</style>
+
+<template>
+  <div class="main">
+    <div class="sidebar-menu-con menu-bar">
+      <div class="logo-con">
+        <img src="../assets/logo.png" key="max-logo" />
+      </div>
+      <shrinkable-menu></shrinkable-menu>
+    </div>
+    <!-- 顶部标题栏主体 -->
+    <div class="main-header-con" style="padding-left:240px">
+      <div class="main-header">
+        <div :class="{'header-avator-con':navType!=4, 'header-avator-con nav4':navType == 4}">
+          <!-- 用户头像 -->
+          <div class="user-dropdown-menu-con">
+            <Row type="flex" justify="end" align="middle" class="user-dropdown-innercon">
+              <Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
+                <div class="dropList">
+                  <span class="main-user-name">{{ userInfo.storeName }}</span>
+                  <Icon type="md-arrow-dropdown" />
+                  <Avatar :src="userInfo.storeLogo" style="background: #fff;margin-left: 10px;"></Avatar>
+                </div>
+                <DropdownMenu slot="list">
+                  <!-- <DropdownItem name="ownSpace">{{ $t('userCenter') }}</DropdownItem> -->
+                  <DropdownItem name="changePass">{{ $t('changePass') }}</DropdownItem>
+                  <DropdownItem name="loginOut" divided>{{ $t('logout') }}</DropdownItem>
+                </DropdownMenu>
+              </Dropdown>
+            </Row>
+          </div>
+        </div>
+      </div>
+      <!-- 已打开的页面标签 -->
+      <div class="tags-con">
+        <tags-page-opened :pageTagsList="pageTagsList"></tags-page-opened>
+      </div>
+    </div>
+    <div class="single-page-con">
+      <div class="single-page">
+        <keep-alive :include="cachePage">
+          <router-view></router-view>
+        </keep-alive>
+      </div>
+    </div>
+    <!-- 全局加载动画 -->
+    <circleLoading class="loading-position" v-show="loading" />
+  </div>
+</template>
+
+<script>
+import shrinkableMenu from "./main-components/shrinkable-menu/shrinkable-menu.vue";
+import tagsPageOpened from "./main-components/tags-page-opened.vue";
+import breadcrumbNav from "./main-components/breadcrumb-nav.vue";
+import fullScreen from "./main-components/fullscreen.vue";
+import messageTip from "./main-components/message-tip.vue";
+import circleLoading from "@/views/my-components/lili/circle-loading.vue";
+import Cookies from "js-cookie";
+import util from "@/libs/util.js";
+
+export default {
+  components: {
+    shrinkableMenu,
+    tagsPageOpened,
+    breadcrumbNav,
+    fullScreen,
+    messageTip,
+    circleLoading,
+  },
+  data() {
+    return {
+      sliceNum: 5, // 展示nav数量
+      userInfo: "", // 用户信息
+      navType: 1, // nav类型
+    };
+  },
+  computed: {
+    loading() {
+      return this.$store.state.app.loading;
+    },
+    pageTagsList() {
+      return this.$store.state.app.storeOpenedList; // 打开的页面的页面对象
+    },
+    cachePage() {
+      return this.$store.state.app.cachePage;
+    },
+    lang() {
+      return this.$store.state.app.lang;
+    },
+    mesCount() {
+      return 0;
+    },
+  },
+  methods: {
+    init() {
+      // 菜单
+      let pathArr = util.setCurrentPath(this, this.$route.name);
+      if (pathArr.length >= 2) {
+        this.$store.commit("addOpenSubmenu", pathArr[1].name);
+      }
+
+      let userInfo = JSON.parse(Cookies.get("userInfo"));
+      this.userInfo = userInfo;
+      this.checkTag(this.$route.name);
+
+      let currWidth = document.body.clientWidth;
+      if (currWidth <= 1200) {
+        this.sliceNum = 2;
+      }
+    },
+    selectNav(name) {
+      this.$store.commit("setCurrNav", name);
+      this.setStore("currNav", name);
+      // 清空所有已打开标签
+      // this.$store.commit("clearAllTags");
+      if (this.$route.name != "home_index") {
+        this.$router.push({
+          name: "home_index",
+        });
+      }
+      util.initRouter(this);
+    },
+    toggleClick() {
+      this.shrink = !this.shrink;
+    },
+    handleLanDropdown(name) {
+      this.$i18n.locale = name;
+      this.$store.commit("switchLang", name);
+    },
+    handleClickUserDropdown(name) {
+      if (name == "ownSpace") {
+        util.openNewPage(this, "personal-enter");
+        this.$router.push({
+          name: "personal-enter",
+        });
+      } else if (name == "changePass") {
+        util.openNewPage(this, "change_pass");
+        this.$router.push({
+          name: "change_pass",
+        });
+      } else if (name == "loginOut") {
+        Cookies.set("accessToken", "");
+        this.$store.commit("logout", this);
+        this.$store.commit("clearOpenedSubmenu");
+        this.setStore("accessToken", "");
+        this.setStore("refreshToken", "");
+        this.$router.push({ path: "/login" });
+      }
+    },
+    checkTag(name) {
+      let openpageHasTag = this.pageTagsList.some((item) => {
+        if (item.name == name) {
+          return true;
+        }
+      });
+      if (!openpageHasTag) {
+        //  解决关闭当前标签后再点击回退按钮会退到当前页时没有标签的问题
+        util.openNewPage(
+          this,
+          name,
+          this.$route.params || {},
+          this.$route.query || {}
+        );
+      }
+    },
+
+    resize() {
+      let currWidth = document.body.clientWidth;
+      let count = currWidth / 300;
+      if (count > 6) {
+        this.sliceNum = 6;
+      } else {
+        this.sliceNum = count;
+      }
+    },
+  },
+  watch: {
+    $route(to) {
+      this.$store.commit("setCurrentPageName", to.name);
+      let pathArr = util.setCurrentPath(this, to.name);
+      if (pathArr.length > 2) {
+        this.$store.commit("addOpenSubmenu", pathArr[1].name);
+      }
+      this.checkTag(to.name);
+      localStorage.currentPageName = to.name;
+    },
+    lang() {
+      util.setCurrentPath(this, this.$route.name); // 在切换语言时用于刷新面包屑
+    },
+  },
+  mounted() {
+    this.init();
+    let that = this;
+    this.resize();
+    window.addEventListener("resize", function () {
+      that.resize();
+    });
+  },
+  created() {
+    // 显示打开的页面的列表
+    this.$store.commit("setOpenedList");
+  },
+};
+</script>
diff --git a/seller/src/views/change-password/change-password.scss b/seller/src/views/change-password/change-password.scss
new file mode 100644
index 00000000..96f74fcc
--- /dev/null
+++ b/seller/src/views/change-password/change-password.scss
@@ -0,0 +1,19 @@
+.change-pass {
+    &-btn-box {
+        margin-bottom: 10px;
+
+        button {
+            padding-left: 0;
+
+            span {
+                color: #2D8CF0;
+                transition: all .2s;
+            }
+
+            span:hover {
+                color: #0C25F1;
+                transition: all .2s;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/seller/src/views/change-password/change-password.vue b/seller/src/views/change-password/change-password.vue
new file mode 100644
index 00000000..ca04fc8b
--- /dev/null
+++ b/seller/src/views/change-password/change-password.vue
@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <Card class="change-pass">
+      <p slot="title">
+        <Icon type="key"></Icon>修改密码
+      </p>
+      <div>
+        <Form
+          ref="editPasswordForm"
+          :model="editPasswordForm"
+          :label-width="100"
+          label-position="right"
+          :rules="passwordValidate"
+          style="width:450px"
+        >
+          <FormItem label="原密码" prop="oldPass">
+            <Input type="password" v-model="editPasswordForm.oldPass" placeholder="请输入现在使用的密码"></Input>
+          </FormItem>
+          <FormItem label="新密码" prop="newPassword">
+            <SetPassword style="width:350px;" v-model="editPasswordForm.newPassword" @on-change="changeInputPass" />
+          </FormItem>
+          <FormItem label="确认新密码" prop="rePass">
+            <Input type="password" v-model="editPasswordForm.rePass" placeholder="请再次输入新密码"></Input>
+          </FormItem>
+          <FormItem>
+            <Button
+              type="primary"
+              style="width: 100px;margin-right:5px"
+              :loading="savePassLoading"
+              @click="saveEditPass"
+            >保存</Button>
+            <Button @click="cancelEditPass">取消</Button>
+          </FormItem>
+        </Form>
+      </div>
+    </Card>
+  </div>
+</template>
+
+<script>
+import SetPassword from "@/views/my-components/lili/set-password";
+import { changePass } from "@/api/index";
+export default {
+  name: "change_pass",
+  components: {
+    SetPassword
+  },
+  data() {
+    const valideRePassword = (rule, value, callback) => {
+      if (value !== this.editPasswordForm.newPassword) {
+        callback(new Error("两次输入密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      savePassLoading: false, // 保存loading
+      editPasswordForm: { // 修改密码表单 
+        oldPass: "", // 旧密码
+        newPassword: "", // 新密码
+        rePass: "" // 从新输入新密码
+      },
+      strength: "", // 密码强度
+      passwordValidate: {
+        oldPass: [
+          {
+            required: true,
+            message: "请输入原密码",
+            trigger: "blur"
+          }
+        ],
+        newPassword: [
+          {
+            required: true,
+            message: "请输入新密码",
+            trigger: "blur"
+          },
+          {
+            min: 6,
+            message: "请至少输入6个字符",
+            trigger: "blur"
+          },
+          {
+            max: 32,
+            message: "最多输入32个字符",
+            trigger: "blur"
+          }
+        ],
+        rePass: [
+          {
+            required: true,
+            message: "请再次输入新密码",
+            trigger: "blur"
+          },
+          {
+            validator: valideRePassword,
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    changeInputPass(v, grade, strength) {
+      this.strength = strength;
+    },
+    saveEditPass() {
+      let params = {
+        password: this.md5(this.editPasswordForm.oldPass),
+        newPassword: this.md5(this.editPasswordForm.newPassword)
+      };
+      this.$refs["editPasswordForm"].validate(valid => {
+        if (valid) {
+          this.savePassLoading = true;
+          changePass(params).then(res => {
+            this.savePassLoading = false;
+            if (res.success) {
+              this.$Modal.success({
+                title: "修改密码成功",
+                content: "修改密码成功，需重新登录",
+                onOk: () => {
+                  this.$store.commit("logout", this);
+                  this.$store.commit("clearOpenedSubmenu");
+                  this.$router.push({
+                    name: "login"
+                  });
+                }
+              });
+            }
+          });
+        }
+      });
+    },
+    cancelEditPass() {
+      this.$store.commit("removeTag", "change_pass");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      let lastPageName = "";
+      let length = this.$store.state.app.storeOpenedList.length;
+      if (length > 1) {
+        lastPageName = this.$store.state.app.storeOpenedList[length - 1].name;
+      } else {
+        lastPageName = this.$store.state.app.storeOpenedList[0].name;
+      }
+      this.$router.push({
+        name: lastPageName
+      });
+    }
+  },
+  mounted() {}
+};
+</script>
+
+<style lang="scss" scoped>
+.change-pass {
+  &-btn-box {
+    margin-bottom: 10px;
+
+    button {
+      padding-left: 0;
+
+      span {
+        color: #2d8cf0;
+        transition: all 0.2s;
+      }
+
+      span:hover {
+        color: #0c25f1;
+        transition: all 0.2s;
+      }
+    }
+  }
+}
+</style>
diff --git a/seller/src/views/distribution/dataJson.js b/seller/src/views/distribution/dataJson.js
new file mode 100644
index 00000000..1f0c0dc8
--- /dev/null
+++ b/seller/src/views/distribution/dataJson.js
@@ -0,0 +1,49 @@
+// 分销商状态列表
+export const distributionStatusList= [ 
+    {
+        value:'APPLY',
+        label:'申请中'
+    },
+    {
+        value:'RETREAT',
+        label:'已清退'
+    },
+    {
+        value:'REFUSE',
+        label:'审核拒绝'
+    },
+    {
+        value:'PASS',
+        label:'审核通过'
+    },
+]
+// 分销佣金状态列表
+export const cashStatusList = [
+    {
+        value:'APPLY',
+        label:'待处理'
+    },
+    {
+        value:'REFUSE',
+        label:'拒绝'
+    },
+    {
+        value:'PASS',
+        label:'通过'
+    }
+]
+// 分销订单状态列表
+export const orderStatusList = [
+    {
+        value:'WAIT_BILL',
+        label:'待结算'
+    },
+    {
+        value:'WAIT_CASH',
+        label:'待提现'
+    },
+    {
+        value:'COMPLETE_CASH',
+        label:'提现完成'
+    }
+]
\ No newline at end of file
diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
new file mode 100644
index 00000000..a1a1492f
--- /dev/null
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -0,0 +1,311 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="商品名称" prop="goodsName">
+                <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
+              </Form-item>
+              <!-- <Form-item label="店铺名称">
+                  <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable clearable style="width: 200px">
+                      <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
+                  </Select>
+              </Form-item> -->
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="operation padding-row">
+            <Button @click="add" type="primary">添加</Button>
+          <!--  <Button @click="add" type="default">批量删除</Button>-->
+          </Row>
+          <Row>
+            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 70px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
+                  </div>
+
+                  <div style="margin-left: 13px;">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <liliDialog
+      ref="liliDialog"
+      @selectedGoodsData="selectedGoodsData"
+    ></liliDialog>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="分销佣金" prop="commission">
+          <Input v-model="form.commission" clearable style="width: 100%"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+        getDistributionGoods,
+        distributionGoodsCancel,
+        distributionGoodsCheck
+    } from "@/api/distribution";
+import liliDialog from "../lili-dialog/index";
+
+import {getShopListData} from '@/api/shops'
+export default {
+  name: "distributionGoods",
+  components: {
+    liliDialog
+  },
+  data() {
+    return {
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      submitLoading: false, // 添加或编辑提交状态
+      shopList:[], // 店铺列表
+      loading: true, // 表单加载状态
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: { // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      selectList: [], // 多选数据
+      form:{
+        commission : 1 // 分销金额
+      },
+      skuId:0, // 当前分销商品的skuId
+      formValidate: {
+        commission: [
+          { required: true, message: '请输入大于1小于9999的合法分销金额'},
+          {
+            pattern:  /^[1-9]\d{0,3}(\.\d{1,2})?$/,
+            message: "请输入大于1小于9999的合法分销金额",
+            trigger: "change"
+          }],
+      },
+      columns: [ // 表哥表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 250,
+          slot: "goodsSlot",
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          width: 130,
+          render: (h, params) => {
+            return h("div", this.$options.filters.unitPrice(params.row.price,'￥'));
+          }
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          width: 100
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120,
+        },
+        {
+            title: "佣金金额",
+            key: "commission",
+            width: 120,
+            render: (h, params) => {
+                if(params.row.commission !=null){
+                  return h("div", this.$options.filters.unitPrice(params.row.commission,'￥'));
+                }else{
+                  return h("div", this.$options.filters.unitPrice(0,'￥'));
+                }
+            }
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 150,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small"
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    }
+                  }
+                },
+                "删除"
+              )
+            ]);
+          }
+        }
+      ],
+      data: [], // 表单数据
+      total: 0 // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+      // this.getShopList()
+    },
+    selectedGoodsData(v){
+      this.modalVisible = true
+      this.form.commission = 1
+      this.modalTitle = "保存分销商品"
+      this.skuId = v[0].id
+      //this.data.unshift(v[0])
+    },
+    add(){
+
+         this.$refs.liliDialog.flag = true;
+      this.$refs.liliDialog.goodsFlag = true;
+
+      this.$refs.liliDialog.singleGoods();
+
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    handleSubmit(){
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          distributionGoodsCheck(this.skuId,this.form).then(res => {
+            if(res.message === 'success') {
+              this.$Message.success("添加成功");
+            }
+            this.modalVisible = false
+            this.getDataList()
+          });
+        }
+      })
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getDistributionGoods(this.searchForm).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除此分销商品么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          distributionGoodsCancel(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        }
+      });
+    },
+    getShopList (val) {
+      const params = {
+        pageNumber:1,
+        pageSize:10,
+        storeName:''
+      }
+      if (val) {
+        params.storeName = val;
+      } else {
+        params.storeName = ''
+      }
+
+      getShopListData(params).then(res => {
+        this.shopList = res.result.records
+      })
+    },
+    searchChange(val){
+      this.getShopList(val)
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+<style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+  .search-form{
+    width: 100%;
+  }
+</style>
diff --git a/seller/src/views/error-page/403.vue b/seller/src/views/error-page/403.vue
new file mode 100644
index 00000000..044a03ab
--- /dev/null
+++ b/seller/src/views/error-page/403.vue
@@ -0,0 +1,128 @@
+
+<template>
+  <div class="error403">
+    <div class="error403-body-con">
+      <Card>
+        <div class="error403-body-con-title">4<span class="error403-0-span">
+            <Icon type="android-lock"></Icon>
+          </span><span class="error403-key-span">
+            <Icon size="220" type="ios-bolt"></Icon>
+          </span></div>
+        <p class="error403-body-con-message">You don't have permission</p>
+        <div class="error403-btn-con">
+          <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+          <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+        </div>
+      </Card>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Error403",
+  methods: {
+    backPage() {
+      this.$router.go(-1);
+    },
+    goHome() {
+      this.$router.push({
+        name: "home_index",
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@keyframes error403animation {
+  0% {
+    transform: rotateZ(0deg);
+  }
+  40% {
+    transform: rotateZ(-20deg);
+  }
+  45% {
+    transform: rotateZ(-15deg);
+  }
+  50% {
+    transform: rotateZ(-20deg);
+  }
+  55% {
+    transform: rotateZ(-15deg);
+  }
+  60% {
+    transform: rotateZ(-20deg);
+  }
+  100% {
+    transform: rotateZ(0deg);
+  }
+}
+.error403 {
+  &-body-con {
+    width: 700px;
+    height: 500px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    &-title {
+      text-align: center;
+      font-size: 240px;
+      font-weight: 700;
+      color: #2d8cf0;
+      height: 260px;
+      line-height: 260px;
+      margin-top: 40px;
+      .error403-0-span {
+        display: inline-block;
+        position: relative;
+        width: 170px;
+        height: 170px;
+        border-radius: 50%;
+        border: 20px solid #ed3f14;
+        color: #ed3f14;
+        margin-right: 10px;
+        i {
+          display: inline-block;
+          font-size: 120px;
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+        }
+      }
+      .error403-key-span {
+        display: inline-block;
+        position: relative;
+        width: 100px;
+        height: 190px;
+        border-radius: 50%;
+        margin-right: 10px;
+        i {
+          display: inline-block;
+          font-size: 190px;
+          position: absolute;
+          left: 20px;
+          transform: translate(-50%, -60%);
+          transform-origin: center bottom;
+          animation: error403animation 2.8s ease 0s infinite;
+        }
+      }
+    }
+    &-message {
+      display: block;
+      text-align: center;
+      font-size: 30px;
+      font-weight: 500;
+      letter-spacing: 4px;
+      color: #dddde2;
+    }
+  }
+  &-btn-con {
+    text-align: center;
+    padding: 20px 0;
+    margin-bottom: 40px;
+  }
+}
+</style>
+
diff --git a/seller/src/views/error-page/404.vue b/seller/src/views/error-page/404.vue
new file mode 100644
index 00000000..eaa451ff
--- /dev/null
+++ b/seller/src/views/error-page/404.vue
@@ -0,0 +1,91 @@
+
+<template>
+    <div class="error404">
+        <div class="error404-body-con">
+            <Card>
+                <div class="error404-body-con-title">4<span><Icon type="ios-navigate-outline"></Icon></span>4</div>
+                <p class="error404-body-con-message">YOU&nbsp;&nbsp;LOOK&nbsp;&nbsp;LOST</p>
+                <div class="error404-btn-con">
+                    <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+                    <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+                </div>
+            </Card>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Error404',
+    methods: {
+        backPage () {
+            this.$router.go(-1);
+        },
+        goHome () {
+            this.$router.push({
+                name: 'home_index'
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+   @keyframes error404animation {
+    0% {
+        transform: rotateZ(0deg);
+    }
+    20% {
+        transform: rotateZ(-60deg);
+    }
+    40% {
+        transform: rotateZ(-10deg);
+    }
+    60% {
+        transform: rotateZ(50deg);
+    }
+    80% {
+        transform: rotateZ(-20deg);
+    }
+    100% {
+        transform: rotateZ(0deg);
+    }
+}
+.error404{
+    &-body-con{
+        width: 700px;
+        height: 500px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        &-title{
+            text-align: center;
+            font-size: 240px;
+            font-weight: 700;
+            color: #2d8cf0;
+            height: 260px;
+            line-height: 260px;
+            margin-top: 40px;
+            span{
+                display: inline-block;
+                color: #19be6b;
+                font-size: 230px;
+                animation: error404animation 3s ease 0s infinite alternate;
+            }
+        }
+        &-message{
+            display: block;
+            text-align: center;
+            font-size: 30px;
+            font-weight: 500;
+            letter-spacing: 12px;
+            color: #dddde2;
+        }
+    }
+    &-btn-con{
+        text-align: center;
+        padding: 20px 0;
+        margin-bottom: 40px;
+    }
+}
+</style>
diff --git a/seller/src/views/error-page/500.vue b/seller/src/views/error-page/500.vue
new file mode 100644
index 00000000..f947f0b5
--- /dev/null
+++ b/seller/src/views/error-page/500.vue
@@ -0,0 +1,107 @@
+
+
+<template>
+    <div class="error500">
+        <div class="error500-body-con">
+            <Card>
+                <div class="error500-body-con-title">
+                    5<span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span><span class="error500-0-span"><Icon type="social-freebsd-devil"></Icon></span>
+                </div>
+                <p class="error500-body-con-message">Oops! the server is wrong</p>
+                <div class="error500-btn-con">
+                    <Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
+                    <Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
+                </div>
+            </Card>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Error500',
+    methods: {
+        backPage () {
+            this.$router.go(-1);
+        },
+        goHome () {
+            this.$router.push({
+                name: 'home_index'
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+   @keyframes error500animation {
+    0% {
+        transform: rotateZ(0deg);
+    }
+    20% {
+        transform: rotateZ(-10deg);
+    }
+    40% {
+        transform: rotateZ(5deg);
+    }
+    60% {
+        transform: rotateZ(-5deg);
+    }
+    80% {
+        transform: rotateZ(10deg);
+    }
+    100% {
+        transform: rotateZ(0deg);
+    }
+}
+.error500{
+    &-body-con{
+        width: 700px;
+        height: 500px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        &-title{
+            text-align: center;
+            font-size: 240px;
+            font-weight: 700;
+            color: #2d8cf0;
+            height: 260px;
+            line-height: 260px;
+            margin-top: 40px;
+            .error500-0-span{
+                display: inline-block;
+                position: relative;
+                width: 170px;
+                height: 170px;
+                border-radius: 50%;
+                border: 20px solid #ed3f14;
+                color: #ed3f14;
+                margin-right: 10px;
+                i{
+                    display: inline-block;
+                    font-size: 120px;
+                    position: absolute;
+                    bottom: -10px;
+                    left: 10px;
+                    transform-origin: center bottom;
+                    animation: error500animation 3s ease 0s infinite alternate;
+                }
+            }
+        }
+        &-message{
+            display: block;
+            text-align: center;
+            font-size: 30px;
+            font-weight: 500;
+            letter-spacing: 4px;
+            color: #dddde2;
+        }
+    }
+    &-btn-con{
+        text-align: center;
+        padding: 20px 0;
+        margin-bottom: 40px;
+    }
+}
+</style>
diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue
new file mode 100644
index 00000000..f91505c9
--- /dev/null
+++ b/seller/src/views/goods/goods-manage/category.vue
@@ -0,0 +1,323 @@
+<template>
+  <div>
+
+    <Card>
+      <div class="operation">
+        <Button @click="addParent">添加一级分类</Button>
+        <Button @click="refresh">刷新列表</Button>
+      </div>
+      <tree-table
+        ref="treeTable"
+        size="default"
+        :loading="loading"
+        :data="tableData"
+
+        :columns="columns"
+        :border="true"
+        :show-index="false"
+        :is-fold="true"
+        :expand-type="false"
+        primary-key="id">
+        <template slot="action" slot-scope="scope">
+          <Button
+            type="dashed"
+            @click="edit(scope.row)"
+            size="small"
+            style="margin-right:5px"
+          >编辑
+          </Button>
+          <Button
+            v-show="scope.row.level != 1 "
+            type="info"
+            @click="addChildren(scope.row)"
+            size="small"
+            style="margin-right:5px"
+          >添加子分类
+          </Button>
+          <Button
+            type="error"
+            @click="remove(scope.row)"
+            size="small"
+            style="margin-right:5px"
+          >删除
+          </Button>
+
+        </template>
+      </tree-table>
+
+      <Modal :title="modalTitle" v-model="modalVisible" :mask-closable='false' :width="500">
+        <Form ref="formAdd" :model="formAdd" :label-width="100" :rules="formValidate">
+          <div v-if="showParent">
+            <FormItem label="上级分类" prop="parentId">
+              {{ parentTitle }}
+              <Input v-model="formAdd.parentId" clearable style="width:100%;display:none"/>
+            </FormItem>
+          </div>
+          <FormItem label="层级" prop="level" style="display:none">
+            <Input v-model="formAdd.level" clearable style="width:100%"/>
+          </FormItem>
+          <FormItem label="分类名称" prop="labelName">
+            <Input v-model="formAdd.labelName" maxlength="12" clearable style="width:100%"/>
+          </FormItem>
+          <FormItem label="排序值" prop="sortOrder" style="width:345px">
+            <InputNumber v-model="formAdd.sortOrder" min="1"></InputNumber>
+          </FormItem>
+        </Form>
+        <div slot="footer">
+          <Button type="text" @click="modalVisible=false">取消</Button>
+          <Button type="primary" :loading="submitLoading" @click="submit">提交</Button>
+        </div>
+      </Modal>
+    </Card>
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+
+import TreeTable from "@/views/my-components/tree-table/Table/Table";
+import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
+
+export default {
+  name: "lili-components",
+  components: {
+    TreeTable,
+    uploadPicInput
+  },
+  data() {
+    return {
+      submitLoading: false, // 提交loading
+      loading: false, //表格加载的loading
+      expandLevel: 1, // 展开的层级
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      showParent: false, // 是否展示上级菜单
+      parentTitle: "", // 父级菜单名称
+      formAdd: { // 添加或编辑表单对象初始化数据
+        parentId: "",
+        labelName: "",
+        sortOrder: 1,
+        level: 0,
+      },
+      // 表单验证规则
+      formValidate: {
+        labelName: [
+          {
+            required: true,
+            message: "请输入分类名称",
+            trigger: "blur",
+          },
+        ],
+      },
+      columns: [
+        {
+          title: "分类名称",
+          key: "labelName",
+          align: "left",
+          minWidth: "120px",
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "left",
+          headerAlign: "center",
+          width: "280px",
+          type: "template",
+          template: "action",
+        }
+      ],
+      tableData: []
+    };
+  },
+  methods: {
+    init() {
+      this.getAllList();
+    },
+    refresh() {
+      this.loading = true;
+      let that = this;
+      setTimeout(function () {
+        that.loading = false;
+      }, 1000);
+    },
+    //添加子分类
+    addChildren(v) {
+      this.modalType = 0;
+      this.modalTitle = "添加子分类";
+      this.parentTitle = v.labelName;
+      this.formAdd.level = eval(v.level + "+1");
+      this.formAdd.labelName = "";
+      this.showParent = true;
+      delete this.formAdd.id;
+      this.formAdd.parentId = v.id;
+      this.modalVisible = true;
+    },
+    edit(v) {
+      this.modalType = 1;
+      this.modalTitle = "编辑";
+      this.formAdd.id = v.id;
+      this.formAdd.labelName = v.labelName;
+      this.formAdd.level = v.level;
+      this.formAdd.parentId = v.parentId;
+      this.formAdd.sortOrder = v.sortOrder;
+      this.formAdd.image = v.image;
+      this.showParent = false;
+      this.modalVisible = true;
+    },
+    //添加一级分类
+    addParent() {
+      this.modalType = 0;
+      this.formAdd.labelName = "";
+      this.modalTitle = "添加一级分类";
+      this.parentTitle = "顶级分类";
+      this.showParent = true;
+      delete this.formAdd.id;
+      this.formAdd.parentId = 0;
+      this.formAdd.sortOrder = 1
+      this.modalVisible = true;
+
+    },
+    //提交编辑和添加
+    submit() {
+      this.$refs.formAdd.validate(valid => {
+        if (valid) {
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.formAdd.id;
+            API_Goods.addShopGoodsLabel(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加成功");
+                this.getAllList(0);
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          } else {
+            // 编辑
+            API_Goods.editShopGoodsLabel(this.formAdd).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("修改成功");
+                this.getAllList(0);
+                this.modalVisible = false;
+                this.$refs.form.resetFields();
+              }
+            });
+          }
+        }
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.labelName + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          API_Goods.delCategdelShopGoodsLabel(v.id).then(res => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getAllList();
+            }
+          });
+        }
+      });
+    },
+    getAllList() {
+      this.loading = true;
+      API_Goods.getShopGoodsLabelList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          // 仅展开指定级数 默认后台已展开所有
+          let expandLevel = this.expandLevel;
+          res.result.forEach(function (e) {
+            if (expandLevel == 1) {
+              if (e.level == 0) {
+                e.expand = false;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 2) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = false;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            } else if (expandLevel == 3) {
+              if (e.level == 0) {
+                e.expand = true;
+              }
+              if (e.children && e.children.length > 0) {
+                e.children.forEach(function (c) {
+                  if (c.level == 1) {
+                    c.expand = true;
+                  }
+                  if (c.children && c.children.length > 0) {
+                    c.children.forEach(function (b) {
+                      if (b.level == 2) {
+                        b.expand = false;
+                      }
+                    });
+                  }
+                });
+              }
+            }
+          });
+          this.tableData = res.result;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+<style lang="scss" scoped>
+.article {
+  font-size: 16px;
+  font-weight: 400;
+  margin: 12px 0;
+}
+
+.href-text {
+  font-size: 12px;
+}
+
+.operation {
+  margin-bottom: 2vh;
+}
+
+.select-count {
+  font-weight: 600;
+  color: #40a9ff;
+}
+</style>
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
new file mode 100644
index 00000000..d4730d99
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -0,0 +1,388 @@
+/*选择商品品类*/
+.content-goods-publish {
+  padding: 15px;
+  margin: 0 auto;
+  text-align: center;
+  border: 1px solid #ddd;
+  background: none repeat 0 0 #fff;
+
+  /*商品品类*/
+  .goods-category {
+    text-align: left;
+    padding: 10px;
+    background: #fafafa;
+    border: 1px solid #e6e6e6;
+
+    ul {
+      padding: 8px 4px 8px 8px;
+      list-style: none;
+      width: 300px;
+      background: none repeat 0 0 #fff;
+      border: 1px solid #e6e6e6;
+      display: inline-block;
+      letter-spacing: normal;
+      margin-right: 15px;
+      vertical-align: top;
+      word-spacing: normal;
+
+      li {
+        line-height: 20px;
+        padding: 5px;
+        cursor: pointer;
+        color: #333;
+        font-size: 12px;
+        display: flex;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+  }
+
+  /** 当前品类被选中的样式 */
+  .activeClass {
+    background-color: #d9edf7;
+    border: 1px solid #bce8f1;
+    color: #3a87ad;
+  }
+
+  /*!*当前选择的商品品类文字*!*/
+  .current-goods-category {
+    text-align: left;
+    padding: 10px;
+    width: 100%;
+    border: 1px solid #fbeed5;
+    color: #c09853;
+    background-color: #fcf8e3;
+    margin: 10px auto;
+    padding: 8px 35px 8px 14px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    font-size: 12px;
+    font-weight: bold;
+  }
+}
+
+/*编辑基本信息*/
+.el-form {
+  padding-bottom: 80px;
+
+  .el-form-item {
+    width: 100%;
+    text-align: left;
+  }
+}
+
+/*平铺*/
+div.base-info-item > div {
+  margin-left: 5%;
+}
+
+div.base-info-item {
+  h4 {
+    margin-bottom: 10px;
+    padding: 0 10px;
+    border: 1px solid #ddd;
+    background-color: #f8f8f8;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+    line-height: 40px;
+    text-align: left;
+  }
+
+  .form-item-view {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding-left: 80px;
+
+    .layout {
+      margin-bottom: 20px;
+
+      .sku-item-content {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: center;
+        width: 100%;
+
+        .sku-item-content-name {
+          display: flex;
+          align-items: flex-start;
+          width: 100%;
+        }
+      }
+    }
+
+    .shop-category-text {
+      font-size: 12px;
+    }
+  }
+
+  .form-item-view-bottom {
+    margin-bottom: 50px;
+  }
+
+  .item-goods-properts-row {
+    display: flex;
+    flex-direction: row;
+    word-break: break-all;
+    white-space: normal;
+    width: 300px;
+    height: 100px;
+  }
+
+  .item-goods-properts {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+  }
+
+  .form-item {
+    display: flex;
+    align-items: center;
+  }
+
+  /** 审核信息-拒绝原因 */
+  .auth-info {
+    color: red;
+  }
+
+  .el-form-item {
+    width: 30%;
+    min-width: 300px;
+  }
+
+  .goods-name-width {
+    width: 50%;
+    min-width: 300px;
+  }
+
+  .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 7.5%;
+    text-align: left;
+    color: #999;
+    font-size: 13px;
+  }
+
+  /*teatarea*/
+  /deep/ .el-textarea {
+    width: 150%;
+  }
+
+  .seo-text {
+    width: 150%;
+  }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+  /deep/ .el-collapse-item__header {
+    text-align: left;
+    background-color: #f8f8f8;
+    padding: 0 10px;
+    font-weight: bold;
+    color: #333;
+    font-size: 14px;
+  }
+
+  .el-form-item {
+    margin-left: 5%;
+    width: 25%;
+  }
+
+  /deep/ .el-form-item__content {
+    margin-left: 120px;
+    text-align: left;
+  }
+
+  p.goods-group-manager {
+    padding-left: 12%;
+    text-align: left;
+    color: #999;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding: 10px 0;
+    text-align: left;
+  }
+}
+
+/*商品描述*/
+.goods-intro {
+  line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+  width: 88.7%;
+  padding: 10px;
+  background-color: #ffc;
+  position: fixed;
+  bottom: 0px;
+  left: 10%;
+  text-align: center;
+  z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+  /deep/ li.el-upload-list__item:first-child {
+    position: relative;
+  }
+
+  /deep/ li.el-upload-list__item:first-child:after {
+    content: "封";
+    color: #fff;
+    font-weight: bold;
+    font-size: 12px;
+    position: absolute;
+    left: -15px;
+    top: -6px;
+    width: 40px;
+    height: 24px;
+    padding-top: 6px;
+    background: #13ce66;
+    text-align: center;
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+    -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
+.el-form-item__label {
+  word-break: break-all;
+}
+
+.step-view {
+  width: 33%;
+  height: 40px;
+  font-size: 19px;
+  text-align: center;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+}
+
+.add-sku-btn {
+  margin-top: 10px;
+}
+
+.sku-item:not(:first-child) {
+  margin-top: 10px;
+}
+
+.sku-upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 4px;
+}
+
+.preview-picture {
+  width: 100%;
+  margin: 0 auto;
+  display: block;
+  // text-align: center;
+  border: 1px solid transparent;
+  // justify-self: center;
+  // align-self: center;
+}
+
+.preview-picture img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.sku-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+
+.sku-upload-list:hover .sku-upload-list-cover {
+  display: block;
+}
+
+.sku-upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.ivu-form-item-content {
+  display: flex;
+}
+.required {
+  /deep/ .ivu-form-item-label::before {
+    content: "*";
+    display: inline-block;
+    margin-right: 4px;
+    line-height: 1;
+    font-family: SimSun;
+    font-size: 14px;
+    color: #ed4014;
+  }
+}
+.demo-upload-list {
+  width: 150px;
+  height: 150px;
+  text-align: center;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  display: inline-flex;
+  flex-direction: column;
+  background: #fff;
+  position: relative;
+  margin-right: 4px;
+}
+.demo-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+.demo-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.demo-upload-list:hover .demo-upload-list-cover {
+  display: block;
+}
+.demo-upload-list-cover i {
+  width: 50%;
+  margin-top: 8px;
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+}
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
new file mode 100644
index 00000000..5fe1e771
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  placeholder="请输入商品名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <span v-if="drop">
+                <Form-item label="状态" prop="status">
+                  <Select
+                    v-model="searchForm.marketEnable"
+                    placeholder="请选择"
+                    clearable
+                    style="width: 200px"
+                  >
+                    <Option value="DOWN">下架</Option>
+                    <Option value="UPPER">上架</Option>
+                  </Select>
+                </Form-item>
+                <Form-item label="商品编号" prop="sn">
+                  <Input
+                    type="text"
+                    v-model="searchForm.sn"
+                    placeholder="商品编号"
+                    clearable
+                    style="width: 200px"
+                  />
+                </Form-item>
+              </span>
+              <Form-item style="margin-left: -35px" class="br">
+                <Button @click="handleSearch" type="primary" icon="ios-search"
+                  >搜索</Button
+                >
+                <Button @click="handleReset">重置</Button>
+                <a class="drop-down" @click="dropDown">
+                  {{ dropDownContent }}
+                  <Icon :type="dropDownIcon"></Icon>
+                </a>
+              </Form-item>
+            </Form>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form
+        ref="underForm"
+        :model="underForm"
+        :label-width="100"
+        :rules="formValidate"
+      >
+        <FormItem label="下架原因" prop="reason">
+          <Input v-model="underForm.reason" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="lower(form.id)"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { getDraftGoodsListData, deleteDraftGoods } from "@/api/goods";
+export default {
+  name: "goods",
+  components: {},
+  data() {
+    return {
+      id: "", //要操作的id
+      openSearch: true, // 显示搜索
+      loading: true, // 表单加载状态
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      drop: false,
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      underForm: { // 下架表单
+        reason: "",
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        goodsName: "",
+        sn: "",
+        marketEnable: "",
+        price: "",
+        sellerName: "",
+      },
+      // 表单验证规则
+
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [ // 表头
+        {
+          title: "ID",
+          key: "id",
+          minWidth: 120
+        },
+        {
+          title: "商品原图",
+          key: "original",
+          width: 150,
+          align: "center",
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.original,
+                alt: "加载图片失败",
+              },
+              style: {
+                cursor: "pointer",
+                width: "80px",
+                height: "60px",
+                margin: "10px 0",
+                "object-fit": "contain",
+              },
+            });
+          },
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 120
+        },
+
+        {
+          title: "商品库存",
+          key: "quantity",
+          minWidth: 120
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+          minWidth: 120
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editGoods(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.removeDraft(params.row.id);
+                    },
+                  },
+                },
+                "删除"
+              )
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      let here = this.$route.matched.find((v) => v.name === this.$route.name);
+      this.pageType = here.props.default ? here.props.default.type : "";
+      if (this.pageType === "TEMPLATE") {
+        this.searchForm.saveType = "TEMPLATE";
+      } else {
+        this.searchForm.saveType = "DRAFT";
+      }
+      this.getDataList();
+    },
+    editGoods(v) {
+      this.searchForm.saveType === "TEMPLATE" ?
+        this.$router.push({ name: "goods-template-operation-edit", query: { draftId: v.id } }):
+        this.$router.push({ name: "goods-draft-operation-edit", query: { draftId: v.id } });
+    },
+    removeDraft (id) {
+      let showType = this.searchForm.saveType === "TEMPLATE" ? "模版" : "草稿";
+      this.$Modal.confirm({
+        title: "确认审核",
+        content: "您确认要删除id为 " + id + " 的" + showType + "吗?",
+        loading: true,
+        onOk: () => {
+          deleteDraftGoods(id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据
+      getDraftGoodsListData(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    $route(to, from) {
+      this.init();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
new file mode 100644
index 00000000..58020981
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -0,0 +1,730 @@
+<template>
+  <div class="search">
+
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品名称" prop="goodsName">
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
+          </Form-item>
+          <Form-item label="状态" prop="status">
+            <Select v-model="searchForm.marketEnable" placeholder="请选择" clearable style="width: 200px">
+              <Option value="DOWN">下架</Option>
+              <Option value="UPPER">上架</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="商品编号" prop="sn">
+            <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="addGoods" type="primary">添加商品</Button>
+        <Dropdown @on-click="handleDropdown">
+          <Button type="default">
+            批量操作
+            <Icon type="ios-arrow-down"></Icon>
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem name="uppers">批量上架</DropdownItem>
+            <DropdownItem name="lowers">批量下架</DropdownItem>
+            <DropdownItem name="deleteAll">批量删除</DropdownItem>
+            <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </Row>
+
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+
+        <!-- 商品栏目格式化 -->
+        <template slot="goodsSlot" slot-scope="scope">
+          <div style="margin-top: 5px;height: 90px; display: flex;">
+            <div style="">
+              <img :src="scope.row.original" style="height: 80px;margin-top: 3px;width: 70px">
+            </div>
+
+            <div style="margin-left: 13px;">
+              <div class="div-zoom">
+                <a>{{scope.row.goodsName}}</a>
+              </div>
+            </div>
+          </div>
+
+        </template>
+
+      </Table>
+
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
+
+    <Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
+      <Input type="number" v-model="stockAllUpdate" placeholder="全部修改，如不需全部修改，则不需输入" />
+      <Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
+      <div slot="footer">
+        <Button type="text" @click="updateStockModalVisible = false">取消</Button>
+        <Button type="primary" @click="updateStock">更新</Button>
+      </div>
+    </Modal>
+
+    <!-- 批量设置运费模板 -->
+    <Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
+      <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
+        <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
+          <RadioGroup @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
+            <Radio label="BUYER">
+              <span>买家承担运费</span>
+            </Radio>
+            <Radio label="STORE">
+              <span>使用物流规则</span>
+            </Radio>
+          </RadioGroup>
+        </FormItem>
+
+        <FormItem class="form-item-view-el" label="物流模板" prop="templateId" v-if="shipTemplateShow">
+          <Select v-model="shipTemplateForm.templateId" style="width: 200px">
+            <Option v-for="item in logisticsTemplate" :value="item.id" :key="item.id">{{ item.name }}
+            </Option>
+          </Select>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="shipTemplateModal = false">取消</Button>
+        <Button type="primary" @click="saveShipTemplate">更新</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getGoodsListDataSeller,
+  getGoodsSkuListDataSeller,
+  updateGoodsSkuStocks,
+  upGoods,
+  lowGoods,
+  deleteGoods,
+  batchShipTemplate,
+} from "@/api/goods";
+
+import * as API_Store from "@/api/shops";
+
+export default {
+  name: "goods",
+  components: {},
+  watch: {
+    $route() {
+      this.getDataList();
+    },
+  },
+  data() {
+    return {
+      id: "", //要操作的id
+      loading: true, // 表单加载状态
+      shipTemplateForm: {
+        freightPayer: "BUYER",
+      },
+      shipTemplateShow: false, //物流模板是否显示
+      shipTemplateModal: false, // 物流模板是否显示
+      logisticsTemplate: [], // 物流列表
+      updateStockModalVisible: false, // 更新库存模态框显隐
+      stockAllUpdate: undefined, // 更新库存数量
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      stockList: [], // 库存列表
+      form: {
+        // 添加或编辑表单对象初始化数据
+        goodsName: "",
+        sn: "",
+        marketEnable: "",
+        price: "",
+        sellerName: "",
+      },
+      updateStockColumns: [
+        {
+          title: "sku规格",
+          key: "sn",
+          minWidth: 120,
+          render: (h, params) => {
+            return h("div", {}, params.row.simpleSpecs);
+          },
+        },
+        {
+          title: "审核状态",
+          key: "isAuth",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.isAuth == "TOBEAUDITED") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "待审核",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "PASS") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "审核通过",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "REFUSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核拒绝",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            let vm = this;
+            return h("InputNumber", {
+              props: {
+                value: params.row.quantity,
+              },
+              on: {
+                "on-change": (event) => {
+                  vm.stockList[params.index].quantity = event;
+                },
+              },
+            });
+          },
+        },
+      ],
+      // 表单验证规则
+      formValidate: {},
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品编号",
+          key: "sn",
+          width: 200,
+          tooltip: true,
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 200,
+          slot: "goodsSlot",
+        },
+
+        {
+          title: "市场价格",
+          key: "cost",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.cost, "￥")
+            );
+          },
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          width: 130,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.quantity) {
+              return h("div", params.row.quantity);
+            } else {
+              return h("div", 0);
+            }
+          },
+        },
+        {
+          title: "审核状态",
+          key: "isAuth",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.isAuth == "PASS") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "审核通过",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "TOBEAUDITED") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "待审核",
+                  },
+                }),
+              ]);
+            } else if (params.row.isAuth == "REFUSE") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "审核拒绝",
+                  },
+                }),
+              ]);
+            }
+          },
+        },
+        {
+          title: "上架状态",
+          key: "marketEnable",
+          width: 130,
+          sortable: false,
+          render: (h, params) => {
+            if (params.row.marketEnable == "DOWN") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "error",
+                    text: "下架",
+                  },
+                }),
+              ]);
+            } else if (params.row.marketEnable == "UPPER") {
+              return h("div", [
+                h("Badge", {
+                  props: {
+                    status: "success",
+                    text: "上架",
+                  },
+                }),
+              ]);
+            } else {
+            }
+          },
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            let enableOrDisable = "";
+            let showEditStock = "";
+            if (params.row.marketEnable == "DOWN") {
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "success",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.upper(params.row);
+                    },
+                  },
+                },
+                "上架"
+              );
+            } else {
+              showEditStock = h(
+                "Button",
+                {
+                  props: {
+                    type: "default",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.getStockDetail(params.row.id);
+                    },
+                  },
+                },
+                "库存"
+              );
+              enableOrDisable = h(
+                "Button",
+                {
+                  props: {
+                    type: "warning",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.lower(params.row);
+                    },
+                  },
+                },
+                "下架"
+              );
+            }
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editGoods(params.row);
+                    },
+                  },
+                },
+                "编辑"
+              ),
+              showEditStock,
+              enableOrDisable,
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    addGoods() {
+      this.$router.push({ name: "goods-operation" });
+    },
+    editGoods(v) {
+      this.$router.push({ name: "goods-operation-edit", query: { id: v.id } });
+    },
+
+    //批量操作
+    handleDropdown(v) {
+      //批量上架
+      if (v == "uppers") {
+        this.uppers();
+      }
+      //批量下架
+      if (v == "lowers") {
+        this.lowers();
+      }
+      //批量删除商品
+      if (v == "deleteAll") {
+        this.deleteAll();
+      }
+      //批量设置运费模板
+      if (v == "batchShipTemplate") {
+        this.batchShipTemplate();
+      }
+    },
+    getStockDetail(id) {
+      getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => {
+        if (res.success) {
+          this.updateStockModalVisible = true;
+          this.stockAllUpdate = undefined;
+          this.stockList = res.result.records;
+        }
+      });
+    },
+    updateStock() {
+      let updateStockList = this.stockList.map((i) => {
+        let j = { skuId: i.id, quantity: i.quantity };
+        if (this.stockAllUpdate) {
+          j.quantity = this.stockAllUpdate;
+        }
+        return j;
+      });
+      updateGoodsSkuStocks(updateStockList).then((res) => {
+        if (res.success) {
+          this.updateStockModalVisible = false;
+          this.$Message.success("更新库存成功");
+        }
+      });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    //保存运费模板信息
+    saveShipTemplate() {
+      if (this.shipTemplateForm.freightPayer == "BUYER") {
+        {
+          this.shipTemplateForm.templateId = 0;
+        }
+      }
+      this.$Modal.confirm({
+        title: "确认设置运费模板",
+        content:
+          "您确认要设置所选的 " + this.selectCount + " 个商品的运费模板?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          // 批量设置运费模板
+          batchShipTemplate(this.shipTemplateForm).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("运费模板设置成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+            this.shipTemplateModal = false;
+          });
+        },
+      });
+    },
+    //批量设置运费模板
+    batchShipTemplate() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要设置运费模板的商品");
+        return;
+      }
+      let data = [];
+      this.selectList.forEach(function (e) {
+        data.push(e.id);
+      });
+      this.shipTemplateForm.goodsId = data;
+      this.shipTemplateModal = true;
+    },
+    //运费承担者变化
+    logisticsTemplateUndertakerChange(v) {
+      //如果是卖家承担运费 需要显示运费模板
+      if (v == "STORE") {
+        API_Store.getShipTemplate().then((res) => {
+          if (res.success) {
+            this.logisticsTemplate = res.result;
+          }
+        });
+        this.shipTemplateShow = true;
+      }
+      if (v == "BUYER") {
+        this.shipTemplateShow = false;
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据
+      getGoodsListDataSeller(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    //下架商品
+    lower(v) {
+      this.$Modal.confirm({
+        title: "确认下架",
+        content: "您确认要下架 " + v.goodsName + " ?",
+        loading: true,
+        onOk: () => {
+          let params = {
+            goodsId: v.id,
+          };
+          lowGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //批量下架
+    lowers() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要下架的商品");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认下架",
+        content: "您确认要下架所选的 " + this.selectCount + " 个商品?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            goodsId: ids.toString(),
+          };
+          // 批量上架
+          lowGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //批量删除商品
+    deleteAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的商品");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 个商品?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            goodsId: ids.toString(),
+          };
+          // 批量删除
+          deleteGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    //批量上架
+    uppers(v) {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要上架的商品");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认上架",
+        content: "您确认要上架所选的 " + this.selectCount + " 个商品?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            goodsId: ids.toString(),
+          };
+          // 批量上架
+          upGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    upper(v) {
+      this.$Modal.confirm({
+        title: "确认上架",
+        content: "您确认要上架 " + v.goodsName + " ?",
+        loading: true,
+        onOk: () => {
+          let params = {
+            goodsId: v.id,
+          };
+          upGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/table-common.scss";
+/deep/ .ivu-table-wrapper {
+  width: 100% i !important;
+}
+</style>
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
new file mode 100644
index 00000000..4ae186a7
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -0,0 +1,1947 @@
+<template>
+  <div>
+    <div style="height: 45px">
+      <steps
+        :current="activestep"
+        simple
+        style="margin-top: 10px"
+        process-status="process"
+      >
+        <div class="step-view">
+          <step title="选择商品品类"/>
+        </div>
+        <div class="step-view">
+          <step title="填写商品详情"/>
+        </div>
+        <div class="step-view">
+          <step title="商品发布成功"/>
+        </div>
+      </steps>
+    </div>
+    <div class="content-goods-publish" v-show="activestep === 0">
+      <div class="goods-category">
+        <ul v-if="categoryListLevel1 && categoryListLevel1.length > 0">
+          <li
+            v-for="(item, index) in categoryListLevel1"
+            :class="{ activeClass: index == activeCategoryIndex1 }"
+            @click="handleSelectCategory(item, index, 1)"
+            :key="index"
+          >
+            <span>{{ item.name }}</span>
+            <span>》</span>
+          </li>
+        </ul>
+        <ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
+          <li
+            v-for="(item, index) in categoryListLevel2"
+            :class="{ activeClass: index == activeCategoryIndex2 }"
+            @click="handleSelectCategory(item, index, 2)"
+            :key="index"
+          >
+            <span>{{ item.name }}</span>
+            <span>》</span>
+          </li>
+        </ul>
+        <ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
+          <li
+            v-for="(item, index) in categoryListLevel3"
+            :class="{ activeClass: index == activeCategoryIndex3 }"
+            @click="handleSelectCategory(item, index, 3)"
+            :key="index"
+          >
+            <span>{{ item.name }}</span>
+          </li>
+        </ul>
+      </div>
+      <p class="current-goods-category">
+        您当前选择的商品类别是：
+        <span>{{ activeCategoryName1 }}</span>
+        <span v-show="activeCategoryName2">> {{ activeCategoryName2 }}</span>
+        <span v-show="activeCategoryName3">> {{ activeCategoryName3 }}</span>
+      </p>
+      <template v-if="!$route.query.id">
+        <Divider>或选择商品模版</Divider>
+        <Select v-model="draftId" style="width: 200px">
+          <Option v-for="item in goodsTemplates" :value="item.id" :key="item.id"
+          >{{ item.goodsName || item.id }}
+          </Option>
+        </Select>
+      </template>
+    </div>
+
+    <div class="content-goods-publish" v-show="activestep === 1">
+      <Form
+        ref="baseInfoForm"
+        :model="baseInfoForm"
+        :label-width="120"
+        :rules="baseInfoFormRule"
+      >
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="商品分类">
+              <span class="goods-category-name">{{ activeCategoryName1 }}</span>
+              <span v-show="activeCategoryName2"
+              >> {{ activeCategoryName2 }}</span
+              >
+              <span v-show="activeCategoryName3"
+              >> {{ activeCategoryName3 }}</span
+              >
+              <span
+                v-if="!activeCategoryName1"
+                v-html="baseInfoForm.category_name"
+              ></span>
+            </FormItem>
+            <FormItem label="商品名称" prop="goodsName">
+              <Input
+                type="text"
+                v-model="baseInfoForm.goodsName"
+                placeholder="商品名称"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+
+            <FormItem label="商品卖点" prop="sellingPoint">
+              <Input
+                v-model="baseInfoForm.sellingPoint"
+                type="textarea"
+                :rows="4"
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="商品品牌" prop="brandId">
+              <Select v-model="baseInfoForm.brandId" style="width: 200px">
+                <Option
+                  v-for="item in brandList"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.name"
+                ></Option>
+              </Select>
+            </FormItem>
+          </div>
+          <h4>商品交易信息</h4>
+          <div class="form-item-view">
+            <FormItem
+              class="form-item-view-el"
+              label="计量单位"
+              prop="goodsUnit"
+            >
+              <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
+                <Option v-for="unit in goodsUnitList" :key="unit" :value="unit"
+                >{{ unit }}
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="销售模式"
+              prop="salesModel"
+            >
+              <RadioGroup v-model="baseInfoForm.salesModel">
+                <Radio title="零售型" label="RETAIL">
+                  <span>零售型</span>
+                </Radio>
+                <Radio title="批发型" label="WHOLESALE">
+                  <span>批发型</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+          </div>
+          <h4>商品规格及图片</h4>
+          <div class="form-item-view">
+            <FormItem label="商品编号" prop="sn">
+              <Input
+                type="text"
+                v-model="baseInfoForm.sn"
+                placeholder="商品编号"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="商品价格" prop="price">
+              <Input
+                type="text"
+                v-model="baseInfoForm.price"
+                placeholder="商品价格"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="市场价格" prop="cost">
+              <Input
+                type="text"
+                v-model="baseInfoForm.cost"
+                placeholder="市场价格"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem
+              class="form-item-view-el required"
+              label="商品图片"
+              prop="goodsGalleryFiles"
+            >
+              <div
+                class="demo-upload-list"
+                v-for="(item, __index) in baseInfoForm.goodsGalleryFiles"
+                :key="__index"
+              >
+                <template v-if="item.status === 'finished'">
+                  <img :src="item.url"/>
+
+                  <div class="demo-upload-list-cover">
+                    <Icon
+                      type="ios-eye-outline"
+                      @click.native="handleViewGoodsPicture(item.url)"
+                    ></Icon>
+                    <Icon
+                      type="ios-trash-outline"
+                      @click.native="handleRemoveGoodsPicture(item)"
+                    ></Icon>
+                    <Icon
+                      type="ios-arrow-dropleft"
+                      @click.native="
+                        handleGoodsPicRemoteUp(
+                          baseInfoForm.goodsGalleryFiles,
+                          __index
+                        )
+                      "
+                    />
+                    <Icon
+                      type="ios-arrow-dropright"
+                      @click.native="
+                        handleGoodsPicRemoteDown(
+                          baseInfoForm.goodsGalleryFiles,
+                          __index
+                        )
+                      "
+                    />
+                  </div>
+                </template>
+                <template v-else>
+                  <Progress
+                    v-if="item.showProgress"
+                    :percent="item.percentage"
+                    hide-info
+                  ></Progress>
+                </template>
+              </div>
+              <Upload
+                ref="upload"
+                :show-upload-list="false"
+                :default-file-list="baseInfoForm.goodsGalleryFiles"
+                :on-success="handleSuccessGoodsPicture"
+                :format="['jpg', 'jpeg', 'png']"
+                :on-format-error="handleFormatError"
+                :on-exceeded-size="handleMaxSize"
+                :before-upload="handleBeforeUploadGoodsPicture"
+                multiple
+                type="drag"
+                :action="uploadFileUrl"
+                :headers="accessToken"
+                style="display: inline-block;margin-left:10px;"
+              >
+                <div style="width: 80px; height: 80px; line-height: 80px">
+                  <Icon type="ios-camera" size="20"></Icon>
+                </div>
+              </Upload>
+
+              <Modal title="View Image" v-model="goodsPictureVisible">
+                <img
+                  :src="previewGoodsPicture"
+                  v-if="goodsPictureVisible"
+                  style="width: 100%"
+                />
+              </Modal>
+            </FormItem>
+
+            <div class="layout" style="width: 100%">
+              <Collapse v-model="open_panel">
+                <Panel name="1">
+                  规格名称
+                  <div slot="content" class="sku-item-content">
+                    <Form :model="skuForm" @submit.native.prevent>
+                      <div
+                        class="sku-item"
+                        v-for="(item, $index) in skuInfo"
+                        :key="$index"
+                      >
+                        <Card :bordered="true">
+                          <FormItem
+                            label="规格名："
+                            class="sku-item-content-name"
+                          >
+                            <AutoComplete
+                              style="width: 150px"
+                              v-model="item.name"
+                              :maxlength="30"
+                              :data="specListSelected"
+                              placeholder="请输入规格项名称"
+                              :filter-method="filterMethod"
+                              @on-change="skuItemChange(item.name, $index)"
+                              @keyup.enter.native="editSkuItem(item, $index)"
+                              @on-focus="
+                                getActiveSkuItem(index, $index, item, val)
+                              "
+                              @on-blur="editSkuItem(item, $index)"
+                            />
+                            <Button
+                              type="error"
+                              style="margin-left: 10px"
+                              @click="handleCloseSkuItem($index)"
+                            >删除
+                            </Button>
+                          </FormItem>
+
+                          <FormItem label="规格值：" prop="sku">
+                            <!--规格值文本列表-->
+                            <div
+                              v-for="(val, index) in item.spec_values"
+                              :key="index"
+                              style="padding: 0px 20px 10px 0px; float: left"
+                            >
+                              <div>
+                                <AutoComplete
+                                  style="width: 150px; float: left"
+                                  v-model="val.value"
+                                  :maxlength="30"
+                                  :data="skuValue"
+                                  placeholder="请输入规格值名称"
+                                  :filter-method="filterMethod"
+                                  @on-change="
+                                    skuValueChange(val.value, index, item)
+                                  "
+                                  @on-focus="
+                                    getActiveSkuValueItem(
+                                      index,
+                                      $index,
+                                      item,
+                                      val
+                                    )
+                                  "
+                                  @keyup.enter.native="
+                                    editSkuIValue(item, val, $index, index)
+                                  "
+                                  @on-blur="
+                                    editSkuIValue(item, val, $index, $index)
+                                  "
+                                ></AutoComplete>
+                                <Button
+                                  type="error"
+                                  style="float: left; margin-left: 10px"
+                                  @click="handleCloseSkuValue($index, index)"
+                                >删除
+                                </Button>
+                              </div>
+                            </div>
+                            <div style="float: left">
+                              <Button
+                                type="primary"
+                                @click="addSpec($index, item)"
+                              >添加规格值
+                              </Button>
+                            </div>
+                          </FormItem>
+                        </Card>
+                      </div>
+                    </Form>
+                    <Button
+                      class="add-sku-btn"
+                      type="primary"
+                      size="mini"
+                      @click="addSkuItem"
+                    >添加规格项目
+                    </Button>
+                  </div>
+                </Panel>
+                <Panel name="2">
+                  规格详细
+                  <div slot="content">
+                    <div slot="content">
+                      <Table
+                        :columns="skuTableColumn"
+                        :data="skuTableData"
+                        style="
+                          width: 100%;
+                          .ivu-table-overflowX {
+                            overflow-x: hidden;
+                          }
+                        "
+                        :span-method="handleSpan"
+                      >
+                        <template slot-scope="{ row }" slot="sn">
+                          <Input
+                            v-model="row.sn"
+                            placeholder="请输入货号"
+                            @on-change="updateSkuTable(row, 'sn')"
+                          />
+                        </template>
+
+                        <template slot-scope="{ row }" slot="weight">
+                          <Input
+                            v-model="row.weight"
+                            placeholder="请输入重量"
+                            @on-change="updateSkuTable(row, 'weight')"
+                          />
+                        </template>
+
+                        <template slot-scope="{ row }" slot="quantity">
+                          <Input
+                            v-model="row.quantity"
+                            placeholder="请输入库存"
+                            @on-change="updateSkuTable(row, 'quantity')"
+                          />
+                        </template>
+
+                        <template slot-scope="{ row }" slot="cost">
+                          <Input
+                            v-model="row.cost"
+                            placeholder="请输入成本价"
+                            @on-change="updateSkuTable(row, 'cost')"
+                          />
+                        </template>
+
+                        <template slot-scope="{ row }" slot="price">
+                          <Input
+                            v-model="row.price"
+                            placeholder="请输入价格"
+                            @on-change="updateSkuTable(row, 'price')"
+                          />
+                        </template>
+                        <template slot-scope="{ row }" slot="images">
+                          <Button @click="editSkuPicture(row)">编辑图片</Button>
+                          <Modal
+                            v-model="showSkuPicture"
+                            :styles="{ top: '30px' }"
+                            draggable
+                            class-name="sku-preview-modal"
+                            title="编辑图片"
+                            ok-text="结束编辑"
+                            @on-ok="updateSkuPicture()"
+                            cancel-text="取消"
+                          >
+                            <div class="preview-picture">
+                              <img
+                                v-if="previewPicture !== ''"
+                                :src="previewPicture"
+                              />
+                            </div>
+                            <Divider/>
+                            <div
+                              class="sku-upload-list"
+                              v-for="(img, __index) in selectedSku.images"
+                              :key="__index"
+                            >
+                              <template v-if="img.status === 'finished'">
+                                <img :src="img.url"/>
+                                <div class="sku-upload-list-cover">
+                                  <Icon
+                                    type="ios-eye-outline"
+                                    @click="handleView(img.url)"
+                                  ></Icon>
+                                  <Icon
+                                    type="ios-trash-outline"
+                                    @click="handleRemove(img, __index)"
+                                  ></Icon>
+                                </div>
+                              </template>
+                              <template v-else>
+                                <Progress
+                                  v-if="img.showProgress"
+                                  :percent="img.percentage"
+                                  hide-info
+                                ></Progress>
+                              </template>
+                            </div>
+                            <Upload
+                              ref="uploadSku"
+                              :show-upload-list="false"
+                              :default-file-list="row.images"
+                              :on-success="handleSuccess"
+                              :format="['jpg', 'jpeg', 'png']"
+                              :on-format-error="handleFormatError"
+                              :on-exceeded-size="handleMaxSize"
+                              :before-upload="handleBeforeUpload"
+                              multiple
+                              type="drag"
+                              :action="uploadFileUrl"
+                              :headers="accessToken"
+                              style="display: inline-block; width: 58px"
+                            >
+                              <div>
+                                <Icon type="ios-camera" size="55"></Icon>
+                              </div>
+                            </Upload>
+                          </Modal>
+                        </template>
+                      </Table>
+                    </div>
+                  </div>
+                </Panel>
+              </Collapse>
+            </div>
+          </div>
+          <h4>商品详情描述</h4>
+          <div class="form-item-view">
+            <div class="tree-bar" :style="{ maxHeight: maxHeight }">
+              <FormItem
+                class="form-item-view-el"
+                label="店内分类"
+                prop="shopCategory"
+              >
+                <Tree
+                  ref="tree"
+                  :data="shopCategory"
+                  show-checkbox
+                  @on-select-change="selectTree"
+                  @on-check-change="changeSelect"
+                  :check-strictly="!strict"
+                ></Tree>
+              </FormItem>
+            </div>
+            <FormItem class="form-item-view-el" label="商品描述" prop="intro">
+              <editor id="intro" v-model="baseInfoForm.intro"></editor>
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="移动端描述"
+              prop="skuList"
+            >
+              <editor
+                id="mobileIntr"
+                v-model="baseInfoForm.mobileIntro"
+              ></editor>
+            </FormItem>
+          </div>
+          <h4>商品物流信息</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el" label="商品重量" prop="weight">
+              <Input v-model="baseInfoForm.weight">
+                <span slot="append">kg</span>
+              </Input>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="运费" prop="skuList">
+              <RadioGroup
+                @on-change="logisticsTemplateChange"
+                v-model="baseInfoForm.freightPayer"
+              >
+                <Radio label="BUYER">
+                  <span>买家承担运费</span>
+                </Radio>
+                <Radio label="STORE">
+                  <span>使用物流规则</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem
+              class="form-item-view-el"
+              label="物流模板"
+              prop="templateId"
+              v-if="logisticsTemplateShow"
+            >
+              <Select v-model="baseInfoForm.templateId" style="width: 200px">
+                <Option
+                  v-for="item in logisticsTemplate"
+                  :value="item.id"
+                  :key="item.id"
+                >{{ item.name }}
+                </Option>
+              </Select>
+            </FormItem>
+          </div>
+          <h4>其他信息</h4>
+          <div class="form-item-view">
+            <FormItem class="form-item-view-el" label="商品发布" prop="release">
+              <RadioGroup v-model="baseInfoForm.release">
+                <Radio title="立即发布" label="true">
+                  <span>立即发布</span>
+                </Radio>
+                <Radio title="放入仓库" label="false">
+                  <span>放入仓库</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
+              <RadioGroup v-model="baseInfoForm.recommend">
+                <Radio title="推荐" label="true">
+                  <span>推荐</span>
+                </Radio>
+                <Radio title="不推荐" label="false">
+                  <span>不推荐</span>
+                </Radio>
+              </RadioGroup>
+            </FormItem>
+          </div>
+          <div class="form-item-view-bottom">
+            <Collapse
+              active-key="1"
+              v-for="paramsgroup in goodsParams"
+              :title="paramsgroup.groupName"
+              style="text-align: left"
+              :key="paramsgroup.groupName"
+            >
+              <Panel key="1">
+                {{ paramsgroup.groupName }}
+                <p slot="content">
+                  <FormItem
+                    v-for="(
+                      goodsParamsList, index
+                    ) in baseInfoForm.goodsParamsList"
+                    :key="index"
+                    :label="`${goodsParamsList.paramName}：`"
+                  >
+                    <Input
+                      v-if="goodsParamsList.paramType === 1"
+                      type="text"
+                      v-model="goodsParamsList.paramValue"
+                      placeholder="长度为最多50个字符"
+                      maxlength="50"
+                      clearable
+                      style="width: 260px"
+                    />
+                    <Select
+                      v-model="goodsParamsList.paramValue"
+                      v-if="goodsParamsList.paramType === 2"
+                      placeholder="请选择"
+                      style="width: 200px"
+                      clearable
+                    >
+                      <Option
+                        v-for="option in goodsParamsList.optionList"
+                        :key="option"
+                        :label="option"
+                        :value="option"
+                      ></Option>
+                    </Select>
+                  </FormItem>
+                </p>
+              </Panel>
+            </Collapse>
+          </div>
+        </div>
+      </Form>
+    </div>
+    <div class="content-goods-publish" v-show="activestep === 2">
+      <template>
+        <Card style="width: auto">
+          <div style="text-align: left">
+            <h1>恭喜您，商品发布成功!</h1>
+            <div class="goToGoodsList" @click="gotoGoodsList">
+              <a>去店铺查看商品列表>></a>
+            </div>
+            <div class="operation">
+              <h3>您还可以：</h3>
+              <div>
+                1、继续
+                <a @click="gotoBack">发布商品</a>
+              </div>
+              <div>
+                2、进入卖家中心，管理
+                <a @click="gotoGoodsList">商品列表</a>
+              </div>
+            </div>
+          </div>
+        </Card>
+      </template>
+    </div>
+    <div class="footer">
+      <ButtonGroup>
+        <Button type="primary" @click="pre" v-if="activestep === 1 && isPublish"
+        >上一步
+        </Button>
+        <Button type="primary" @click="next" v-if="activestep === 0"
+        >下一步
+        </Button>
+        <Button
+          type="primary"
+          @click="save"
+          :loading="submitLoading"
+          v-if="activestep === 1"
+        >
+          {{ this.goodsId ? "保存" : "保存商品" }}
+        </Button>
+        <Button
+          type="primary"
+          @click="saveToDraft('TEMPLATE')"
+          v-if="activestep === 1"
+        >保存为模版
+        </Button>
+        <Button
+          type="primary"
+          @click="saveToDraft('DRAFT')"
+          v-if="activestep === 1 && !isOperationGoods"
+        >保存至草稿箱
+        </Button>
+      </ButtonGroup>
+    </div>
+  </div>
+</template>
+
+<script>
+import {regular} from "@/utils";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+import editor from "@/views/my-components/lili/editor";
+import * as API_GOODS from "@/api/goods";
+import * as API_Shop from "@/api/shops";
+
+import cloneObj from "@/utils/index";
+
+export default {
+  name: "addGoods",
+  components: {
+    uploadPicThumb,
+    editor,
+  },
+  watch: {
+    $route (to, from) {
+      if (to.query.draftId) {
+        this.draftId = to.query.draftId;
+        this.activestep = 1;
+        this.isOperationGoods = false;
+        this.GET_GoodData();
+      }
+    }
+  },
+  data() {
+    // 表单验证项，商品价格
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("商品价格不能为空"));
+      }
+      setTimeout(() => {
+        if (!regular.money.test(value)) {
+          callback(new Error("请输入正整数或者两位小数"));
+        } else if (parseFloat(value) > 99999999) {
+          callback(new Error("商品价格设置超过上限值"));
+        } else {
+          callback();
+        }
+      }, 1000);
+    };
+    // 表单验证项，商品编号
+    const checkSn = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error("商品编号不能为空"));
+      } else if (!/^[a-zA-Z0-9_\\-]+$/g.test(value)) {
+        callback(new Error("请输入数字、字母、下划线或者中划线"));
+      } else {
+        callback();
+      }
+    };
+    // 表单验证项，商品重量
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("重量不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("商品重量设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      //提交状态
+      submitLoading: false,
+      //上传图片路径
+      uploadFileUrl: API_GOODS.uploadFile,
+      // 预览图片
+      previewPicture: "",
+      //商品图片
+      previewGoodsPicture: "",
+      //展示图片层
+      visible: false,
+      //展示商品图片
+      goodsPictureVisible: false,
+      //展示sku图片
+      showSkuPicture: false,
+      //选择的sku
+      selectedSku: {},
+      //选择店铺分类
+      strict: true,
+      goodsParamsList: [],
+      //模版 / 草稿 id
+      draftId: undefined,
+      /** 当前激活步骤*/
+      activestep: 0,
+      //是否在编辑商品
+      isOperationGoods: true,
+      //是否在发布商品
+      isPublish: false,
+      /** 当前点击的1级分类索引*/
+      activeCategoryIndex1: -1,
+
+      /** 当前点击的2级分类索引*/
+      activeCategoryIndex2: -1,
+
+      /** 当前点击的3级分类索引*/
+      activeCategoryIndex3: -1,
+      /** 当前商品分类名称1*/
+      activeCategoryName1: "",
+
+      /** 当前商品分类名称2*/
+      activeCategoryName2: "",
+
+      /** 当前商品分类名称3*/
+      activeCategoryName3: "",
+      /** 1级分类列表*/
+      categoryListLevel1: [],
+
+      /** 2级分类列表*/
+      categoryListLevel2: [],
+
+      /** 3级分类列表*/
+      categoryListLevel3: [],
+
+      maxHeight: "240px",
+      /** 请求的商品参数组列表 */
+      goodsParams: [
+        {
+          groupId: "",
+          groupName: "",
+          params: [
+            {
+              paramId: 0,
+              paramName: "",
+              paramType: 1,
+              paramValue: "",
+              required: 0,
+              optionList: [
+                {value: 1, label: ""},
+                {value: 2, label: ""},
+              ],
+            },
+          ],
+        },
+      ],
+      /** 当前状态/模式 默认发布商品0 编辑商品1 编辑草稿箱商品2 */
+      currentStatus: 0,
+
+      baseInfoForm: {
+        salesModel: "RETAIL",
+        /** 商品参数列表 */
+        goodsParamsList: [],
+        /** 运费承担者 */
+        freightPayer: "BUYER",
+        /** 商品重量 */
+        weight: "",
+        /** 商品相册列表 */
+        goodsGalleryFiles: [],
+        /** 是否立即发布 0 立即发布 1放入仓库 */
+        release: "true",
+        /** 是否为推荐商品 */
+        recommend: "true",
+        /** 店铺分类 */
+        storeCategoryPath: "",
+        brandId: 0,
+        /** 计量单位 **/
+        goodsUnit: "",
+        /** 路径 **/
+        categoryPath: "",
+        /** 商品卖点 **/
+        sellingPoint: "",
+        /** 商品详情 **/
+        intro: "",
+        mobileIntro: "",
+        updateSku: true,
+        /** 是否重新生成sku */
+        regeneratorSkuFlag: false,
+        /** 运费模板id **/
+        templateId: 0,
+      },
+      /** 表单数据*/
+      skuForm: {},
+      /** 表格头 */
+      skuTableColumn: [],
+      /** 表格数据 */
+      skuTableData: [],
+
+      /** 请求数据*/
+      skuData: [],
+
+      /** 当前可选择的 规格名称*/
+      skuKey: [],
+
+      /** 当前可选择的 规格值*/
+      skuValue: [],
+
+      open_panel: [1, 2],
+
+      /** 要提交的规格数据*/
+      skuInfo: [],
+
+      /** 当前选择的规格项*/
+      specSelected: "",
+
+      /** 当前选择的规格值*/
+      specValSelected: "",
+      /** 当前规格项下的规格值列表*/
+      specListSelected: [],
+
+      /** 当前规格项下的规格值列表*/
+      specList: [],
+
+      /** 当前规格项索引 */
+      activeSkuItemIndex: 0,
+
+      /** 当前规格项 */
+      activeSkuItem: {},
+
+      /** 规格图片 */
+      images: [],
+      /** 当前规格值索引 */
+      activeSkuValIndex: 0,
+
+      /** 当前规格值 */
+      activeSkuVal: {},
+
+      /** 当前百分比 */
+      currentPercent: 0,
+
+      /** 物流模板是否展示 **/
+      logisticsTemplateShow: false,
+
+      /** 运费模板 **/
+      logisticsTemplate: [],
+
+      /** 固定列校验提示内容 */
+      validatatxt: "请输入0~99999999之间的数字值",
+
+      /** 存储未通过校验的单元格位置  */
+      validateError: [],
+      baseInfoFormRule: {
+        goodsName: [
+          {required: true, message: "请输入商品名称"},
+          {
+            whitespace: true,
+            message: "商品名称不可为纯空格",
+          },
+          {
+            min: 3,
+            max: 60,
+            message: "长度在 3 到 60 个字符",
+          },
+        ],
+        sn: [
+          {required: true, message: "请输入商品编号"},
+          {validator: checkSn},
+        ],
+        price: [
+          {required: true, message: "请输入商品价格"},
+          {validator: checkPrice},
+        ],
+        cost: [
+          {required: true, message: "请输入市场价格"},
+          {validator: checkPrice},
+        ],
+        weight: [
+          {required: true, message: "请输入物流参数"},
+          {validator: checkWeight},
+        ],
+        sellingPoint: [{required: true, message: "请输入商品卖点"}],
+        goodsUnit: [{required: true, message: "请选择计量单位"}],
+      },
+      /** 品牌列表 */
+      brandList: [],
+      collapseVal: [],
+      /** 店铺分类列表 */
+      shopCategory: [],
+      /** 商品单位列表 */
+      goodsUnitList: {},
+      goodsTemplates: [],
+      ignoreColumn: [
+        "_index",
+        "_rowKey",
+        "sn",
+        "cost",
+        "price",
+        "weight",
+        "quantity",
+        "specId",
+        "specValueId",
+      ],
+    };
+  },
+
+  mounted() {
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+    //编辑商品
+    if (this.$route.query.id) {
+      this.activestep = 1;
+      this.goodsId = this.$route.query.id;
+      this.GET_GoodData();
+    }
+    //编辑模版/草稿
+    else if (this.$route.query.draftId) {
+      this.draftId = this.$route.query.draftId;
+      this.activestep = 1;
+      this.isOperationGoods = false;
+      this.GET_GoodData();
+    }
+    //新增商品
+    else {
+      this.baseInfoForm = {};
+      this.activestep = 0;
+      this.isPublish = true;
+      this.GET_GoodsTemplate();
+      this.GET_NextLevelCategory();
+    }
+  },
+  methods: {
+    // 移动商品图片位置
+    handleGoodsPicRemoteUp(fieldData, index) {
+      if (index != 0) {
+        fieldData[index] = fieldData.splice(index - 1, 1, fieldData[index])[0];
+      } else {
+        fieldData.push(fieldData.shift());
+      }
+    },
+    // 移动商品图片位置
+    handleGoodsPicRemoteDown(fieldData, index) {
+      if (index != fieldData.length - 1) {
+        fieldData[index] = fieldData.splice(index + 1, 1, fieldData[index])[0];
+      } else {
+        fieldData.unshift(fieldData.splice(index, 1)[0]);
+      }
+    },
+    GET_GoodsTemplate() {
+      let searchParams = {
+        saveType: "TEMPLATE",
+        sort: "create_time",
+        order: "desc",
+      };
+      API_GOODS.getDraftGoodsListData(searchParams).then((res) => {
+        if (res.success) {
+          this.goodsTemplates = res.result.records;
+        }
+      });
+    },
+    editSkuPicture(row) {
+      if (row.images && row.images.length > 0) {
+        this.previewPicture = row.images[0].url;
+      }
+      this.selectedSku = row;
+      this.showSkuPicture = true;
+    },
+    handleView(url) {
+      this.previewPicture = url;
+      this.visible = true;
+    },
+    handleRemove(item, index) {
+      this.selectedSku.images = this.selectedSku.images.filter(
+        (i) => i.url !== item.url
+      );
+      if (this.selectedSku.images.length > 0 && index === 0) {
+        this.previewPicture = this.selectedSku.images[0].url;
+      } else if (this.selectedSku.images.length < 0) {
+        this.previewPicture = "";
+      }
+    },
+    handleViewGoodsPicture(url) {
+      this.previewGoodsPicture = url;
+      this.goodsPictureVisible = true;
+    },
+    handleRemoveGoodsPicture(file) {
+      this.baseInfoForm.goodsGalleryFiles = this.baseInfoForm.goodsGalleryFiles.filter(
+        (i) => i.url !== file.url
+      );
+    },
+    updateSkuPicture() {
+      let _index = this.selectedSku._index;
+      this.skuTableData[_index] = this.selectedSku;
+    },
+    handleSuccess(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        if (this.selectedSku.images) {
+          this.selectedSku.images.push(file);
+        } else {
+          this.selectedSku.images = [file];
+        }
+        this.previewPicture = file.url;
+      }
+    },
+    handleSuccessGoodsPicture(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+        this.baseInfoForm.goodsGalleryFiles.push(file);
+      }
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "文件格式不正确",
+        desc:
+          "File format of " +
+          file.name +
+          " is incorrect, please select jpg or png.",
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+         desc: "图片  " + file.name + " 不能超过2mb",
+      });
+    },
+    handleBeforeUploadGoodsPicture() {
+      const check = this.baseInfoForm.goodsGalleryFiles.length < 5;
+      if (!check) {
+        this.$Notice.warning({
+          title: "Up to five pictures can be uploaded.",
+        });
+      }
+      return check;
+    },
+    handleBeforeUpload() {
+      const check =
+        this.selectedSku.images !== undefined &&
+        this.selectedSku.images.length > 5;
+      if (check) {
+        this.$Notice.warning({
+          title: "Up to five pictures can be uploaded.",
+        });
+      }
+      return !check;
+    },
+    async getActiveSkuItem(index, $index, item, val) {
+      this.specSelected = "";
+      await this.GET_SkuSpec();
+    },
+    async getActiveSkuValueItem(index, $index, item, val) {
+      this.specValSelected = "";
+      await this.GET_SkuSpecVal(item.spec_id);
+    },
+    async editSkuItem(item, $index) {
+      if (item.name) {
+        API_GOODS.insertSpecSeller({
+          specName: item.name,
+          categoryPath: this.baseInfoForm.categoryPath,
+        }).then((res) => {
+          if (res.message !== "60001") {
+            this.skuItemChange(item.name, $index);
+          }
+        });
+      }
+    },
+    //选择运费模板则展示运费规则
+    logisticsTemplateChange(v) {
+      if (v == "STORE") {
+        //如果卖家承担运费 则需要查询运费规则
+        API_Shop.getShipTemplate().then((res) => {
+          if (res.success) {
+            this.logisticsTemplate = res.result;
+          }
+        });
+        this.logisticsTemplateShow = true;
+      } else {
+        this.logisticsTemplateShow = false;
+      }
+    },
+    gotoGoodsList() {
+      this.$router.push({name: "seller-goods"});
+    },
+    gotoBack() {
+      this.$router.go();
+    },
+    /** 查询商品品牌列表 */
+    getGoodsBrandList() {
+      API_GOODS.getCategoryBrandListDataSeller(this.categoryId).then(
+        (response) => {
+          this.brandList = response;
+        }
+      );
+    },
+    GET_GoodsUnit() {
+      API_GOODS.getGoodsUnitList().then((res) => {
+        if (res.success) {
+          this.goodsUnitList = res.result.records.map((i) => i.name);
+        }
+      });
+    },
+    GET_ShopGoodsLabel() {
+      API_GOODS.getShopGoodsLabelListSeller().then((res) => {
+        if (res.success) {
+          let shopCategories = !this.baseInfoForm.storeCategoryPath
+            ? []
+            : this.baseInfoForm.storeCategoryPath.split(",");
+
+          this.shopCategory = res.result.map((i) => {
+            i.title = i.labelName;
+            i.expand = false;
+            i.checked = shopCategories.some((o) => o === i.id);
+            if (i.list) {
+              i.children = i.list.map((j) => {
+                j.title = j.labelName;
+                j.expand = false;
+                j.checked = shopCategories.some((o) => o === j.id);
+                return j;
+              });
+            }
+            return i;
+          });
+        }
+      });
+    },
+    async GET_GoodData() {
+      let response = {};
+      if (this.draftId) {
+        response = await API_GOODS.getDraftGoodsDetail(this.draftId);
+      } else {
+        response = await API_GOODS.getGoods(this.$route.query.id);
+        this.goodsId = response.result.id;
+      }
+      this.baseInfoForm = {
+        ...this.baseInfoForm,
+        ...response.result,
+      };
+      if (this.baseInfoForm.freightPayer != "BUYER") {
+        API_Shop.getShipTemplate().then((res) => {
+          if (res.success) {
+            this.logisticsTemplate = res.result;
+          }
+        });
+        this.logisticsTemplateShow = true;
+      }
+      this.baseInfoForm.release = "true";
+      this.baseInfoForm.recommend = this.baseInfoForm.recommend
+        ? "true"
+        : "false";
+
+      //分类名称展示
+      this.activeCategoryName1 = response.result.categoryName[0];
+      this.activeCategoryName2 = response.result.categoryName[1];
+      this.activeCategoryName3 = response.result.categoryName[2];
+
+      this.baseInfoForm.categoryId = response.result.categoryPath.split(",");
+      if (
+        response.result.goodsGalleryList &&
+        response.result.goodsGalleryList.length > 0
+      ) {
+        this.baseInfoForm.goodsGalleryFiles = response.result.goodsGalleryList.map(
+          (i) => {
+            let files = {url: i};
+            return files;
+          }
+        );
+      }
+
+      this.categoryId = this.baseInfoForm.categoryId[2];
+
+      this.renderGoodsDetailSku(response.result.skuList);
+
+      /** 查询品牌列表 */
+      this.getGoodsBrandList();
+      /** 查询商品参数 */
+      this.GET_GoodsParams();
+      /** 查询店铺商品分类 */
+      this.GET_ShopGoodsLabel();
+      this.GET_GoodsUnit();
+    },
+
+    renderGoodsDetailSku(skuList) {
+      let skus = [];
+      let skusInfo = [];
+      skuList.map((e) => {
+        let sku = {
+          id: e.id,
+          sn: e.sn,
+          price: e.price,
+          cost: e.cost,
+          quantity: e.quantity,
+          weight: e.weight,
+        };
+        e.specList.forEach((u) => {
+          if (u.specName === "images") {
+            sku.images = u.specImage;
+          } else {
+            sku[u.specName] = u.specValue;
+            if (
+              !skusInfo.some((s) => s.name === u.specName) &&
+              !this.ignoreColumn.includes(u.specName)
+            ) {
+              skusInfo.push({
+                name: u.specName,
+                spec_id: u.specNameId,
+                spec_values: [
+                  {
+                    id: u.specValueId,
+                    name: u.specName,
+                    value: u.specValue,
+                  },
+                ],
+              });
+            } else {
+              skusInfo = skusInfo.map((sk) => {
+                if (
+                  !sk.spec_values.some((s) => s.value === u.specValue) &&
+                  sk.name === u.specName
+                ) {
+                  sk.spec_values.push({
+                    id: u.specValueId,
+                    name: u.specName,
+                    value: u.specValue,
+                  });
+                }
+                if (!sk.spec_id && u.specName === "specId") {
+                  sk.spec_id = u.specValue;
+                }
+                return sk;
+              });
+            }
+          }
+        });
+        skus.push(sku);
+      });
+      this.skuInfo = skusInfo;
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+      this.skuTableData = skus;
+    },
+    /** 查询商品参数 */
+    GET_GoodsParams() {
+      API_GOODS.getCategoryParamsListDataSeller(this.categoryId).then(
+        (response) => {
+          this.goodsParams = response;
+          this.collapseVal = this.goodsParams.map((key) => {
+            if (key.groupId) {
+              return key.groupId;
+            }
+          });
+          if (!response || response.length <= 0) {
+            return;
+          }
+          this.goodsParams.forEach((key) => {
+            if (key && key.params) {
+              key.params.forEach((elem) => {
+                if (
+                  !this.baseInfoForm.goodsParamsList.find(
+                    (ij) => ij.paramName === elem.paramName
+                  )
+                ) {
+                  if (elem.paramType === 2) {
+                    elem.optionList = elem.options.split(",");
+                  }
+                  this.baseInfoForm.goodsParamsList.push(elem);
+                }
+                if (this.$route.query.id || this.draftId) {
+                  this.baseInfoForm.goodsParamsList = this.baseInfoForm.goodsParamsList.map(
+                    (i) => {
+                      if (i.paramId === elem.id || i.id === elem.id) {
+                        if (elem.paramType === 2) {
+                          elem.optionList = elem.options.split(",");
+                        }
+                        i = {
+                          ...i,
+                          ...elem,
+                        };
+                      }
+                      return i;
+                    }
+                  );
+                  return;
+                }
+              });
+            }
+          });
+        }
+      );
+    },
+    async GET_SkuSpec() {
+      let specResult = await API_GOODS.getSpecListSellerData({
+        pageNumber: 1,
+        pageSize: 10,
+        specName: this.specSelected,
+        categoryPath: this.baseInfoForm.categoryPath,
+      });
+      if (specResult.success && specResult.result.records.length > 0) {
+        this.specListSelected = specResult.result.records.map(
+          (i) => i.specName
+        );
+        this.specList = specResult.result.records;
+      } else {
+        this.specListSelected = [];
+      }
+    },
+    /** 添加规格项 */
+    addSkuItem() {
+      if (this.skuInfo.length >= 5) {
+        this.$Message.error("规格项不能大于5个！");
+        return;
+      }
+      // 写入对象，下标，具体对象
+      this.$set(this.skuInfo, this.skuInfo.length, {
+        spec_values: [],
+      });
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    async GET_SkuSpecVal(id) {
+      let specValResult = await API_GOODS.getSpecValuesListSellerData(id, {
+        pageNumber: 1,
+        pageSize: 10,
+        specVal: this.specValSelected,
+      });
+      if (specValResult.success && specValResult.result.records.length > 0) {
+        this.skuValue = specValResult.result.records.map((i) => i.specValue);
+      } else {
+        this.skuValue = [];
+      }
+    },
+    /** 移除当前规格项 进行数据变化*/
+    handleCloseSkuItem($index) {
+      this.skuInfo.splice($index, 1);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    validateEmpty(params) {
+      let flag = true;
+      params.forEach((item) => {
+        for (var key in item) {
+          if (item[key] != "0" && !item.value) {
+            this.$Message.error("请必填规格项");
+            flag = false;
+            return false; // 终止程序
+          }
+        }
+      });
+
+      return flag;
+    },
+    /** 添加当前规格项的规格值*/
+    addSpec($index, item) {
+      this.activeSkuItemIndex = $index;
+
+      if (this.validateEmpty(this.skuInfo[$index].spec_values)) {
+        if (this.skuInfo[$index].spec_values.length >= 10) {
+          this.$Message.error("规格值不能大于10个！");
+          return;
+        }
+        this.$set(
+          this.skuInfo[$index].spec_values,
+          this.skuInfo[$index].spec_values.length,
+          {
+            name: item.name,
+          }
+        );
+        this.baseInfoForm.regeneratorSkuFlag = true;
+        /**
+         * 渲染规格详细表格
+         */
+        this.renderTableData();
+      }
+    },
+    /**
+     * 根据规格项名称，搜索对应的规格对象（如果是服务器设置过的话）
+     */
+    findSpec(name) {
+      let spec = {name: name};
+      this.skuData.forEach((item) => {
+        if (item.name === name) {
+          spec = item;
+        }
+      });
+      return spec;
+    },
+    /** 移除当前规格值 */
+    handleCloseSkuValue($index, index) {
+      this.skuInfo[$index].spec_values.splice(index, 1);
+
+      this.baseInfoForm.regeneratorSkuFlag = true;
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /** 选择规格值时触发 */
+    async skuValueChange(val, index, item) {
+      this.specValSelected = val;
+      await this.GET_SkuSpecVal(item.spec_id);
+      l;
+      /** 更新skuInfo数据 */
+      let _arr = cloneObj(this.skuInfo[this.activeSkuItemIndex]);
+      this.$set(this.skuInfo[this.activeSkuItemIndex], "name", _arr.name);
+      this.$set(this.skuInfo, this.activeSkuItemIndex, _arr);
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /** 编辑规格值时触发 */
+    async editSkuIValue(item, val, $index, index) {
+      await API_GOODS.saveSpecValuesSeller(item.spec_id, {
+        spec_value: [val.value],
+      });
+
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /** 获取编辑时的skuInfo信息 */
+    getSkuInfo() {
+      /** 下拉列表数据(skuData)存在时 检测productSkuInfo中对应的规格(spec_id)项 并且赋值于skuInfo中对应的规格项信息（描述 + 名称） */
+      if (this.categoryId) {
+        API_GOODS.getSpecValuesListData(this.categoryId, {}).then(
+          (response) => {
+            this.skuData = response;
+            if (
+              this.skuData.length > 0 &&
+              Array.isArray(this.productSkuInfo) &&
+              this.productSkuInfo.length > 0
+            ) {
+              this.skuInfo = cloneObj(this.productSkuInfo);
+              if (this.skuInfo.length > 0) {
+                this.skuInfo.forEach((key) => {
+                  this.skuData.forEach((item) => {
+                    if (key.spec_id === item.spec_id) {
+                      key.name = item.name;
+                      key.spec_memo = item.spec_memo;
+                    }
+                  });
+                });
+              }
+            }
+          }
+        );
+      }
+      /**
+       * 渲染规格详细表格
+       */
+      this.renderTableData();
+    },
+    /**
+     * 渲染table所需要的column 和 data
+     */
+    renderTableData() {
+      this.skuTableColumn = [];
+      this.skuTableData = [];
+
+      //渲染头部
+      this.skuInfo.forEach((sku) => {
+        //列名称
+        let columnName = sku.name;
+        this.skuTableColumn.push({
+          title: columnName,
+          key: columnName,
+        });
+      });
+      this.skuTableColumn.push(
+        {
+          title: "货号",
+          slot: "sn",
+        },
+        {
+          title: "重量",
+          slot: "weight",
+        },
+        {
+          title: "库存",
+          slot: "quantity",
+        },
+        {
+          title: "成本价",
+          slot: "cost",
+        },
+        {
+          title: "价格",
+          slot: "price",
+        },
+        {
+          title: "图片",
+          slot: "images",
+        }
+      );
+
+      //克隆所有渲染的数据
+      let cloneTemp = cloneObj(this.skuInfo);
+      //数据清空一次
+      this.skuTableData = [];
+      //判定 是否存在规格分组
+      if (cloneTemp[0]) {
+        //存放最终结果
+        let result = [];
+
+        //循环选中的 sku 数据
+        cloneTemp[0].spec_values.forEach((specItem) => {
+          result.push({
+            [specItem.name]: specItem.value,
+            images: this.baseInfoForm.goodsGalleryFiles || [],
+          });
+        });
+        cloneTemp.splice(0, 1);
+        result = this.specIterator(result, cloneTemp);
+        result = this.defaultParams(result);
+        this.skuTableData = result;
+      }
+    },
+    /** 自动完成表单所需方法*/
+    filterMethod(value, option) {
+      return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;
+    },
+    /** 根据分类id获取系统设置规格信息*/
+    Get_SkuInfoByCategory() {
+      if (this.baseInfoForm.categoryId) {
+        API_GOODS.getGoodsSpecInfoSeller(this.baseInfoForm.categoryId, {}).then(
+          (response) => {
+            this.skuData = response;
+            if (this.skuData.length > 0) {
+              this.skuData.forEach((spec) => {
+                this.skuKey.push(spec.name);
+              });
+            }
+          }
+        );
+      }
+    },
+    /**
+     * 添加固有属性
+     */
+    defaultParams(tableData) {
+      return tableData;
+    },
+    /**
+     * 迭代属性，形成表格
+     * result 渲染的数据
+     * array spec数据
+     */
+    specIterator(result, cloneTemp) {
+      //是否还可以循环
+      if (cloneTemp.length > 0) {
+        let table = [];
+        result.forEach((resItem) => {
+          let tableItem = [];
+          cloneTemp[0].spec_values.forEach((valItem) => {
+            let obj = cloneObj(resItem);
+            obj[valItem.name] = valItem.value;
+            table.push(obj);
+          });
+        });
+        result = [];
+        table.forEach((t) => {
+          result.push(t);
+        });
+        //清除当前循环的分组
+        cloneTemp.splice(0, 1);
+      } else {
+        return result;
+      }
+      return this.specIterator(result, cloneTemp);
+    },
+    handleSpan({row, column, rowIndex, columnIndex}) {
+    },
+    /** 数据改变之后 抛出数据 */
+    updateSkuTable(row, item) {
+      let index = row._index;
+      // this.skuTableData[index][item] = row[item];
+      /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
+      if (item === "weight") {
+        if (
+          !/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 校验未通过 加入错误存储列表中
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的数字值";
+          return;
+        }
+      } else if (item === "quantity") {
+        if (
+          !/^[0-9]\d*$/.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 库存
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的整数";
+          return;
+        }
+      } else if (item === "cost" || item === "price") {
+        if (
+          !regular.money.test(row[item]) ||
+          parseInt(row[item]) < 0 ||
+          parseInt(row[item]) > 99999999
+        ) {
+          // 成本价 价格
+          this.validateError.push([index, item]);
+          this.validatatxt = "请输入0~99999999之间的价格";
+          return;
+        }
+      }
+      this.skuTableData[index][item] = row[item];
+    },
+    /** 上一步*/
+    pre() {
+      this.loading = true;
+      if (this.activestep === 1) {
+        this.toPreCount > 0
+          ? this.GET_NextLevelCategory()
+          : this.GET_NextLevelCategory(null, 0, true);
+        if (this.activestep-- < 0) this.activestep = 0;
+        this.toPreCount++;
+        this.loading = false;
+      } else {
+        this.activestep--;
+        this.loading = false;
+      }
+    },
+    /** 下一步*/
+    next() {
+      if (this.activestep === 0 && this.draftId) {
+        this.activestep = 1;
+        this.GET_GoodData();
+        return;
+      }
+      this.GET_GoodsParams();
+      /** 1级校验 */
+      this.loading = true;
+      if (this.activestep === 0 && !this.activeCategoryName1) {
+        this.$Message.error("请选择商品分类");
+        this.loading = false;
+        return;
+      } else if (this.activestep === 0 && this.activeCategoryIndex3 === -1) {
+        this.$Message.error("必须选择到三级分类");
+        this.loading = false;
+        return;
+      } else if (
+        this.activestep === 0 &&
+        this.activeCategoryName3 &&
+        this.currentStatus === 0
+      ) {
+        /** 获取该商城分类下 商品参数信息 */
+        /** 查询品牌列表 */
+        this.getGoodsBrandList();
+        /** 查询分类绑定的规格信息 */
+        this.Get_SkuInfoByCategory();
+        // 获取商品单位
+        this.GET_GoodsUnit();
+        // 获取当前店铺分类
+        this.GET_ShopGoodsLabel();
+      }
+
+      /** 2级校验 */
+      if (this.activestep === 1) {
+        this.$refs["baseInfoForm"].validate((valid) => {
+          if (valid) {
+            /** 规格校验 */
+            if (!this.skuFormVali()) {
+              this.loading = false;
+              return;
+            }
+            this.loading = false;
+            if (this.activestep++ > 2) return;
+          } else {
+            this.loading = false;
+            this.$message.error(
+              "表单中存在未填写或者填写有误的地方,已有错误标示，请检查并正确填写"
+            );
+          }
+        });
+        return;
+      }
+      /** 下一步 */
+      this.loading = false;
+      if (this.activestep++ > 2) return;
+    },
+    selectTree(v) {
+      if (v.length > 0) {
+        // 转换null为""
+        for (let attr in v[0]) {
+          if (v[0][attr] == null) {
+            v[0][attr] = "";
+          }
+        }
+        let str = JSON.stringify(v[0]);
+        let menu = JSON.parse(str);
+        this.form = menu;
+        this.editTitle = menu.title;
+      }
+    },
+    changeSelect(v) {
+      this.selectCount = v.length;
+      let ids = "";
+      v.forEach(function (e) {
+        ids += e.id + ",";
+      });
+      ids = ids.substring(0, ids.length - 1);
+      this.baseInfoForm.storeCategoryPath = ids;
+    },
+    /**  添加商品 **/
+    save() {
+      this.submitLoading = true;
+      this.$refs["baseInfoForm"].validate((valid) => {
+        if (valid) {
+          if (
+            this.baseInfoForm.goodsGalleryFiles &&
+            this.baseInfoForm.goodsGalleryFiles.length <= 0
+          ) {
+            this.submitLoading = false;
+            this.$Message.error("请上传商品图片");
+            return;
+          }
+          if (
+            !this.baseInfoForm.storeCategoryPath ||
+            !this.baseInfoForm.storeCategoryPath.length
+          ) {
+            this.submitLoading = false;
+            this.$Message.error("请选择店内分类");
+            return;
+          }
+          //如果选择的是买家承担运费 则运费模板重置为0
+          if (this.baseInfoForm.freightPayer == "BUYER") {
+            this.baseInfoForm.templateId = 0;
+          }
+          this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
+            delete sku._index;
+            delete sku._rowKey;
+            delete sku.specNameId;
+            delete sku.specValueId;
+            return sku;
+          });
+
+          if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
+            this.baseInfoForm.goodsGalleryList = this.baseInfoForm.goodsGalleryFiles.map(
+              (i) => i.url
+            );
+          }
+
+          if (this.goodsId) {
+            API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.$router.go(-1);
+              }
+              else{
+                 this.submitLoading = false;
+              }
+            });
+          } else {
+            this.baseInfoForm.goodsType = "NORMAL";
+            API_GOODS.createGoods(this.baseInfoForm).then((res) => {
+              if (res.success) {
+                this.submitLoading = false;
+                this.activestep = 2;
+              }else{
+                 this.submitLoading = false;
+              }
+            });
+          }
+        } else {
+          this.submitLoading = false;
+        }
+      });
+    },
+    /** 保存至草稿箱 */
+    saveToDraft(saveType) {
+      let showType = saveType === "TEMPLATE" ? "模版" : "草稿";
+      this.baseInfoForm.skuList = this.skuTableData;
+      if (this.baseInfoForm.goodsGalleryFiles.length > 0) {
+        this.baseInfoForm.goodsGalleryList = this.baseInfoForm.goodsGalleryFiles.map(
+          (i) => i.url
+        );
+      }
+      this.baseInfoForm.categoryName = [];
+      this.baseInfoForm.saveType = saveType;
+
+      if (this.draftId) {
+        this.baseInfoForm.id = this.draftId;
+        this.$Modal.confirm({
+          title: "当前" + showType + "已存在",
+          content:
+            "当前" +
+            showType +
+            "已存在，是否保存为新" +
+            showType +
+            "或替换原" +
+            showType,
+          okText: "保存新" + showType,
+          cancelText: "替换旧" + showType,
+          closable: true,
+          onOk: () => {
+            delete this.baseInfoForm.id;
+            this.SAVE_DRAFT_GOODS();
+            return;
+          },
+          onCancel: () => {
+            this.SAVE_DRAFT_GOODS();
+            return;
+          },
+        });
+        return;
+      }
+
+      this.$Modal.confirm({
+        title: "保存" + showType,
+        content: "是否确定保存",
+        okText: "保存",
+        closable: true,
+        onOk: () => {
+          this.SAVE_DRAFT_GOODS();
+        },
+      });
+    },
+    SAVE_DRAFT_GOODS() {
+      API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
+        if (res.success) {
+          this.$Message.info("保存成功！");
+          this.$router.back();
+        }
+      });
+    },
+    /** 选择商城商品分类 */
+    handleSelectCategory(row, index, level) {
+      if (level === 1) {
+        this.baseInfoForm.categoryPath = row.id;
+        this.activeCategoryName1 = row.name;
+        this.activeCategoryName2 = this.activeCategoryName3 = "";
+        this.activeCategoryIndex1 = index;
+        this.activeCategoryIndex2 = -1;
+        this.activeCategoryIndex3 = -1;
+        this.categoryListLevel2 = this.categoryListLevel1[index].children;
+        this.categoryListLevel3 = [];
+      } else if (level === 2) {
+        this.baseInfoForm.categoryPath =
+          this.baseInfoForm.categoryPath + "," + row.id;
+        this.activeCategoryName2 = row.name;
+        this.activeCategoryName3 = "";
+        this.activeCategoryIndex2 = index;
+        this.activeCategoryIndex3 = -1;
+        this.categoryListLevel3 = this.categoryListLevel2[index].children;
+      } else {
+        this.baseInfoForm.categoryPath =
+          this.baseInfoForm.categoryPath + "," + row.id;
+        this.activeCategoryName3 = row.name;
+        this.activeCategoryIndex3 = index;
+      }
+      // 设置当前商城分类ID
+      this.baseInfoForm.categoryId = row.id;
+      this.categoryId = row.id;
+      this.baseInfoForm.categoryName = row.name;
+    },
+    /** 查询下一级 商城商品分类*/
+    GET_NextLevelCategory(row, level, not_click = false) {
+      this.loading = true;
+      const _id = row && row.id !== 0 ? row.id : 0;
+      API_GOODS.getGoodsCategoryAll().then((res) => {
+        if (res.success && res.result) {
+          this.categoryListLevel1 = res.result;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./addGoods.scss";
+</style>
diff --git a/seller/src/views/goods/goods-seller/goodsStock.vue b/seller/src/views/goods/goods-seller/goodsStock.vue
new file mode 100644
index 00000000..2b511436
--- /dev/null
+++ b/seller/src/views/goods/goods-seller/goodsStock.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  placeholder="请输入商品名称"
+                  clearable
+                  style="width: 200px"
+                />
+              </Form-item>
+              <span v-if="drop">
+                <Form-item label="状态" prop="status">
+                  <Select
+                    v-model="searchForm.marketEnable"
+                    placeholder="请选择"
+                    clearable
+                    style="width: 200px"
+                  >
+                    <Option value="DOWN">下架</Option>
+                    <Option value="UPPER">上架</Option>
+                  </Select>
+                </Form-item>
+                <Form-item label="商品编号" prop="sn">
+                  <Input
+                    type="text"
+                    v-model="searchForm.sn"
+                    placeholder="商品编号"
+                    clearable
+                    style="width: 200px"
+                  />
+                </Form-item>
+              </span>
+              <Form-item style="margin-left: -35px" class="br">
+                <Button @click="handleSearch" type="primary" icon="ios-search"
+                  >搜索</Button
+                >
+                <Button @click="handleReset">重置</Button>
+                <a class="drop-down" @click="dropDown">
+                  {{ dropDownContent }}
+                  <Icon :type="dropDownIcon"></Icon>
+                </a>
+              </Form-item>
+            </Form>
+          </Row>
+          <Row class="operation">
+            <Button @click="addGoods" icon="md-refresh">添加商品</Button>
+            <Button @click="getDataList" icon="md-refresh">刷新</Button>
+            <Button type="dashed" @click="openSearch = !openSearch">{{
+              openSearch ? "关闭搜索" : "开启搜索"
+            }}</Button>
+            <Button type="dashed" @click="openTip = !openTip">{{
+              openTip ? "关闭提示" : "开启提示"
+            }}</Button>
+          </Row>
+          <Row v-show="openTip">
+            <Alert show-icon>
+              已选择 <span class="select-count">{{ selectCount }}</span> 项
+              <a class="select-clear" @click="clearSelectAll">清空</a>
+            </Alert>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      title="更新库存"
+      v-model="updateStockModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Input
+        type="number"
+        v-model="updateStockParam.quantity"
+      />
+      <div slot="footer">
+        <Button type="text" @click="updateStockModalVisible = false"
+          >取消</Button
+        >
+        <Button type="primary" @click="updateStock">更新</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getGoodsListDataByStockSeller,
+  getGoodsSkuListDataSeller,
+  updateGoodsSkuStocks,
+  upGoods,
+  lowGoods,
+} from "@/api/goods";
+export default {
+  name: "goods",
+  components: {},
+  data() {
+    return {
+      id: "", //要操作的id
+      openSearch: true, // 显示搜索
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      updateStockModalVisible: false, // 更新库存模态框
+      drop: false, // 搜索栏更多选项
+      dropDownContent: "展开",
+      dropDownIcon: "ios-arrow-down",
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      updateStockParam: { // 更新库存表单
+        id: 0,
+        quantity:  0,
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        goodsName: "",
+        sn: "",
+        marketEnable: "",
+        price: "",
+        sellerName: "",
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [ // 表格表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+
+        {
+          title: "商品缩略图",
+          key: "thumbnail",
+          width: 150,
+          align: "center",
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.thumbnail,
+                alt: "加载图片失败",
+              },
+              style: {
+                cursor: "pointer",
+                width: "80px",
+                height: "60px",
+                margin: "10px 0",
+                "object-fit": "contain",
+              },
+            });
+          },
+        },
+
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120
+        },
+
+        {
+          title: "库存预警数量",
+          key: "stockWarningNum",
+          minWidth: 120
+        },
+
+        {
+          title: "商品库存",
+          key: "quantity",
+          minWidth: 120
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.getUpdateStock(params.row);
+                    },
+                  },
+                },
+                "库存"
+              )
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    getUpdateStock(row) {
+      this.updateStockParam = {skuId: row.id, quantity: row.quantity};
+      this.updateStockModalVisible = true;
+    },
+    updateStock() {
+      let updateStockList = [this.updateStockParam];
+      updateGoodsSkuStocks(updateStockList).then(res => {
+        if (res.success) {
+          this.updateStockModalVisible = false;
+          this.$Message.success("更新库存成功");
+          this.getDataList();
+        }
+      });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    dropDown() {
+      if (this.drop) {
+        this.dropDownContent = "展开";
+        this.dropDownIcon = "ios-arrow-down";
+      } else {
+        this.dropDownContent = "收起";
+        this.dropDownIcon = "ios-arrow-up";
+      }
+      this.drop = !this.drop;
+    },
+    getDataList() {
+      this.loading = true;
+      // 带多条件搜索参数获取表单数据
+      getGoodsListDataByStockSeller(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.goodsSkuIPage.records.map(i =>{
+             i.stockWarningNum = res.result.stockWarningNum
+             return i;
+          });
+          this.total = res.result.goodsSkuIPage.total;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/seller/src/views/home/home.scss b/seller/src/views/home/home.scss
new file mode 100644
index 00000000..aad0bd42
--- /dev/null
+++ b/seller/src/views/home/home.scss
@@ -0,0 +1,167 @@
+.card {
+  margin: 10px 10px 20px;
+  padding: 0 20px 20px;
+  background: #fff;
+  border: 1px solid #e7e7e7;
+
+  border-radius: 0.4em;
+}
+
+h4 {
+  margin: 20px 0;
+  font-size: 18px;
+}
+/deep/ .ivu-icon {
+  margin-right: 10px;
+}
+.rate-box {
+  flex: 3.5;
+  margin-top: 50px;
+  display: flex;
+  justify-content: flex-end;
+  > div {
+    padding: 0 20px;
+
+    border-left: 1px solid #ededed;
+    > h5 {
+
+      text-align: center;
+      margin: 10px 0;
+    }
+  }
+}
+.bold {
+  font-size: 18px;
+}
+.shop-box {
+  flex: 3;
+  display: flex;
+  font-size: 12px;
+  margin-top: 50px;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  margin-left: 20px;
+  > .box-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    margin: 10px 0;
+    justify-content: space-between;
+  }
+  > .title {
+    font-size: 30px;
+  }
+}
+.shop {
+  align-items: center;
+  justify-content: flex-start;
+}
+.notice-title {
+  margin: 10px 0;
+  font-weight: bold;
+}
+.detail-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.detail-title {
+  position: absolute;
+  left: 0;
+  top: -15px;
+  opacity: 0.3;
+  color: #999;
+  font-size: 21px;
+  text-decoration: initial;
+  transition: 0.35s;
+}
+
+.detail-item {
+  cursor: pointer;
+  transition: 0.35s;
+  position: relative;
+  font-weight: bold;
+  width: 286px;
+  display: flex;
+  /deep/ span {
+    color: $theme_color;
+    font-size: 18px;
+  }
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  background: #eee;
+  border-radius: 0.4em;
+  margin: 10px;
+  > div {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin: 0 20px;
+  }
+}
+.detail-item:hover {
+  box-shadow: 3px 5px 12px rgba(0, 0, 0, 0.2);
+  transform: translateY(-4px);
+  > .detail-title {
+    opacity: 1;
+
+    top: 5px;
+  }
+}
+
+.shop-logo {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  border: 3px solid #ededed;
+  box-sizing: border-box;
+}
+.count-item,
+.todo-item {
+  height: 84px;
+  display: flex;
+  cursor: pointer;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  border-radius: 0.4em;
+  flex: 1;
+  font-weight: bold;
+  margin-right: 20px;
+}
+
+.card {
+  box-shadow: 1px 3px 12px rgba($color: #e7e7e7, $alpha: 0.3);
+  border-radius: 0.4em;
+  box-shadow: 1px 3px 12px rgba($color: #e7e7e7, $alpha: 0.3);
+}
+
+.box-left {
+  flex: 8;
+}
+.box-right {
+  flex: 2;
+  margin-left: 20px;
+}
+
+.count-item:nth-of-type(1) {
+  background-image: linear-gradient(109.6deg, rgba($color: #ff9a76, $alpha: 0.6) 11.2%, #ff9a76 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #ff9a76, $alpha: 0.3);
+}
+.count-item:nth-of-type(2) {
+  background-image: linear-gradient(109.6deg, rgba($color: #4e89ae, $alpha: 0.6) 11.2%, #4e89ae 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #4e89ae, $alpha: 0.3);
+}
+.count-item:nth-of-type(3) {
+  background-image: linear-gradient(109.6deg, rgba($color: #679b9b, $alpha: 0.6) 11.2%, #679b9b 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #679b9b, $alpha: 0.3);
+}
+.count-item:nth-of-type(4) {
+  background-image: linear-gradient(109.6deg, rgba($color: #637373, $alpha: 0.6) 11.2%, #637373 100.2%);
+
+  box-shadow: 1px 3px 12px rgba($color: #637373, $alpha: 0.3);
+}
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
new file mode 100644
index 00000000..0456d3bd
--- /dev/null
+++ b/seller/src/views/home/home.vue
@@ -0,0 +1,259 @@
+<template>
+  <div>
+
+    <Modal v-model="noticeFlage" :title="noticesDetail.title">
+      <div v-if="noticesDetail" v-html="noticesDetail.content">
+
+      </div>
+    </Modal>
+    <div class="box flex">
+      <div class="box-left">
+        <div class="card shop flex">
+          <div>
+            <h4>Hi,<span style="margin-left:5px;">{{userData.nickName}}</span></h4>
+            <img class="shop-logo" :src="userData.storeLogo || require('@/assets/logo1.png')" alt="">
+          </div>
+          <div class="shop-box">
+            <div class="box-item">
+              <div>店铺名称：{{userData.storeName || '暂无'}}</div>
+
+            </div>
+            <div class="box-item">
+              <div>店铺状态：{{userData.storeDisable=='OPEN' ? '开启中' : '关闭'}}</div>
+            </div>
+          </div>
+
+          <div class="rate-box">
+            <div>
+              <i-circle :size="120" stroke-color="#fecb89" :trail-width="4" :stroke-width="5" :percent="(userData.serviceScore  *  20)" stroke-linecap="square">
+                <div class="demo-Circle-custom">
+
+                  <p class="bold">{{userData.serviceScore}}分</p>
+                </div>
+              </i-circle>
+              <h5>服务得分</h5>
+            </div>
+            <div>
+              <i-circle :size="120" stroke-color="#a7c5eb" :trail-width="4" :stroke-width="5" :percent="(userData.deliveryScore  *  20)" stroke-linecap="square">
+                <div>
+
+                  <p class="bold">{{userData.deliveryScore}}分</p>
+                </div>
+              </i-circle>
+              <h5>交货得分</h5>
+            </div>
+            <div>
+              <i-circle :size="120" stroke-color="#848ccf" :trail-width="4" :stroke-width="5" :percent="(userData.descriptionScore  *  20)" stroke-linecap="square">
+                <div>
+                  <p class="bold">{{userData.descriptionScore}}分</p>
+                </div>
+              </i-circle>
+              <h5>评价得分</h5>
+            </div>
+          </div>
+        </div>
+        <div class="card">
+          <h4>待办事项</h4>
+
+          <div class="detail-list">
+            <div class="detail-item" @click="navigateTo('order')">
+              <div>
+                <span>{{homeData.unPaidOrder || 0}}</span>
+                <div>待付款</div>
+              </div>
+              <div class="detail-title">
+                交易前
+              </div>
+            </div>
+
+            <div class="detail-item" @click="navigateTo('order')">
+              <div>
+                <span>{{homeData.unDeliveredOrder || 0}}</span>
+                <div>待发货</div>
+              </div>
+              <div>
+                <span>{{homeData.deliveredOrder || 0}}</span>
+                <div>待收货</div>
+              </div>
+              <div class="detail-title">
+                交易中
+              </div>
+            </div>
+            <div class="detail-item">
+              <div @click="navigateTo('returnMoneyOrder')">
+                <span>{{homeData.returnMoney || 0}}</span>
+                <div>退款</div>
+              </div>
+              <div @click="navigateTo('returnGoodsOrder')">
+                <span>{{homeData.returnGoods || 0}}</span>
+                <div>退货</div>
+              </div>
+              <div @click="navigateTo('memberComment')">
+                <span>{{homeData.commentNum || 0}}</span>
+                <div>待评价</div>
+              </div>
+              <div class="detail-title">
+                交易后
+              </div>
+            </div>
+            <div class="detail-item" @click="navigateTo('orderComplaint')">
+              <div>
+                <span>{{homeData.deliveredOrder || 0}}</span>
+                <div>待处理</div>
+              </div>
+
+              <div class="detail-title">
+                投诉
+              </div>
+            </div>
+            <div class="detail-item" @click="navigateTo('goods')">
+              <div>
+                <span>{{homeData.waitUpper || 0}}</span>
+                <div>待上架</div>
+              </div>
+              <div>
+                <span>{{homeData.waitAuth || 0}}</span>
+                <div>审核中</div>
+              </div>
+              <div class="detail-title">
+                商品
+              </div>
+            </div>
+
+            <div class="detail-item">
+              <div>
+                <span>{{homeData.seckillNum || 0}}</span>
+                <div>待参加活动</div>
+              </div>
+              <div>
+                <span>{{homeData.waitPayBill || 0}}</span>
+                <div>待对账</div>
+              </div>
+              <div class="detail-title">
+                其他
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </div>
+      <!-- 公告 -->
+      <div class="card box-right">
+        <h4>平台公告</h4>
+        <div>
+          <div class="notice-title" v-for="(item,index) in notices" :key="index">
+            <a @click="clickLinkNotices(item)">{{item.title}}</a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="card ">
+      <h4>整体数据</h4>
+      <div class="count-list flex">
+        <div class="count-item" @click="navigateTo('goods')">
+          <div>
+            <Icon class="icon" size="31" type="md-photos" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.goodsNum ||0}}</div>
+            <div>商品数量</div>
+          </div>
+
+        </div>
+        <div class="count-item">
+          <div>
+            <Icon class="icon" size="31" type="ios-card" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.orderPrice ||0}}</div>
+            <div>订单总额</div>
+          </div>
+
+        </div>
+        <div class="count-item" @click="navigateTo('order')">
+          <div>
+
+            <Icon class="icon" size="31" type="md-list" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.orderNum ||0}}</div>
+            <div>订单数量</div>
+          </div>
+
+        </div>
+        <div class="count-item">
+          <div>
+            <Icon class="icon" size="31" type="md-person" />
+          </div>
+          <div>
+            <div class="counts">{{homeData.storeUV ||0}}</div>
+            <div>访客数量</div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getSellerHomeData, getHomeNotice } from "@/api/index";
+import { seeArticle } from "@/api/pages";
+import Cookies from "js-cookie";
+
+export default {
+  name: "home",
+  data() {
+    return {
+      noticeFlage: false, // 控制平台公告显隐
+
+      homeData: {}, // 首页数据
+      userData: "", // 店铺信息
+      notices: "", // 平台公告列表
+      noticesDetail: { // 平台公告详情
+        title: "",
+      },
+    };
+  },
+  methods: {
+    navigateTo(name) {
+      this.$router.push({
+        name,
+      });
+    },
+    async init() {
+      let userInfo = JSON.parse(Cookies.get("userInfo"));
+
+      this.userData = userInfo;
+
+      let res = await getHomeNotice();
+      if (res.success) {
+        this.notices = res.result.records;
+      }
+    },
+
+    async clickLinkNotices(val) {
+      let res = await seeArticle(val.id);
+      if (res.success) {
+        this.noticesDetail = res.result;
+        this.noticeFlage = true;
+      }
+    },
+
+    async getHomeData() {
+      let res = await getSellerHomeData();
+      if (res.success) {
+        this.homeData = res.result;
+      }
+    },
+  },
+  mounted() {
+    this.init();
+    this.getHomeData();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./home.scss";
+</style>
diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue
new file mode 100644
index 00000000..a2e4659a
--- /dev/null
+++ b/seller/src/views/lili-components/affix-time.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <div class="breadcrumb">
+      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList" :key="index"> {{item.title}}</span>
+      <div class="date-picker">
+        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" style="width:200px;margin-left:10px;">
+          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">{{ item.year+'年'+item.month+'月' }}</Option>
+        </Select>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import Cookies from "js-cookie";
+export default {
+  props: ["closeShop"],
+  data() {
+    return {
+      month: "", // 所选月份
+
+      defuaultWay: {
+        title: "最近7天",
+        selected: true,
+        searchType: "LAST_SEVEN",
+      },
+
+      selectedWay: {
+        title: "最近7天",
+        selected: true,
+        searchType: "LAST_SEVEN",
+      },
+      storeId: "", // 店铺id
+      dates: [], // 日期列表
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+        storeName: "",
+        storeId: "",
+      },
+
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
+    };
+  },
+  mounted() {
+   this.storeId = JSON.parse(Cookies.get("userInfo")).id;
+
+
+    this.getFiveYears();
+  },
+  methods: {
+    // 获取近5年 年月
+    getFiveYears() {
+      let getYear = new Date().getFullYear();
+
+      let lastFiveYear = getYear - 5;
+      let maxMonth = new Date().getMonth() + 1;
+      let dates = [];
+      // 循环出过去5年
+      for (let year = lastFiveYear; year <= getYear; year++) {
+        for (let month = 1; month <= 12; month++) {
+          if (year == getYear && month > maxMonth) {
+          } else {
+            dates.push({
+              year: year,
+              month: month,
+            });
+          }
+        }
+      }
+      this.dates = dates.reverse();
+    },
+
+    changeSelect() {
+      if (this.month) {
+        this.dateList.forEach((res) => {
+          res.selected = false;
+        });
+        this.selectedWay.year = this.month.split("-")[0];
+        this.selectedWay.month = this.month.split("-")[1];
+        this.selectedWay.searchType = "";
+
+        this.$emit("selected", this.selectedWay);
+      } else {
+      }
+    },
+
+    clickBreadcrumb(item) {
+      this.dateList.forEach((res) => {
+        res.selected = false;
+      });
+      item.selected = true;
+      item.storeId = this.storeId;
+      this.month = "";
+
+      if (item.searchType == "") {
+        item.searchType = "LAST_SEVEN";
+      }
+
+      this.selectedWay = item;
+      // this.month = "";
+      this.selectedWay.year = new Date().getFullYear();
+      this.selectedWay.month = "";
+
+      this.$emit("selected", this.selectedWay);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.breadcrumb {
+  display: flex;
+  align-items: center;
+  > span {
+    margin-right: 15px;
+    cursor: pointer;
+  }
+}
+.active {
+  color: $theme_color;
+  position: relative;
+}
+.date-picker {
+}
+.active:before {
+  content: "";
+  position: absolute;
+  bottom: -10px;
+  left: 0;
+  width: 100%;
+  height: 3px;
+  background: $theme_color;
+}
+</style>
diff --git a/seller/src/views/lili-components/multiple-region.vue b/seller/src/views/lili-components/multiple-region.vue
new file mode 100644
index 00000000..b73b2c96
--- /dev/null
+++ b/seller/src/views/lili-components/multiple-region.vue
@@ -0,0 +1,125 @@
+<template>
+  <Modal :mask-closable="false" :value="switched" v-model="switched" title="选择地址" @on-ok="submit" @on-cancel="cancel">
+    <div class="flex">
+      <Spin size="large" fix v-if="spinShow"></Spin>
+      <Tree ref="tree" class="tree" :data="data" expand-node show-checkbox multiple></Tree>
+    </div>
+  </Modal>
+</template>
+<script>
+import { getChildRegion, getAllCity } from "@/api/index";
+export default {
+  data() {
+    return {
+      switched: false, // 控制模态框显隐
+      spinShow: false, // 加载loading
+      data: [], // 地区数据
+      selectedWay: [], // 选择的地区
+      callBackData: "", // 打开组件的回显数据
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    cancel() {
+      this.switched = false;
+      // this.$emit("close",true)
+    },
+    open(val) {
+      if (val) {
+        this.callBackData = val;
+        this.data = JSON.parse(JSON.stringify(this.data));
+        val.areaId.split(",").forEach((ids) => {
+          this.data.forEach((item) => {
+            if (item.id == ids) {
+              item.selected = true;
+
+            }
+            item.children &&
+              item.children.forEach((child) => {
+                if (child.id == ids) {
+                  child.checked = true;
+                }
+              });
+          });
+        });
+      }
+
+      this.switched = true;
+    },
+
+    submit() {
+      // 筛选出省市
+      let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
+      let sort = [];
+      list.forEach((item) => {
+        item.selectedList = [];
+        if (item.level == "province") {
+          sort.push({
+            ...item,
+          });
+        }
+        sort.forEach((sortItem, sortIndex) => {
+          if (item.level != "province" && sortItem.id == item.parentId) {
+            sortItem.selectedList.push({
+              ...item,
+            });
+          }
+        });
+      });
+
+      this.$emit(
+        "selected",
+        list.filter((item) => {
+          return item.level == "province";
+        })
+      );
+
+      this.cancel();
+    },
+
+    init() {
+      getAllCity().then((res) => {
+        if (res.result) {
+          res.result.forEach((item) => {
+            item.children.forEach((child) => {
+              child.title = child.name;
+            });
+
+            let data = {
+              title: item.name,
+
+              ...item,
+            };
+            this.data.push(data);
+            this.selectedWay.push({ name: data.title, id: data.id });
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.flex {
+  display: flex;
+  position: relative;
+}
+.tree {
+  flex: 2;
+}
+.form {
+  flex: 8;
+}
+.button-list {
+  margin-left: 80px;
+  > * {
+    margin: 0 4px;
+  }
+}
+/deep/ .ivu-modal-body {
+  height: 400px !important;
+  overflow: auto;
+}
+</style>
diff --git a/seller/src/views/lili-components/region.vue b/seller/src/views/lili-components/region.vue
new file mode 100644
index 00000000..a4c530a0
--- /dev/null
+++ b/seller/src/views/lili-components/region.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <Cascader
+      :data="data"
+      :load-data="loadData"
+      change-on-select
+      v-model="dd"
+      @on-visible-change="handleChangeOnSelect"
+      @on-change="change"
+    ></Cascader>
+    {{ dd }}
+  </div>
+</template>
+<script>
+
+import * as API_Setup from "@/api/common.js";
+export default {
+  data() {
+    return {
+      data: [], // 地区数据
+      selected: [], // 已选地区
+      changeOnSelect: false, // 选择时的变化
+    };
+  },
+  mounted() {
+    this.init();
+  },
+
+  props: ['addressId'],
+  methods: {
+    change(val, selectedData) {
+      /**
+       * @returns [regionId,region]
+       */
+      this.$emit("selected", [
+        val,
+        selectedData[selectedData.length - 1].__label.split("/"),
+      ]);
+    },
+    /**
+     * 动态设置change-on-select的值
+     * 当级联选择器弹窗展开时，设置change-on-select为true，即可以点选菜单选项值发生变化
+     * 当级联选择器弹窗关闭时，设置change-on-select为false，即能够设置初始值
+     */
+    handleChangeOnSelect(value) {
+      this.changeOnSelect = value;
+    },
+    getArea(val) {
+    },
+    loadData(item, callback) {
+      item.loading = true;
+      API_Setup.getChildRegion(item.value).then((res) => {
+        if (res.result.length <= 0) {
+          item.loading = false;
+          this.selected = item;
+
+          /**
+           * 处理数据并返回
+           */
+        } else {
+          res.result.forEach((child) => {
+            item.loading = false;
+
+            let data = {
+              value: child.id,
+              label: child.name,
+              loading: false,
+              children: [],
+            };
+
+            if (
+              child.level == "street" ||
+              item.label == "香港特别行政区" ||
+              item.label == "澳门特别行政区"
+            ) {
+              item.children.push({
+                value: child.id,
+                label: child.name,
+              });
+            } else {
+              item.children.push(data);
+            }
+          });
+          this.selected = item;
+          callback();
+        }
+      });
+    },
+    init() {
+      API_Setup.getChildRegion(this.id).then((res) => {
+        let way = [];
+
+        res.result.forEach((item) => {
+          let data;
+          // 台湾省做处理
+          if (item.name == "台湾省") {
+            data = {
+              value: item.id,
+              label: item.name,
+            };
+          } else {
+            data = {
+              value: item.id,
+              label: item.name,
+              loading: false,
+              children: [],
+            };
+          }
+          way.push(data);
+        });
+
+        this.data = way;
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+</style>
diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue
new file mode 100644
index 00000000..b3064aa1
--- /dev/null
+++ b/seller/src/views/lili-dialog/goods-dialog.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="wrapper">
+    <div class="wap-content">
+      <div class="query-wrapper">
+        <div class="query-item">
+          <div>搜索范围</div>
+          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" icon="ios-search" clearable
+            style="width: 150px" v-model="goodsParams.goodsName" />
+        </div>
+        <div class="query-item">
+          <Cascader v-model="category" placeholder="请选择商品分类" style="width: 150px" :data="cateList"></Cascader>
+        </div>
+        <div class="query-item">
+          <Button type="primary" @click="goodsData=[]; getQueryGoodsList();" icon="ios-search">搜索</Button>
+        </div>
+      </div>
+      <div style="positon:retavle;">
+        <Scroll class="wap-content-list" :on-reach-bottom="handleReachBottom" :distance-to-edge="[3,3]">
+
+          <div class="wap-content-item" :class="{ active: item.selected }" @click="checkedGoods(item, index)" v-for="(item, index) in goodsData" :key="index">
+            <div>
+              <img :src="item.thumbnail" alt="" />
+            </div>
+            <div class="wap-content-desc">
+              <div class="wap-content-desc-title">{{ item.goodsName }}</div>
+              <div class="wap-sku">{{ item.goodsUnit }}</div>
+              <div class="wap-content-desc-bottom">
+                <div>￥{{ item.price | unitPrice }}</div>
+              </div>
+            </div>
+          </div>
+          <Spin size="large" fix v-if="loading"></Spin>
+
+          <div v-if="empty" class="empty">暂无商品信息</div>
+        </Scroll>
+
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+export default {
+  data() {
+    return {
+      type: "multiple", //单选或者多选 single  multiple
+
+      cateList: [], // 商品分类列表
+      selectedWay: [], //选中商品集合
+      total: "", // 商品总数
+      goodsParams: { // 请求商品列表参数
+        pageNumber: 1,
+        pageSize: 18,
+        order: "desc",
+        goodsName: "",
+        sn: "",
+        categoryPath: "",
+        marketEnable: "UPPER",
+        isAuth: "PASS",
+      },
+      category: [], // 选中的商品分类
+      goodsData: [], // 商品列表
+      empty: false, // 是否空数据
+      loading: false, // 商品加载loading
+    };
+  },
+  props: ["clearFlag"],
+  watch: {
+    category(val) {
+      this.goodsParams.categoryPath = val[2];
+    },
+    selectedWay: {
+      handler() {
+        this.$emit("selected", this.selectedWay);
+      },
+      deep: true,
+    },
+
+    "goodsParams.categoryPath": {
+      handler: function () {
+        this.goodsData = [];
+        (this.goodsParams.pageNumber = 0), this.getQueryGoodsList();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    handleReachBottom() {
+      setTimeout(() => {
+        if (
+          this.goodsParams.pageNumber * this.goodsParams.pageSize <=
+          this.total
+        ) {
+          this.goodsParams.pageNumber++;
+          this.getQueryGoodsList();
+        }
+      }, 1500);
+    },
+    getQueryGoodsList() {
+      API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
+        this.initGoods(res);
+      });
+    },
+
+    initGoods(res) {
+      if (res.result.records.length !=0) {
+        res.result.records.forEach((item) => {
+          item.selected = false;
+          item.___type = "goods"; //设置为goods让pc wap知道标识
+        });
+        /**
+         * 解决数据请求中，滚动栏会一直上下跳动
+         */
+        this.total = res.result.total;
+        this.goodsData.push(...res.result.records);
+
+      } else {
+        this.empty = true;
+      }
+    },
+
+    // 查询商品
+    init() {
+      Promise.all([
+        API_Goods.getGoodsSkuData(this.goodsParams),
+        API_Goods.getGoodsCategoryAll(0),
+      ]).then((res) => {
+        // 商品
+        this.initGoods(res[0]);
+
+        // 分类
+        if (res[1].result) {
+          this.deepGroup(res[1].result);
+        }
+      });
+    },
+
+    deepGroup(val) {
+      val.forEach((item) => {
+        let childWay = []; //第二级
+        let grandWay = []; //第三级
+        // 第二层
+        if (item.children) {
+          item.children.forEach((child) => {
+            // // 第三层
+            if (child.children) {
+              child.children.forEach((grandson, index, arr) => {
+                arr[index] = {
+                  value: grandson.id,
+                  label: grandson.name,
+                  children: "",
+                };
+              });
+            }
+            let children = {
+              value: child.id,
+              label: child.name,
+              children: child.children,
+            };
+            childWay.push(children);
+          });
+        }
+
+        // 第一层
+        let way = {
+          value: item.id,
+          label: item.name,
+          children: childWay,
+        };
+
+        this.cateList.push(way);
+      });
+    },
+
+    /**
+     * 点击商品
+     */
+    checkedGoods(val, index) {
+      // 如果单选的话
+      if (this.type != "multiple") {
+        this.goodsData.forEach((item) => {
+          item.selected = false;
+        });
+        this.selectedWay = [];
+        val.selected = true;
+        this.selectedWay.push(val);
+
+        return false;
+      }
+
+      if (val.selected == false) {
+        val.selected = true;
+        this.selectedWay.push(val);
+      } else {
+        val.selected = false;
+        this.selectedWay.splice(index, 1);
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+.wap-content {
+  width: 100%;
+}
+.empty {
+  text-align: center;
+  padding: 8px 0;
+  width: 100%;
+}
+.wap-content {
+  flex: 1;
+  padding: 0;
+}
+.wap-content-list {
+  position: relative;
+}
+.wap-content-item {
+  width: 210px;
+  margin: 10px 7px;
+  padding: 6px 0;
+}
+// .wap-content-item{
+
+// }
+.active {
+  background: url("../../assets/selected.png") no-repeat;
+  background-position: right;
+  background-size: 10%;
+}
+</style>
diff --git a/seller/src/views/lili-dialog/index.vue b/seller/src/views/lili-dialog/index.vue
new file mode 100644
index 00000000..ec565191
--- /dev/null
+++ b/seller/src/views/lili-dialog/index.vue
@@ -0,0 +1,106 @@
+<template>
+  <Modal
+    :title="title"
+    :styles="{ top: '120px' }"
+    width="750"
+    @on-cancel="clickClose"
+    @on-ok="clickOK"
+    v-model="flag"
+    :mask-closable="false"
+    scrollable
+  >
+    <goodsDialog
+      @selected="
+        (val) => {
+          goodsData = val;
+        }
+      "
+      ref="goodsDialog"
+      v-if="goodsFlag"
+    />
+    <linkDialog
+      @selectedLink="
+        (val) => {
+          linkData = val;
+        }
+      "
+      v-else
+      class="linkDialog"
+    />
+  </Modal>
+</template>
+<script>
+import goodsDialog from "./goods-dialog";
+import linkDialog from "./link-dialog";
+export default {
+  components: {
+    goodsDialog,
+    linkDialog,
+  },
+  data() {
+    return {
+      title: "选择", // 模态框标题
+      goodsFlag: false, // 是否商品选择器
+      goodsData: "", //选择的商品
+      linkData: "", //选择的链接
+      flag: false, // 控制模态框显隐
+    };
+  },
+  props: ["types"],
+  watch: {},
+  mounted() {},
+  methods: {
+    // 关闭弹窗
+    clickClose() {
+      this.$emit("closeFlag", false);
+      this.goodsFlag = false;
+    },
+
+    // 单选商品
+    singleGoods(){
+
+      var timer = setInterval(() => {
+        if (this.$refs.goodsDialog) {
+
+          this.$refs.goodsDialog.type = "single";
+         clearInterval(timer);
+        }
+      }, 100);
+
+
+    },
+    clickOK() {
+      if (this.goodsFlag) {
+        this.$emit("selectedGoodsData", this.goodsData);
+      } else {
+        this.$emit("selectedLink", this.linkData);
+      }
+      this.clickClose();
+      // this.clearFlag = false
+    },
+    open(type){
+      this.flag = true;
+      if(type == 'goods'){
+        this.goodsFlag = true;
+      } else {
+        this.goodsFlag = false
+      }
+
+    },
+    close(){
+      this.flag = false;
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+/deep/ .ivu-modal {
+  overflow: hidden;
+  height: 650px !important;
+}
+/deep/ .ivu-modal-body {
+  width: 100%;
+  height: 500px;
+  overflow: hidden;
+}
+</style>
diff --git a/seller/src/views/lili-dialog/link-dialog.vue b/seller/src/views/lili-dialog/link-dialog.vue
new file mode 100644
index 00000000..48e9df83
--- /dev/null
+++ b/seller/src/views/lili-dialog/link-dialog.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="wrapper">
+    <div class="wap-list">
+      <div
+        class="wap-item"
+        @click="clickTag(item, i)"
+        v-for="(item, i) in wap"
+        :key="i"
+        :class="{ active: selected == i }"
+      >
+        {{ item.title }}
+      </div>
+    </div>
+    <div class="wap-content"></div>
+
+    <!-- 弹出选择商品的modal -->
+    <Modal
+      title="选择"
+      :styles="{ top: '120px' }"
+      width="750"
+      @on-cancel="clickClose"
+      @on-ok="clickClose"
+      v-model="flag"
+      :mask-closable="false"
+      scrollable
+    >
+      <goodsDialog
+        @selected="
+          (val) => {
+            goodsData = val;
+          }
+        "
+        ref="goodsDialog"
+      />
+    </Modal>
+  </div>
+</template>
+<script>
+import wap from "./wap.js";
+import goodsDialog from "./goods-dialog";
+export default {
+  components: {
+    goodsDialog,
+  },
+  data() {
+    return {
+      goodsData: "", // 商品列表
+      flag: false, // 控制商品模块显隐
+      selected: 0, // 已选模块
+      selectedLink: "", //选中的链接
+      wap,
+    };
+  },
+  watch: {
+    selectedLink(val) {
+      
+
+      this.$emit("selectedLink", val);
+    },
+  },
+  mounted() {
+    this.wap.forEach((item) => {
+      item.selected = false;
+    });
+  },
+  methods: {
+    clickClose() {
+      this.flag = false;
+    },
+
+    // 点击链接
+    clickTag(val, i) {
+      this.selected = i;
+      if (!val.openGoods) {
+        this.selectedLink = val;
+      }
+      //   打开选择商品
+      else {
+        this.$refs.goodsDialog.selectedWay = [];
+        this.$refs.goodsDialog.type = "single";
+        this.flag = true;
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "./style.scss";
+.wap-content-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.wap-flex {
+  margin: 2px;
+}
+
+/deep/ .ivu-modal {
+  overflow: hidden;
+  height: 650px !important;
+}
+/deep/ .ivu-modal-body {
+  width: 100%;
+  height: 500px;
+  overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/seller/src/views/lili-dialog/style.scss b/seller/src/views/lili-dialog/style.scss
new file mode 100644
index 00000000..acff3c75
--- /dev/null
+++ b/seller/src/views/lili-dialog/style.scss
@@ -0,0 +1,101 @@
+.wrapper {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    .wap-list {
+        flex: 2;
+        text-align: center;
+        overflow-y: auto;
+        height: 100%;
+    }
+    > .wap-list,
+    .wap-content {
+        padding: 8px;
+    }
+    .wap-content {
+        flex: 8;
+    }
+}
+.wap-sku {
+    font-size: 12px;
+    color: #999;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    white-space: nowrap;
+}
+.query-wrapper {
+    display: flex;
+    margin: 8px 0;
+    > .query-item {
+        display: flex;
+        align-items: center;
+        > * {
+            margin: 0 4px;
+        }
+    }
+}
+/deep/ .ivu-scroll-container {
+    width: 100% !important;
+    height: 400px !important;
+}
+/deep/ .ivu-scroll-content {
+    /* */
+    display: flex;
+    flex-wrap: wrap;
+}
+.wap-content-list {
+    overflow-y: auto;
+}
+.wap-item {
+    padding: 10px 0;
+    cursor: pointer;
+}
+.wap-item:hover {
+    background: #ededed;
+}
+.active{
+    background: #ededed;
+}
+.active {
+    border: 1px solid #ededed;
+}
+.wap-content-item {
+    cursor: pointer;
+
+    display: flex;
+    height: 80px;
+    padding: 2px;
+    overflow: hidden;
+    align-items: center;
+    margin: 10px;
+    /deep/ img {
+        width: 60px;
+        height: 60px;
+        text-align: center;
+    }
+    .wap-content-desc {
+        width: 180px;
+        padding: 8px;
+        > .wap-content-desc-title {
+            display: -webkit-box;
+            font-size: 12px;
+            color: #666;
+
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            -webkit-line-clamp: 2;
+        }
+        > .wap-content-desc-bottom {
+            font-size: 12px;
+            padding: 4px 0;
+            color: #999;
+            display: flex;
+            justify-content: space-between;
+            > div:nth-of-type(1) {
+                color: $theme_color;
+            }
+        }
+    }
+}
diff --git a/seller/src/views/lili-dialog/wap.js b/seller/src/views/lili-dialog/wap.js
new file mode 100644
index 00000000..26f96c05
--- /dev/null
+++ b/seller/src/views/lili-dialog/wap.js
@@ -0,0 +1,25 @@
+export default [
+    {
+        title:"商品",
+        url:"0",
+        openGoods:true
+    },
+    {
+        title:"分类",
+        url:"1"
+    },
+    {
+        title:"店铺",
+        url:"2"
+    },
+    {
+        title:"活动",
+        url:"3",
+     
+    },
+    {
+        title:"其他",
+        url:"4"
+    }
+
+];
diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue
new file mode 100644
index 00000000..c8052feb
--- /dev/null
+++ b/seller/src/views/login.vue
@@ -0,0 +1,258 @@
+<template>
+  <div class="login">
+    <Row
+      type="flex"
+      class="row"
+      justify="center"
+      align="middle"
+      @keydown.enter.native="submitLogin"
+    >
+      <Col style="width: 368px">
+        <Header />
+        <Row>
+            <Form
+              ref="usernameLoginForm"
+              :model="form"
+              :rules="rules"
+              class="form"
+            >
+              <FormItem prop="username">
+                <Input
+                  v-model="form.username"
+                  prefix="ios-contact"
+                  size="large"
+                  clearable
+                  placeholder="请输入用户名"
+                  autocomplete="off"
+                />
+              </FormItem>
+              <FormItem prop="password">
+                <Input
+                  type="password"
+                  v-model="form.password"
+                  prefix="ios-lock"
+                  size="large"
+                  password
+                  placeholder="请输入密码"
+                  autocomplete="off"
+                />
+              </FormItem>
+            </Form>
+
+          <Row>
+            <Button
+              class="login-btn"
+              type="primary"
+              size="large"
+              :loading="loading"
+              @click="submitLogin"
+              long
+            >
+              <span v-if="!loading">{{ $t("login") }}</span>
+              <span v-else>{{ $t("logining") }}</span>
+            </Button>
+          </Row>
+
+        </Row>
+        <Footer />
+      </Col>
+      <LangSwitch />
+    </Row>
+  </div>
+</template>
+
+<script>
+import {
+  login,
+  userMsg,
+  initCaptcha,
+  drawCodeImage,
+} from "@/api/index";
+import { validateMobile } from "@/libs/validate";
+import Cookies from "js-cookie";
+import Header from "@/views/main-components/header";
+import Footer from "@/views/main-components/footer";
+import LangSwitch from "@/views/main-components/lang-switch";
+import util from "@/libs/util.js";
+export default {
+  components: {
+    LangSwitch,
+    Header,
+    Footer,
+  },
+  data() {
+    return {
+      saveLogin: true, // 保存登录状态
+      loading: false, // 加载状态
+      form: { // 表单数据
+        username: "",
+        password: "",
+        mobile: "",
+        code: "",
+      },
+      rules: { // 验证规则
+        username: [
+          {
+            required: true,
+            message: "账号不能为空",
+            trigger: "blur",
+          },
+        ],
+        password: [
+          {
+            required: true,
+            message: "密码不能为空",
+            trigger: "blur",
+          },
+        ],
+        imgCode: [
+          {
+            required: true,
+            message: "验证码不能为空",
+            trigger: "blur",
+          },
+        ],
+        mobile: [
+          {
+            required: true,
+            message: "手机号不能为空",
+            trigger: "blur",
+          },
+          {
+            validator: validateMobile,
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    afterLogin(res) {
+      let accessToken = res.result.accessToken;
+      this.setStore("accessToken", accessToken);
+      this.setStore("refreshToken", res.result.refreshToken);
+
+      // 获取用户信息
+      userMsg().then((res) => {
+        if (res.success) {
+          // 避免超过大小限制
+         /*  delete res.result.permissions;
+          let roles = [];
+          res.result.roles.forEach((e) => {
+            roles.push(e.name);
+          });
+          this.setStore("roles", roles); */
+          this.setStore("saveLogin", this.saveLogin);
+          if (this.saveLogin) {
+            // 保存7天
+            Cookies.set("userInfo", JSON.stringify(res.result), {
+              expires: 7,
+            });
+          } else {
+            Cookies.set("userInfo", JSON.stringify(res.result));
+          }
+          this.setStore("userInfo", res.result);
+          this.$store.commit("setAvatarPath", res.result.storeLogo);
+          // 加载菜单
+          util.initRouter(this);
+          this.$router.push({
+            name: "home_index",
+          });
+        } else {
+          this.loading = false;
+        }
+      });
+    },
+    submitLogin() {
+      // 正常逻辑
+      this.$refs.usernameLoginForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          login({
+            username: this.form.username,
+            password: this.md5(this.form.password),
+          }).then((res) => {
+            this.loading = false;
+            if (res && res.success) {
+              this.afterLogin(res);
+            }
+          }).catch(()=>{this.loading = false})
+        }
+      })
+    },
+
+  },
+  mounted() {
+    // this.getCaptchaImg();
+  },
+};
+</script>
+<style lang="scss" scoped>
+ .row {
+  padding: 70px 50px;
+  border-radius: .8em;
+
+}
+.login {
+  height: 100%;
+  background: url("../assets/background.svg") no-repeat;
+  background-size: 100%;
+  background-position-y: bottom;
+  background-color: #edf0f3;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .ivu-tabs-nav-container {
+    line-height: 2;
+    font-size: 17px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    overflow: hidden;
+    position: relative;
+    zoom: 1;
+  }
+  /deep/ .ivu-row{
+    display: flex;
+    flex-direction: column !important;
+  }
+  .form {
+    padding-top: 1vh;
+
+    .input-verify {
+      width: 67%;
+    }
+  }
+
+  .forget-pass,
+  .other-way {
+    font-size: 14px;
+  }
+
+  .login-btn,
+  .other-login {
+    margin-top: 3vh;
+  }
+
+  .icons {
+    display: flex;
+    align-items: center;
+  }
+
+  .other-icon {
+    cursor: pointer;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+    color: rgba(0, 0, 0, 0.2);
+
+    :hover {
+      color: #2d8cf0;
+    }
+  }
+}
+.flex {
+  justify-content: center;
+}
+
+</style>
diff --git a/seller/src/views/logistics/index.vue b/seller/src/views/logistics/index.vue
new file mode 100644
index 00000000..5fd36898
--- /dev/null
+++ b/seller/src/views/logistics/index.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch"> </Row>
+          <Row class="operation">
+            <Button @click="add" type="primary" icon="md-add">添加</Button>
+            <Button @click="getDataList" icon="md-refresh">刷新</Button>
+            <Button type="dashed" @click="openTip = !openTip">{{
+              openTip ? "关闭提示" : "开启提示"
+            }}</Button>
+          </Row>
+          <Row v-show="openTip">
+            <Alert show-icon>
+              已选择 <span class="select-count">{{ selectCount }}</span> 项
+              <a class="select-clear" @click="clearSelectAll">清空</a>
+            </Alert>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="120" :rules="formValidate">
+        <FormItem label="物流公司名称" prop="name">
+          <Input v-model="form.name" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="物流公司代码" prop="code">
+          <Input v-model="form.code" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="支持电子面单">
+          <i-switch v-model="form.standBy">
+            <span slot="open">开</span>
+            <span slot="close">关</span>
+          </i-switch>
+        </FormItem>
+        <FormItem label="电子面单表单">
+          <Input v-model="form.formItems" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="禁用状态" prop="disabled">
+          <i-switch v-model="form.disabled">
+            <span slot="open">开</span>
+            <span slot="close">关</span>
+          </i-switch>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getLogisticsPage,
+  updateLogistics,
+  getLogisticsDetail,
+  addLogistics,
+  delLogistics,
+} from "@/api/logistics";
+export default {
+  name: "bill",
+  components: {},
+  data() {
+    return {
+      openTip: true, // 显示提示
+      loading: true, // 表单加载状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        name: "",
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        name: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        name: [
+          {
+            required: true,
+            message: "请输入物流公司名称",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "物流公司名称",
+          key: "name",
+          minWidth: 120
+        },
+
+        {
+          title: "状态",
+          key: "disabled",
+          minWidth: 50,
+          render(h, params) {
+            return h("Badge", {
+              props: {
+                status: params.row.disabled ? "success" : "error",
+                text: params.row.disabled ? "开启" : "关闭",
+              },
+            });
+          },
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 150,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "primary",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "修改"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
+                    },
+                  },
+                },
+                "删除"
+              ),
+            ]);
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      // 重新加载数据
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+
+      getLogisticsPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+
+          if (this.modalType == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+
+            this.form.disabled
+              ? (this.form.disabled = "OPEN")
+              : (this.form.disabled = "CLOSE");
+            addLogistics(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          } else {
+            // 编辑
+            updateLogistics(this.id, this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        }
+      });
+    },
+    add() {
+      this.modalType = 0;
+      this.modalTitle = "添加";
+      this.form = {};
+      this.$refs.form.resetFields();
+
+      this.modalVisible = true;
+    },
+    detail(v) {
+      this.modalType = 1;
+      this.id = v.id;
+      this.modalTitle = "修改";
+      this.modalVisible = true;
+
+      this.form.name = v.name;
+      this.form.code = v.code;
+      this.form.standBy = v.standBy;
+      this.form.formItems = v.formItems;
+      this.form.disabled = v.disabled;
+      this.form.disabled == "OPEN"
+        ? (this.form.disabled = true)
+        : (this.form.disabled = false);
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        // 记得确认修改此处
+        content: "您确认要删除 " + v.name + " ?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delLogistics(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+
+  .select-clear {
+    margin-left: 10px;
+  }
+
+  .page {
+    margin-top: 2vh;
+  }
+
+  .drop-down {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/seller/src/views/main-components/breadcrumb-nav.vue b/seller/src/views/main-components/breadcrumb-nav.vue
new file mode 100644
index 00000000..bdc5ca19
--- /dev/null
+++ b/seller/src/views/main-components/breadcrumb-nav.vue
@@ -0,0 +1,28 @@
+<template>
+    <Breadcrumb>
+        <BreadcrumbItem 
+            v-for="item in currentPath" 
+            :to="item.path" 
+            :key="item.name"
+        >{{ itemTitle(item) }}</BreadcrumbItem>
+    </Breadcrumb>
+</template>
+
+<script>
+export default {
+    name: 'breadcrumbNav',
+    props: {
+        currentPath: Array
+    },
+    methods: {
+        itemTitle (item) {
+            if (typeof item.title == 'object') {
+                return this.$t(item.title.i18n);
+            } else {
+                return item.title;
+            }
+        }
+    }
+};
+</script>
+
diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue
new file mode 100644
index 00000000..4df03af6
--- /dev/null
+++ b/seller/src/views/main-components/footer.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="foot">
+    <Row type="flex" justify="space-around" class="help">
+      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('help') }}</a>
+      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('privacy') }}</a>
+      <a class="item" href="https://lilishop.com" target="_blank">{{ $t('terms') }}</a>
+    </Row>
+    <Row type="flex" justify="center" class="copyright">
+      Copyright © 2020 - Present
+      <a
+        href="http://lili.cn"
+        target="_blank"
+        style="margin:0 5px;"
+      >lili-shop</a> {{ $t('rights') }}
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "footer"
+};
+</script>
+
+<style lang="scss" scoped>
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>
diff --git a/seller/src/views/main-components/fullscreen.vue b/seller/src/views/main-components/fullscreen.vue
new file mode 100644
index 00000000..63c3a1dd
--- /dev/null
+++ b/seller/src/views/main-components/fullscreen.vue
@@ -0,0 +1,80 @@
+<template>
+    <div @click="handleChange" v-if="showFullScreenBtn" class="full-screen-btn-con">
+        <Tooltip :content="value ? '退出全屏' : '全屏'" placement="bottom">
+            <Icon :type="value ? 'ios-contract' : 'ios-expand'" :size="24"></Icon>
+        </Tooltip>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "fullScreen",
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    showFullScreenBtn() {
+      return window.navigator.userAgent.indexOf("MSIE") < 0;
+    }
+  },
+  methods: {
+    handleFullscreen() {
+      let main = document.body;
+      if (this.value) {
+        if (document.exitFullscreen) {
+          document.exitFullscreen();
+        } else if (document.mozCancelFullScreen) {
+          document.mozCancelFullScreen();
+        } else if (document.webkitCancelFullScreen) {
+          document.webkitCancelFullScreen();
+        } else if (document.msExitFullscreen) {
+          document.msExitFullscreen();
+        }
+      } else {
+        if (main.requestFullscreen) {
+          main.requestFullscreen();
+        } else if (main.mozRequestFullScreen) {
+          main.mozRequestFullScreen();
+        } else if (main.webkitRequestFullScreen) {
+          main.webkitRequestFullScreen();
+        } else if (main.msRequestFullscreen) {
+          main.msRequestFullscreen();
+        }
+      }
+    },
+    handleChange() {
+      this.handleFullscreen();
+    }
+  },
+  created() {
+    let isFullscreen =
+      document.fullscreenElement ||
+      document.mozFullScreenElement ||
+      document.webkitFullscreenElement ||
+      document.fullScreen ||
+      document.mozFullScreen ||
+      document.webkitIsFullScreen;
+    isFullscreen = !!isFullscreen;
+    document.addEventListener("fullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("mozfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("webkitfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    document.addEventListener("msfullscreenchange", () => {
+      this.$emit("input", !this.value);
+      this.$emit("on-change", !this.value);
+    });
+    this.$emit("input", isFullscreen);
+  }
+};
+</script>
diff --git a/seller/src/views/main-components/header.vue b/seller/src/views/main-components/header.vue
new file mode 100644
index 00000000..aabf3f79
--- /dev/null
+++ b/seller/src/views/main-components/header.vue
@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <Row class="header">
+      <img src="../../assets/lili.png" class="logo" width="220px">
+
+    </Row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "header",
+};
+</script>
+
+<style lang="scss" scoped>
+.header {
+
+  margin-bottom: 6vh;
+  align-items: center;
+  display: flex;
+  justify-content: center !important;
+}
+.logo {
+  transform: scale(3);
+}
+</style>
diff --git a/seller/src/views/main-components/lang-switch.vue b/seller/src/views/main-components/lang-switch.vue
new file mode 100644
index 00000000..edbe5cfa
--- /dev/null
+++ b/seller/src/views/main-components/lang-switch.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="lang-icon">
+    <Dropdown @on-click="langChange">
+      <Icon type="md-globe" size="26"/>
+      <DropdownMenu slot="list">
+        <DropdownItem name="zh-CN">简体中文</DropdownItem>
+        <DropdownItem name="en-US">English</DropdownItem>
+      </DropdownMenu>
+    </Dropdown>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "langSwitch",
+  methods: {
+    langChange(v) {
+      this.$i18n.locale = v;
+      this.$store.commit("switchLang", v);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.lang-icon {
+  position: fixed;
+  top: 2vh;
+  right: 1.5vw;
+  cursor: pointer;
+}
+</style>
diff --git a/seller/src/views/main-components/message-tip.vue b/seller/src/views/main-components/message-tip.vue
new file mode 100644
index 00000000..2f5ede49
--- /dev/null
+++ b/seller/src/views/main-components/message-tip.vue
@@ -0,0 +1,34 @@
+<template>
+  <div @click="showMessage" class="message-con">
+    <Tooltip :always="value>0" :content="value > 0 ? '有' + value + message : '无未读消息'" placement="bottom">
+      <Badge :count="value" dot>
+        <Icon type="md-notifications" :size="22" />
+      </Badge>
+    </Tooltip>
+  </div>
+</template>
+
+<script>
+import util from "@/libs/util.js";
+export default {
+  name: "messageTip",
+  props: {
+    value: { // 未读消息数量
+      type: Number,
+      default: 0
+    },
+    message:{ // 消息展示内容
+      type: String,
+      default: ""
+    }
+  },
+  methods: {
+    showMessage() {
+      util.openNewPage(this, "message_index");
+      this.$router.push({
+        name: "message_index"
+      });
+    }
+  }
+};
+</script>
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
new file mode 100644
index 00000000..031824a7
--- /dev/null
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -0,0 +1,57 @@
+<style lang="scss" scoped>
+@import "./styles/menu.scss";
+</style>
+
+<template>
+  <div class="ivu-shrinkable-menu">
+    <!-- 一级菜单 -->
+    <Menu ref="sideMenu" width="110px" theme="dark"  :active-name="currNav" @on-select="selectNav">
+      <MenuItem v-for="(item, i) in navList" :key="i" :name="item.name">
+        {{item.title}}
+      </MenuItem>
+    </Menu>
+    <!-- 二级菜单 -->
+    <Menu
+      ref="childrenMenu"
+      :active-name="$route.name"
+      width="130px"
+      @on-select="changeMenu"
+    >
+      <template v-for="item in menuList">
+        <MenuGroup :title="item.title" :key="item.id" style="padding-left:0;">
+          <MenuItem :name="menu.name" v-for="menu in item.children" :key="menu.name">
+            {{menu.title}}
+          </MenuItem>
+        </MenuGroup>
+
+      </template>
+    </Menu>
+  </div>
+</template>
+
+<script>
+import util from "@/libs/util.js";
+export default {
+  name: "shrinkableMenu",
+  computed: {
+    menuList() {
+      return this.$store.state.app.menuList;
+    },
+    navList() {
+      return this.$store.state.app.navList;
+    },
+  },
+  methods: {
+    changeMenu(name) { //二级路由点击
+      this.$router.push({
+        name: name
+      });
+    },
+    selectNav(name) {
+      this.$store.commit("setCurrNav", name);
+      this.setStore("currNav", name);
+      util.initRouter(this);
+    },
+  }
+};
+</script>
diff --git a/seller/src/views/main-components/shrinkable-menu/styles/menu.scss b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
new file mode 100644
index 00000000..59962e14
--- /dev/null
+++ b/seller/src/views/main-components/shrinkable-menu/styles/menu.scss
@@ -0,0 +1,23 @@
+.ivu-shrinkable-menu{
+  height: calc(100% - 60px);
+  width: 240px;
+  display: flex;
+}
+.ivu-menu-vertical .ivu-menu-item-group-title {
+  padding-left: 5px;
+}
+.ivu-btn-text:hover {
+  background-color: rgba(255,255,255,.2) !important;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+  background-color: #fff;
+  &:hover{
+    background-color: #fff;
+  }
+}
+.ivu-menu-vertical{
+  overflow-y: auto;
+}
+.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
+  color: #ed3f14;
+}
diff --git a/seller/src/views/main-components/tags-page-opened.vue b/seller/src/views/main-components/tags-page-opened.vue
new file mode 100644
index 00000000..3fb29789
--- /dev/null
+++ b/seller/src/views/main-components/tags-page-opened.vue
@@ -0,0 +1,267 @@
+<style lang="scss" scoped>
+@import "../main.scss";
+</style>
+
+<template>
+
+  <div
+    ref="scrollCon"
+    @DOMMouseScroll="handlescroll"
+    @mousewheel="handlescroll"
+    class="tags-outer-scroll-con"
+  >
+    <ul v-show="visible" :style="{left: contextMenuLeft + 'px', top: contextMenuTop + 'px'}" class="contextmenu">
+      <li v-for="(item, key) of actionList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
+    </ul>
+    <div ref="scrollBody" class="tags-inner-scroll-body" :style="{left: tagBodyLeft + 'px'}">
+      <transition-group name="taglist-moving-animation">
+        <Tag
+          type="dot"
+          v-for="item in pageTagsList"
+          ref="tagsPageOpened"
+          :key="item.name"
+          :name="item.name"
+          @on-close="closePage"
+          @click.native="linkTo(item)"
+          :closable="item.name=='home_index'?false:true"
+          :color="item.children?(item.children[0].name==currentPageName?'primary':'default'):(item.name==currentPageName?'primary':'default')"
+           @contextmenu.prevent.native="contextMenu(item, $event)"
+        >{{ itemTitle(item) }}</Tag>
+      </transition-group>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "tagsPageOpened",
+  data() {
+    return {
+      currentPageName: this.$route.name, // 当前路由名称
+      tagBodyLeft: 0, // 标签左偏移量
+      visible: false, // 显示操作按钮
+      contextMenuLeft: 0, // 内容左偏移量
+      contextMenuTop: 0, // 内容上偏移量
+      actionList: {
+        others: '关闭其他',
+        clearAll: '关闭所有'
+      },
+      refsTag: [], // 所有已打开标签
+      tagsCount: 1 // 标签数量
+    };
+  },
+  props: {
+    pageTagsList: Array,
+    beforePush: {
+      type: Function,
+      default: item => {
+        return true;
+      }
+    }
+  },
+  computed: {
+    title() {
+      return this.$store.state.app.currentTitle;
+    },
+    tagsList() {
+      return this.$store.state.app.storeOpenedList;
+    }
+  },
+  methods: {
+    itemTitle(item) {
+      if (typeof item.title == "object") {
+        return this.$t(item.title.i18n);
+      } else {
+        return item.title;
+      }
+    },
+    closePage(event, name) {
+      let storeOpenedList = this.$store.state.app.storeOpenedList;
+      let lastPageObj = storeOpenedList[0];
+      if (this.currentPageName == name) {
+        let len = storeOpenedList.length;
+        for (let i = 1; i < len; i++) {
+          if (storeOpenedList[i].name == name) {
+            if (i < len - 1) {
+              lastPageObj = storeOpenedList[i + 1];
+            } else {
+              lastPageObj = storeOpenedList[i - 1];
+            }
+            break;
+          }
+        }
+      } else {
+        let tagWidth = event.target.parentNode.offsetWidth;
+        this.tagBodyLeft = Math.min(this.tagBodyLeft + tagWidth, 0);
+      }
+      this.$store.commit("removeTag", name);
+      this.$store.commit("closePage", name);
+      storeOpenedList = this.$store.state.app.storeOpenedList;
+      localStorage.storeOpenedList = JSON.stringify(storeOpenedList);
+      if (this.currentPageName == name) {
+        this.linkTo(lastPageObj);
+      }
+    },
+    linkTo(item) {
+      if (this.$route.name == item.name) {
+        return;
+      }
+      let routerObj = {};
+      routerObj.name = item.name;
+      if (item.argu) {
+        routerObj.params = item.argu;
+      }
+      if (item.query) {
+        routerObj.query = item.query;
+      }
+      if (this.beforePush(item)) {
+        this.$router.push(routerObj);
+      }
+    },
+    handlescroll(e) {
+      var type = e.type;
+      let delta = 0;
+      if (type == "DOMMouseScroll" || type == "mousewheel") {
+        delta = e.wheelDelta ? e.wheelDelta : -(e.detail || 0) * 40;
+      }
+      let left = 0;
+      if (delta > 0) {
+        left = Math.min(0, this.tagBodyLeft + delta);
+      } else {
+        if (
+          this.$refs.scrollCon.offsetWidth - 100 <
+          this.$refs.scrollBody.offsetWidth
+        ) {
+          if (
+            this.tagBodyLeft <
+            -(
+              this.$refs.scrollBody.offsetWidth -
+              this.$refs.scrollCon.offsetWidth +
+              100
+            )
+          ) {
+            left = this.tagBodyLeft;
+          } else {
+            left = Math.max(
+              this.tagBodyLeft + delta,
+              this.$refs.scrollCon.offsetWidth -
+                this.$refs.scrollBody.offsetWidth -
+                100
+            );
+          }
+        } else {
+          this.tagBodyLeft = 0;
+        }
+      }
+      this.tagBodyLeft = left;
+    },
+    handleTagsOption(type) {
+      if (type == "clearAll") {
+        this.$store.commit("clearAllTags");
+        this.$router.push({
+          name: "home_index"
+        });
+      } else {
+        this.$store.commit("clearOtherTags", this);
+      }
+      this.tagBodyLeft = 0;
+    },
+    moveToView(tag) {
+      if (tag.offsetLeft < -this.tagBodyLeft) {
+        // 标签在可视区域左侧
+        this.tagBodyLeft = -tag.offsetLeft + 10;
+      } else if (
+        tag.offsetLeft + 10 > -this.tagBodyLeft &&
+        tag.offsetLeft + tag.offsetWidth <
+          -this.tagBodyLeft + this.$refs.scrollCon.offsetWidth - 100
+      ) {
+        // 标签在可视区域
+        this.tagBodyLeft = Math.min(
+          0,
+          this.$refs.scrollCon.offsetWidth -
+            100 -
+            tag.offsetWidth -
+            tag.offsetLeft -
+            20
+        );
+      } else {
+        // 标签在可视区域右侧
+        this.tagBodyLeft = -(
+          tag.offsetLeft -
+          (this.$refs.scrollCon.offsetWidth - 100 - tag.offsetWidth) +
+          20
+        );
+      }
+    },
+    contextMenu (item, e) {
+      this.visible = true
+      const offsetLeft = this.$el.getBoundingClientRect().left
+      this.contextMenuLeft = e.clientX - offsetLeft + 10
+      this.contextMenuTop = e.clientY - 64
+    },
+    closeMenu () {
+      this.visible = false
+    }
+  },
+  mounted() {
+    this.refsTag = this.$refs.tagsPageOpened;
+    setTimeout(() => {
+      this.refsTag.forEach((item, index) => {
+        if (this.$route.name == item.name) {
+          let tag = this.refsTag[index].$el;
+          this.moveToView(tag);
+        }
+      });
+    }, 1); // 这里不设定时器就会有偏移bug
+    this.tagsCount = this.tagsList.length;
+  },
+  watch: {
+    $route(to) {
+      this.currentPageName = to.name;
+      this.$nextTick(() => {
+        this.refsTag.forEach((item, index) => {
+          if (to.name == item.name) {
+            let tag = this.refsTag[index].$el;
+            this.moveToView(tag);
+          }
+        });
+      });
+      this.tagsCount = this.tagsList.length;
+    },
+    visible (value) {
+      if (value) {
+        document.body.addEventListener('click', this.closeMenu)
+      } else {
+        document.body.removeEventListener('click', this.closeMenu)
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.contextmenu {
+  position: absolute;
+  margin: 0;
+  padding: 5px 0;
+  background: #fff;
+  z-index: 11000;
+  list-style-type: none;
+  border-radius: 4px;
+  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .1);
+  li {
+    margin: 0;
+    padding: 5px 15px;
+    cursor: pointer;
+    &:hover {
+      background: #eee;
+    }
+  }
+}
+
+.ivu-tag-primary{
+  /deep/ .ivu-tag-dot-inner{
+    background: red !important;
+  }
+}
+
+</style>
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
new file mode 100644
index 00000000..d4d2ea6d
--- /dev/null
+++ b/seller/src/views/main.scss
@@ -0,0 +1,331 @@
+.lock-screen-back {
+  border-radius: 50%;
+  z-index: -1;
+  box-shadow: 0 0 0 0 #667aa6 inset;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  transition: all 3s;
+}
+
+.main {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+
+  .unlock-con {
+    width: 0px;
+    height: 0px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    z-index: 11000;
+  }
+
+  .sidebar-menu-con {
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 21;
+    transition: width 0.3s; // background: rgb(73, 80, 96)
+    background: #fff;
+    box-shadow: rgba(0, 21, 41, 0.35) 2px 0px 6px;
+  }
+
+  .layout-text {
+    display: inline-block;
+    white-space: nowrap;
+    position: absolute;
+  }
+
+  .main-hide-text .layout-text {
+    display: none;
+  }
+
+  &-content-container {
+    position: relative;
+  }
+
+  &-header-con {
+    box-sizing: border-box;
+    position: fixed;
+    display: block;
+    padding-left: 200px;
+    width: 100%;
+    height: 100px;
+    z-index: 20;
+    box-shadow: 0 2px 1px 1px rgba(100, 100, 100, 0.1);
+    transition: padding 0.3s;
+  }
+
+  &-breadcrumb {
+    padding: 8px 15px 0;
+  }
+
+  &-nav {
+    padding: 8px 15px 0;
+    color: #515a6e;
+    font-size: 14px;
+
+    :hover {
+      color: #2d8cf0;
+      transition: color 0.2s ease-in-out;
+    }
+  }
+
+  &-menu-left {
+    background: #464c5b;
+    height: 100%;
+  }
+
+  .tags-con {
+    height: 40px;
+    z-index: -1;
+    background: #f0f0f0;
+
+    .tags-outer-scroll-con {
+      position: relative;
+      box-sizing: border-box;
+      padding-right: 120px;
+      width: 100%;
+      height: 100%;
+
+      .tags-inner-scroll-body {
+        position: absolute;
+        padding: 2px 10px;
+        overflow: visible;
+        white-space: nowrap;
+        transition: left 0.3s ease;
+      }
+
+      .close-all-tag-con {
+        position: absolute;
+        right: 0px;
+        top: 0;
+        box-sizing: border-box;
+        padding-top: 8px;
+        text-align: center;
+        height: 100%;
+        background: white;
+        box-shadow: -3px 0 15px 3px rgba(0, 0, 0, 0.1);
+        z-index: 10;
+      }
+    }
+  }
+
+  &-header {
+    min-width: 740px;
+    height: 60px;
+    background: #fff;
+    box-shadow: 0 2px 1px 1px rgba(100, 100, 100, 0.1);
+    position: relative;
+    z-index: 11;
+
+    .navicon-con {
+      margin: 6px;
+      display: inline-block;
+    }
+
+    .header-middle-con {
+      position: absolute;
+      left: 0px;
+      top: 0;
+      // right: 340px;
+      bottom: 0;
+      padding: 10px;
+      // overflow: hidden;
+    }
+
+    .nav4 {
+      width: 300px !important;
+    }
+
+    .header-avator-con {
+      position: absolute;
+      right: 0;
+      top: 0;
+      height: 100%;
+      width: 300px;
+
+      .options {
+        .ivu-select-dropdown {
+          transform-origin: center top 0px;
+          position: absolute;
+          top: 45px !important;
+          left: -2px;
+          will-change: top, left;
+        }
+      }
+
+      .language {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+        vertical-align: middle;
+      }
+
+      .switch-theme-con {
+        display: inline-block;
+        width: 40px;
+        height: 100%;
+      }
+
+      .message-con {
+        display: inline-block;
+
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+
+      .change-skin {
+        font-size: 14px;
+        font-weight: 500;
+        padding-right: 5px;
+      }
+
+      .switch-theme {
+        height: 100%;
+      }
+      .dropList {
+        display: flex;
+        align-items: center;
+      }
+
+      .user-dropdown {
+        &-menu-con {
+          position: absolute;
+          right: 0;
+          top: 0;
+          height: 100%;
+          .main-user-name {
+            font-size: 14px;
+            display: inline-block;
+            cursor: pointer;
+            margin-right: 5px;
+
+            vertical-align: middle;
+            overflow: hidden;
+
+            text-align: right;
+          }
+        }
+
+        &-innercon {
+          height: 100%;
+          padding-right: 14px;
+        }
+      }
+
+      .full-screen-btn-con {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+
+      .lock-screen-btn-con {
+        display: inline-block;
+        width: 30px;
+        padding: 18px 0;
+        text-align: center;
+        cursor: pointer;
+
+        i {
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+
+  .single-page-con {
+    min-width: 740px;
+    left: 240px;
+    position: relative;
+    top: 100px;
+    right: 0;
+    bottom: 0;
+    height: calc(100% + 52px);
+    
+    width: calc(100% - 240px);
+    background-color: #f0f0f0;
+    z-index: 1;
+    transition: left 0.3s;
+
+    .single-page {
+      position: relative;
+      margin: 10px;
+    }
+  }
+
+  &-copy {
+    text-align: center;
+    padding: 10px 0 20px;
+    color: #9ea7b4;
+  }
+}
+
+.taglist-moving-animation-move {
+  transition: transform 0.3s;
+}
+
+.logo-con {
+  width: 100%;
+  height: 60px;
+  padding: 8px;
+  text-align: center;
+  border-bottom: 1px solid #eee;
+  img {
+    height: 44px;
+    width: auto;
+  }
+}
+
+.menu-bar {
+  overflow: auto;
+  overflow-x: hidden;
+}
+
+.menu-bar::-webkit-scrollbar {
+  // width: 6px;
+  // height: 6px;
+  display: none;
+}
+
+.menu-bar::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: #c3c3c3;
+}
+
+.menu-bar::-webkit-scrollbar-track {
+  background: #fff;
+}
+
+.nav-item {
+  font-size: 14px;
+}
+
+.main-nav-menu {
+  bottom: 10px;
+  position: relative;
+}
+
+.loading-position {
+  position: absolute;
+  right: 4px;
+  z-index: 100;
+  top: 1px;
+}
diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue
new file mode 100644
index 00000000..4c2b9689
--- /dev/null
+++ b/seller/src/views/member/memberComment.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="商品名称" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  clearable
+                  placeholder="请输入商品名"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="评价" prop="orderStatus">
+                <Select v-model="searchForm.grade" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="GOOD">好评</Option>
+                  <Option value="MODERATE">中评</Option>
+                  <Option value="WORSE">差评</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="评论日期">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="评价内容">
+          <span v-if="!content">暂无评价</span>
+          <span v-else>
+            <div>
+              <Input
+                v-model="content"
+                type="textarea"
+                maxlength="200"
+                disabled
+                :rows="4"
+                clearable
+                style="width:90%"
+              />
+            </div>
+          </span>
+        </FormItem>
+        <FormItem label="评价图片" style="padding-top: 10px" v-if="detailInfo.haveImage == 1">
+          <upload-pic-thumb
+            v-model="image"
+            :disable="true"
+            :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+        <FormItem label="回复内容" prop="reply">
+          <Input v-if="replyStatus == false"
+                 v-model="form.reply"
+                 type="textarea"
+                 maxlength="200"
+                 :rows="4"
+                 clearable
+                 style="width:90%"
+          />
+          <span v-else>
+            <Input
+              v-model="form.reply"
+              type="textarea"
+              maxlength="200"
+              disabled
+              :rows="4"
+              clearable
+              style="width:90%"
+            />
+          </span>
+        </FormItem>
+        <FormItem label="回复图片" prop="replyImage" style="padding-top: 18px"
+                  v-if="detailInfo.haveReplyImage == 1 || replyStatus == false">
+          <upload-pic-thumb v-if="replyStatus == false"
+                            v-model="form.replyImage"
+                            :limit="5"
+          ></upload-pic-thumb>
+          <upload-pic-thumb v-else
+                            v-model="form.replyImage"
+                            :disable="true"
+                            :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit">回复
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Member from "@/api/member";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+export default {
+  name: "memberComment",
+  components: {
+    uploadPicThumb
+  },
+  data() {
+    return {
+      detailInfo: [],
+      image: [],//评价图片
+      replyStatus: false,//回复状态
+      modalType: 0, // 添加或编辑标识
+      modalVisible: false, // 添加或编辑显示
+      modalTitle: "", // 添加或编辑标题
+      loading: true, // 表单加载状态
+      content: "",//评价内容
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        startDate: "", // 起始时间
+        endDate: "", // 终止时间
+      },
+      selectDate: null,
+      form: {
+        replyImage: [],
+        reply: ""
+      },
+      // 表单验证规则
+      formValidate: {
+        reply: [
+          {required: true, message: '请输入回复内容', trigger: 'blur'},
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      columns: [
+        // 表头
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 150,
+          tooltip: true
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 150,
+          tooltip: true
+        },
+        {
+          title: "评价内容",
+          key: "content",
+          minWidth: 300,
+          tooltip: true
+
+        },
+        {
+          title: "评价",
+          key: "grade",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.grade == "GOOD") {
+              return h("Badge", {props: {status: "success", text: "好评"}})
+            } else if (params.row.grade == "MODERATE") {
+              return h("Badge", {props: {status: "success", text: "中评"}})
+            } else if (params.row.grade == "WORSE") {
+              return h("Badge", {props: {status: "error", text: "差评"}})
+            }
+          }
+        },
+        {
+          title: "状态",
+          key: "status",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.status === "OPEN") {
+              return h("Badge", {props: {status: "success", text: "展示"}})
+            } else {
+              return h("Badge", {props: {status: "error", text: "隐藏"}})
+            }
+          },
+        },
+        {
+          title: "回复状态",
+          key: "replyStatus",
+          width: 110,
+          render: (h, params) => {
+            if (params.row.replyStatus) {
+              return h("Badge", {props: {status: "success", text: "已回复"}})
+            } else {
+              return h("Badge", {props: {status: "error", text: "未回复"}})
+            }
+          },
+        },
+
+        {
+          title: "创建日期",
+          key: "createTime",
+          width: 170,
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 120,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
+                  },
+                },
+                "详细"
+              ),
+            ]);
+          },
+        },
+
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      API_Member.getMemberReview(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //回复
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          API_Member.replyMemberReview(this.form.id, this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("回复成功");
+              this.getDataList();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+
+    detail(v) {
+      this.form.replyImage = []
+      this.loading = true;
+      API_Member.getMemberInfoReview(v.id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          //赋值
+          this.form.id = res.result.id
+          this.content = res.result.content
+          this.form.reply = res.result.reply
+          this.replyStatus = res.result.replyStatus
+          if (res.result.image) {
+            this.image = (res.result.image || "").split(",");
+          }
+          if (res.result.replyImage) {
+            this.form.replyImage = (res.result.replyImage || "").split(",");
+          }
+          this.detailInfo = res.result
+          //弹出框
+          this.modalVisible = true
+          this.modalTitle = "详细"
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/message/message.scss b/seller/src/views/message/message.scss
new file mode 100644
index 00000000..9f5122c7
--- /dev/null
+++ b/seller/src/views/message/message.scss
@@ -0,0 +1,164 @@
+.message-main-con{
+  min-height: calc(100vh - 120px);
+}
+.message {
+    &-main-con {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        right: 0px;
+        bottom: 0px;
+    }
+    &-mainlist-con {
+        position: absolute;
+        left: 0;
+        top: 10px;
+        width: 300px;
+        bottom: 0;
+        padding: 10px 0;
+        div {
+            padding: 10px;
+            margin: 0 20px;
+            border-bottom: 1px dashed #d2d3d2;
+            &:last-child {
+                border: none;
+            }
+            .mes-wrap {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+            .message-count-badge-outer {
+                margin-left: 5px;
+            }
+            .message-count-badge {
+                background: #d2d3d2;
+            }
+            .message-count-badge-red {
+                background: #ed3f14;
+            }
+            .mes-type-btn-text {
+                margin-left: 10px;
+            }
+        }
+    }
+    &-content-con {
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        bottom: 10px;
+        left: 300px;
+        background: white;
+        border-radius: 3px;
+        box-shadow: 2px 2px 10px 2px rgba(0, 0, 0, .1);
+        overflow: auto;
+        .message-title-list-con {
+            width: 100%;
+            height: 100%;
+        }
+        .message-content-top-bar {
+            height: 40px;
+            width: 100%;
+            background: white;
+            position: absolute;
+            left: 0;
+            top: 0;
+            border-bottom: 1px solid #dededb;
+            .mes-back-btn-con {
+                position: absolute;
+                width: 70px;
+                height: 30px;
+                left: 0;
+                top: 5px;
+            }
+            .mes-title {
+                position: absolute;
+                top: 0;
+                right: 70px;
+                bottom: 0;
+                left: 70px;
+                line-height: 40px;
+                padding: 0 30px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                text-align: center;
+            }
+        }
+        .mes-time-con {
+            position: absolute;
+            width: 100%;
+            top: 40px;
+            left: 0;
+            padding: 20px 0;
+            text-align: center;
+            font-size: 14px;
+            color: #b7b7b5;
+        }
+        .message-content-body {
+            position: absolute;
+            top: 90px;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            overflow: auto;
+            .message-content {
+                padding: 10px 20px;
+            }
+        }
+    }
+}
+
+.page-fix {
+    position: fixed;
+    right: 2vw;
+    bottom: 3vh;
+}
+
+.back-message-list-enter,
+    .back-message-list-leave-to {
+        opacity: 0;
+    }
+
+    .back-message-list-enter-active,
+    .back-message-list-leave-active {
+        transition: all .5s;
+    }
+
+    .back-message-list-enter-to,
+    .back-message-list-leave {
+        opacity: 1;
+    }
+
+    .view-message-enter,
+    .view-message-leave-to {
+        opacity: 0;
+    }
+
+    .view-message-enter-active,
+    .view-message-leave-active {
+        transition: all .5s;
+    }
+
+    .view-message-enter-to,
+    .view-message-leave {
+        opacity: 1;
+    }
+
+    .mes-current-type-btn-enter,
+    .mes-current-type-btn-leave-to {
+        opacity: 0;
+        width: 0;
+    }
+
+    .mes-current-type-btn-enter-active,
+    .mes-current-type-btn-leave-active {
+        transition: all .3s;
+    }
+
+    .mes-current-type-btn-enter-to,
+    .mes-current-type-btn-leave {
+        opacity: 1;
+        width: 12px;
+    }
+
diff --git a/seller/src/views/message/message.vue b/seller/src/views/message/message.vue
new file mode 100644
index 00000000..c8b0a4db
--- /dev/null
+++ b/seller/src/views/message/message.vue
@@ -0,0 +1,407 @@
+
+<template>
+  <div class="message-main-con">
+    <div class="message-mainlist-con">
+      <div>
+        <Button @click="setCurrentMesType('unread')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'unread'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">未读消息</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge-red"
+              :count="unReadCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+      <div>
+        <Button @click="setCurrentMesType('read')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'read'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">已读消息</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge"
+              :count="hasReadCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+      <div>
+        <Button @click="setCurrentMesType('recycleBin')" size="large" long type="text">
+          <div class="mes-wrap">
+            <transition name="mes-current-type-btn">
+              <Icon v-show="currentMessageType == 'recycleBin'" type="md-checkmark"></Icon>
+            </transition>
+            <span class="mes-type-btn-text">回收站</span>
+            <Badge
+              class="message-count-badge-outer"
+              class-name="message-count-badge"
+              :count="recycleBinCount"
+            ></Badge>
+          </div>
+        </Button>
+      </div>
+    </div>
+    <div class="message-content-con">
+      <transition name="view-message">
+        <div v-if="showMesTitleList" class="message-title-list-con">
+          <Table
+            ref="messageList"
+            :loading="loading"
+            :columns="mesTitleColumns"
+            :data="currentMesList"
+            :no-data-text="noDataText"
+          ></Table>
+          <Page
+            :current="params.pageNumber"
+            :total="total"
+            :page-size="params.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[5,10]"
+            size="small"
+            show-total
+            show-elevator
+            show-sizer
+            class="page-fix"
+          ></Page>
+        </div>
+      </transition>
+      <transition name="back-message-list">
+        <div v-if="!showMesTitleList" class="message-view-content-con">
+          <div class="message-content-top-bar">
+            <span class="mes-back-btn-con">
+              <Button type="text" @click="backMesTitleList">
+                <Icon type="ios-arrow-back"></Icon>&nbsp;&nbsp;返回
+              </Button>
+            </span>
+            <h3 class="mes-title">{{ mes.title }}</h3>
+          </div>
+          <p class="mes-time-con">
+            <Icon type="android-time"></Icon>
+            &nbsp;&nbsp;{{ mes.time }}
+          </p>
+          <div class="message-content-body">
+            <p class="message-content" v-html="mes.content">{{ mes.content }}</p>
+          </div>
+        </div>
+      </transition>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Cookies from "js-cookie";
+  import * as API_Index from "@/api/index";
+
+  export default {
+    name: "message_index",
+    data() {
+      const markAsReadBtn = (h, params) => {
+        return h(
+          "Button",
+          {
+            props: {
+              icon: "md-eye-off",
+              size: "small"
+            },
+            on: {
+              click: () => {
+                // 标记已读
+                let v = params.row;
+                this.loading = true;
+                API_Index.read(v.id).then(res => {
+                  this.loading = false;
+                  if (res.success) {
+                    this.$Message.success("操作成功");
+                    this.currentMessageType = "unread"
+                    this.getAll();
+                  }
+                });
+              }
+            }
+          },
+          "标为已读"
+        );
+      };
+      const deleteMesBtn = (h, params) => {
+        return h(
+          "Button",
+          {
+            props: {
+              icon: "md-trash",
+              size: "small",
+              type: "error"
+            },
+            on: {
+              click: () => {
+                // 移除
+                let v = params.row;
+                this.loading = true;
+                API_Index.deleteMessage(v.id).then(res => {
+                  this.loading = false;
+                  if (res.success) {
+                    this.$Message.success("删除成功");
+                    this.currentMessageType = "read"
+                    this.getAll();
+                  }
+                });
+              }
+            }
+          },
+          "删除"
+        );
+      };
+      const restoreBtn = (h, params) => {
+        return h(
+          "Button",
+          {
+            props: {
+              icon: "md-redo",
+              size: "small"
+            },
+            style: {
+              margin: "0 5px 0 0"
+            },
+            on: {
+              click: () => {
+                // 还原
+                let v = params.row;
+                API_Index.reductionMessage(v.id).then(res => {
+                  this.loading = false;
+                  if (res.success) {
+                    this.setCurrentMesType("read");
+                    this.recycleBinCount -= 1
+                    this.hasReadCount +=1
+                  }
+                });
+              }
+            }
+          },
+          "还原"
+        );
+      };
+      const deleteRealBtn = (h, params) => {
+        return h(
+          "Button",
+          {
+            props: {
+              icon: "md-trash",
+              size: "small",
+              type: "error"
+            },
+            on: {
+              click: () => {
+                // 彻底删除
+                let v = params.row;
+                this.loading = true;
+                API_Index.clearMessage(v.id).then(res => {
+                  this.loading = false;
+                  if (res.success) {
+                    this.$Message.success("删除成功");
+                    this.currentMessageType = "recycleBin"
+                    this.getAll();
+                  }
+                });
+              }
+            }
+          },
+          "彻底删除"
+        );
+      };
+      return {
+        loading: true, // 列表加载的loading
+        params: { // 请求消息列表参数
+          status: "UN_READY",
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc" // 默认排序方式
+        },
+        total: 0, // 消息列表总数
+        totalUnread: 0, // 未读总数
+        totalRead: 0, // 已读总数
+        totalRemove: 0, // 回收站消息数
+        currentMesList: [], // 当前状态消息
+        unreadMesList: [], // 未读消息
+        hasReadMesList: [], // 已读消息
+        recyclebinList: [], // 回收站消息
+        currentMessageType: "unread", // 当前列表消息状态
+        showMesTitleList: true, // 是否展示消息状态列表
+        unReadCount: 0, // 未读消息数量
+        hasReadCount: 0, // 已读消息数量
+        recycleBinCount: 0, // 回收站消息数量
+        noDataText: "暂无未读消息",
+        mes: { // 展示消息详情
+          title: "",
+          time: "",
+          content: ""
+        },
+        mesTitleColumns: [ // 表格表头
+
+          {
+            title: " ",
+            key: "title",
+            align: "left",
+            ellipsis: true,
+            render: (h, params) => {
+              return h("span", [
+                h(
+                  "a",
+                  {
+                    style: {
+                      margin: "0 30px 0 0"
+                    },
+                    on: {
+                      click: () => {
+                        this.showMesTitleList = false;
+                        this.mes.title = params.row.title;
+                        this.mes.time = params.row.createTime;
+                        this.getContent(params.row);
+                      }
+                    }
+                  },
+                  params.row.title
+                )
+              ]);
+            }
+          },
+          {
+            title: " ",
+            key: "time",
+            align: "center",
+            width: 190,
+            render: (h, params) => {
+              return h("span", [
+                h("Icon", {
+                  props: {
+                    type: "md-time",
+                    size: 16
+                  },
+                  style: {
+                    margin: "0 5px 3px 0"
+                  }
+                }),
+                h("span", params.row.createTime)
+              ]);
+            }
+          },
+          {
+            title: " ",
+            key: "asread",
+            align: "center",
+            width: 210,
+            render: (h, params) => {
+              if (this.currentMessageType == "unread") {
+                return h("div", [markAsReadBtn(h, params)]);
+              } else if (this.currentMessageType == "read") {
+                return h("div", [deleteMesBtn(h, params)]);
+              } else {
+                return h("div", [
+                  restoreBtn(h, params),
+                  deleteRealBtn(h, params)
+                ]);
+              }
+            }
+          }
+        ]
+      };
+    },
+    methods: {
+      changePage(v) {
+        this.params.pageNumber = v;
+        this.refreshMessage();
+      },
+      changePageSize(v) {
+        this.params.pageSize = v;
+        this.refreshMessage();
+      },
+      refreshMessage() {
+        let status = "UN_READY";
+        let type = this.currentMessageType;
+        if (type == "unread") {
+          status = "UN_READY";
+        } else if (type == "read") {
+          status = "ALREADY_READY";
+        } else {
+          status = "ALREADY_REMOVE";
+        }
+        this.params.status = status;
+        this.loading = true;
+        API_Index.getMessageSendData(this.params).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.currentMesList = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+      },
+
+
+      //获取全部数据
+      getAll() {
+        API_Index.getAllMessage(this.params).then(res => {
+          this.loading = false;
+          if (res.success) {
+            //未读消息
+            this.unReadCount = res.result.UN_READY.total;
+            this.currentMesList = res.result.UN_READY.records;
+            //已读消息
+            this.hasReadCount = res.result.ALREADY_READY.total;
+            //回收站
+            this.recycleBinCount = res.result.ALREADY_REMOVE.total;
+          }
+        });
+      },
+      deleteMessage(id) {
+        API_Index.deleteMessage(id).then(res => {
+          if (res.success) {
+            this.$Message.success("删除成功");
+          }
+        });
+      },
+      backMesTitleList() {
+        this.showMesTitleList = true;
+      },
+      setCurrentMesType(type) {
+        if (this.currentMessageType !== type) {
+          this.showMesTitleList = true;
+        }
+        this.currentMessageType = type;
+        if (type == "unread") {
+          this.noDataText = "暂无未读消息";
+        } else if (type == "read") {
+          this.noDataText = "暂无已读消息";
+        } else {
+          this.noDataText = "回收站无消息";
+        }
+        this.params.pageNumber = 1;
+        this.refreshMessage();
+      },
+      getContent(v) {
+        this.mes.content = v.content;
+      }
+    },
+    mounted() {
+      this.getAll();
+    },
+    watch: {
+      // 监听路由变化通过id获取数据
+      $route(to, from) {
+        if (to.name == "message_index") {
+          this.getAll();
+        }
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped>
+@import "./message.scss";
+</style>
+
diff --git a/seller/src/views/my-components/lili/circle-loading.vue b/seller/src/views/my-components/lili/circle-loading.vue
new file mode 100644
index 00000000..594ef07a
--- /dev/null
+++ b/seller/src/views/my-components/lili/circle-loading.vue
@@ -0,0 +1,18 @@
+<template>
+  <div style="display: inline-block;">
+    <Icon type="ios-loading" size="18" color="#2d8cf0" class="spin-icon-load"></Icon>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "circleLoading"
+};
+</script>
+
+<style lang="scss" scoped>
+.spin-icon-load {
+  animation: ani-demo-spin 1s linear infinite;
+}
+</style>
+
diff --git a/seller/src/views/my-components/lili/editor.vue b/seller/src/views/my-components/lili/editor.vue
new file mode 100644
index 00000000..97c7b855
--- /dev/null
+++ b/seller/src/views/my-components/lili/editor.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+    <div style="position: relative">
+      <div :id="id" style="text-align: left; min-width: 1080px"></div>
+      <div v-if="showExpand">
+        <div class="e-menu e-code" @click="editHTML">
+          <Icon type="md-code-working" size="22" />
+        </div>
+        <div class="e-menu e-preview" @click="fullscreenModal = true">
+          <Icon type="ios-eye" size="24" />
+        </div>
+        <div class="e-menu e-trash" @click="clear">
+          <Icon type="md-trash" size="18" />
+        </div>
+      </div>
+    </div>
+
+    <Modal
+      title="编辑html代码"
+      v-model="showHTMLModal"
+      :mask-closable="false"
+      :width="900"
+      :fullscreen="full"
+    >
+      <Input
+        v-if="!full"
+        v-model="dataEdit"
+        :rows="15"
+        type="textarea"
+        style="max-height: 60vh; overflow: auto"
+      />
+      <Input v-if="full" v-model="dataEdit" :rows="32" type="textarea" />
+      <div slot="footer">
+        <Button @click="full = !full" icon="md-expand">全屏开/关</Button>
+        <Button
+          @click="editHTMLOk"
+          type="primary"
+          icon="md-checkmark-circle-outline"
+          >确定保存</Button
+        >
+      </div>
+    </Modal>
+    <Modal title="预览" v-model="fullscreenModal" fullscreen>
+      <div v-html="data">{{ data }}</div>
+      <div slot="footer">
+        <Button @click="fullscreenModal = false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import E from "wangeditor";
+import xss from "xss";
+// 表情包配置 自定义表情可在该js文件中统一修改
+import { sina } from "@/libs/emoji";
+export default {
+  name: "editor",
+  props: {
+    id: {
+      type: String,
+      default: "editor",
+    },
+    value: String,
+    base64: {
+      type: Boolean,
+      default: false,
+    },
+    showExpand: {
+      type: Boolean,
+      default: true,
+    },
+    openXss: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      editor: null, // 初始化富文本编辑器
+      data: this.value, // 富文本数据
+      dataEdit: "", // 编辑数据
+      showHTMLModal: false, // 显示html
+      full: false, // html全屏开关
+      fullscreenModal: false, // 显示全屏预览
+    };
+  },
+  methods: {
+    initEditor() {
+      let that = this;
+      this.editor = new E(`#${this.id}`);
+
+      // 编辑内容绑定数据
+      this.editor.config.onchange = (html) => {
+        if (this.openXss) {
+          this.data = xss(html);
+        } else {
+          this.data = html;
+        }
+        this.$emit("input", this.data);
+        this.$emit("on-change", this.data);
+      };
+      this.editor.config.showFullScreen = false;
+      // z-index
+      this.editor.config.zIndex = 100;
+      if (this.base64) {
+        // 使用 base64 保存图片
+        this.editor.config.uploadImgShowBase64 = true;
+      } else {
+        // 配置上传图片服务器端地址
+        this.editor.config.uploadImgServer = uploadFile;
+        // lili如要header中传入token鉴权
+        this.editor.config.uploadImgHeaders = {
+          accessToken: that.getStore("accessToken"),
+        };
+        this.editor.config.uploadFileName = "file";
+        this.editor.config.uploadImgHooks = {
+          before: function (xhr, editor, files) {
+            // 图片上传之前触发
+          },
+          success: function (xhr, editor, result) {
+            // 图片上传并返回结果，图片插入成功之后触发
+          },
+          fail: function (xhr, editor, result) {
+            // 图片上传并返回结果，但图片插入错误时触发
+            that.$Message.error("上传图片失败");
+          },
+          error: function (xhr, editor) {
+            // 图片上传出错时触发
+            that.$Message.error("上传图片出错");
+          },
+          timeout: function (xhr, editor) {
+            // 图片上传超时时触发
+            that.$Message.error("上传图片超时");
+          },
+          // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
+          customInsert: function (insertImg, result, editor) {
+            if (result.success == true) {
+              let url = result.result;
+              insertImg(url);
+              that.$Message.success("上传图片成功");
+            } else {
+              that.$Message.error(result.message);
+            }
+          },
+        };
+      }
+      this.editor.config.customAlert = function (info) {
+        // info 是需要提示的内容
+        // that.$Message.info(info);
+      };
+      // 字体
+      this.editor.config.fontNames = ["微软雅黑", "宋体", "黑体", "Arial"];
+      // 表情面板可以有多个 tab ，因此要配置成一个数组。数组每个元素代表一个 tab 的配置
+      this.editor.config.emotions = [
+        {
+          // tab 的标题
+          title: "新浪",
+          // type -> 'emoji' / 'image'
+          type: "image",
+          // content -> 数组
+          content: sina,
+        },
+      ];
+      if (this.value) {
+        if (this.openXss) {
+          this.editor.txt.html(xss(this.value));
+        } else {
+          this.editor.txt.html(this.value);
+        }
+      }
+      this.editor.create();
+    },
+    editHTML() {
+      this.dataEdit = this.data;
+      this.showHTMLModal = true;
+    },
+    editHTMLOk() {
+      this.editor.txt.html(this.dataEdit);
+      this.$emit("input", this.data);
+      this.$emit("on-change", this.data);
+      this.showHTMLModal = false;
+    },
+    clear() {
+      this.$Modal.confirm({
+        title: "确认清空",
+        content: "确认要清空编辑器内容？清空后不能撤回",
+        onOk: () => {
+          this.data = "";
+          this.editor.txt.html(this.data);
+          this.$emit("input", this.data);
+          this.$emit("on-change", this.data);
+        },
+      });
+    },
+    setData(value) {
+      if (!this.editor) {
+        this.initEditor();
+      }
+      if (value && value != this.data) {
+        this.data = value;
+        this.editor.txt.html(this.data);
+        this.$emit("input", this.data);
+        this.$emit("on-change", this.data);
+      }
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler: function (val) {
+
+        this.setData(val);
+      }
+    },
+  },
+  mounted() {
+    this.initEditor();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.e-menu {
+  z-index: 101;
+  position: absolute;
+  cursor: pointer;
+  color: #999;
+  :hover {
+    color: #333;
+  }
+}
+.e-code {
+  top: 6px;
+  left: 976px;
+}
+.e-preview {
+  top: 6px;
+  left: 1014px;
+}
+.e-trash {
+  top: 4px;
+  left: 1047px;
+}
+</style>
+
diff --git a/seller/src/views/my-components/lili/set-password.vue b/seller/src/views/my-components/lili/set-password.vue
new file mode 100644
index 00000000..a5ce7688
--- /dev/null
+++ b/seller/src/views/my-components/lili/set-password.vue
@@ -0,0 +1,166 @@
+<template>
+  <div class="set-password">
+    <Poptip transfer trigger="focus" placement="right" width="250">
+      <Input
+        type="password"
+        password
+        style="width:350px;"
+        :maxlength="maxlength"
+        v-model="currentValue"
+        @on-change="handleChange"
+        :size="size"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+      />
+      <div :class="tipStyle" slot="content">
+        <div class="words">强度 : {{strength}}</div>
+        <Progress
+          :percent="strengthValue"
+          :status="progressStatus"
+          hide-info
+          style="margin: 13px 0;"
+        />
+        <br />请至少输入 6 个字符。请不要使
+        <br />用容易被猜到的密码。
+      </div>
+    </Poptip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "setPassword",
+  props: {
+    value: String,
+    size: String,
+    placeholder: {
+      type: String,
+      default: "请输入密码，长度为6-20个字符"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: Number,
+      default: 20
+    }
+  },
+  data() {
+    return {
+      currentValue: this.value, // 当前密码
+      tipStyle: "password-tip-none", // 提示样式
+      strengthValue: 0, // 密码强度
+      progressStatus: "normal", // 进度条状态
+      strength: "无", // 密码长度
+      grade: 0 // 强度等级
+    };
+  },
+  methods: {
+    checkStrengthValue(v) {
+      // 评级制判断密码强度 最高5
+      let grade = 0;
+      if (/\d/.test(v)) {
+        grade++; //数字
+      }
+      if (/[a-z]/.test(v)) {
+        grade++; //小写
+      }
+      if (/[A-Z]/.test(v)) {
+        grade++; //大写
+      }
+      if (/\W/.test(v)) {
+        grade++; //特殊字符
+      }
+      if (v.length >= 10) {
+        grade++;
+      }
+      this.grade = grade;
+      return grade;
+    },
+    strengthChange() {
+      if (!this.currentValue) {
+        this.tipStyle = "password-tip-none";
+        this.strength = "无";
+        this.strengthValue = 0;
+        return;
+      }
+      let grade = this.checkStrengthValue(this.currentValue);
+      if (grade <= 1) {
+        this.progressStatus = "wrong";
+        this.tipStyle = "password-tip-weak";
+        this.strength = "弱";
+        this.strengthValue = 33;
+      } else if (grade >= 2 && grade <= 4) {
+        this.progressStatus = "normal";
+        this.tipStyle = "password-tip-middle";
+        this.strength = "中";
+        this.strengthValue = 66;
+      } else {
+        this.progressStatus = "success";
+        this.tipStyle = "password-tip-strong";
+        this.strength = "强";
+        this.strengthValue = 100;
+      }
+    },
+    handleChange(v) {
+      this.strengthChange();
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue, this.grade, this.strength);
+    },
+    setCurrentValue(value) {
+      if (value === this.currentValue) {
+        return;
+      }
+      this.currentValue = value;
+      this.strengthChange();
+      this.$emit("on-change", this.currentValue, this.grade, this.strength);
+    }
+  },
+  watch: {
+    value(val) {
+      this.setCurrentValue(val);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.set-password .ivu-poptip,
+.set-password .ivu-poptip-rel {
+  display: block;
+}
+.password-tip-none {
+  padding: 1vh 0;
+}
+
+.password-tip-weak {
+  padding: 1vh 0;
+
+  .words {
+    color: #ed3f14;
+  }
+}
+
+.password-tip-middle {
+  padding: 1vh 0;
+
+  .words {
+    color: #2d8cf0;
+  }
+}
+
+.password-tip-strong {
+  padding: 1vh 0;
+
+  .words {
+    color: #52c41a;
+  }
+}
+</style>
+
diff --git a/seller/src/views/my-components/lili/upload-pic-input.vue b/seller/src/views/my-components/lili/upload-pic-input.vue
new file mode 100644
index 00000000..0b156b3d
--- /dev/null
+++ b/seller/src/views/my-components/lili/upload-pic-input.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <div style="display:flex;">
+      <Input
+        v-model="currentValue"
+        @on-change="handleChange"
+        v-show="showInput"
+        :placeholder="placeholder"
+        :size="size"
+        :disabled="disabled"
+        :readonly="readonly"
+        :maxlength="maxlength"
+      >
+        <Button slot="append" icon="md-eye"></Button>
+      </Input>
+      <Poptip transfer trigger="hover" title="图片预览" placement="right" width="350">
+        <Icon type="md-eye" class="see-icon" />
+        <div slot="content">
+          <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+          <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
+        </div>
+      </Poptip>
+      <Upload
+        :action="uploadFileUrl"
+        :headers="accessToken"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :format="['jpg','jpeg','png','gif','bmp']"
+        accept=".jpg, .jpeg, .png, .gif, .bmp"
+        :max-size="maxSize*1024"
+        :on-format-error="handleFormatError"
+        :on-exceeded-size="handleMaxSize"
+        :before-upload="beforeUpload"
+        :show-upload-list="false"
+        ref="up"
+        class="upload"
+      >
+        <Button :loading="loading" :size="size" :disabled="disabled" :icon="icon">上传图片</Button>
+      </Upload>
+    </div>
+
+    <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
+      <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+      <div slot="footer">
+        <Button @click="viewImage=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+export default {
+  name: "uploadPicInput",
+  props: {
+    value: String,
+    size: String,
+    placeholder: {
+      type: String,
+      default: "图片链接"
+    },
+    showInput: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxSize: {
+      type: Number,
+      default: 5
+    },
+    maxlength: Number,
+    icon: {
+      type: String,
+      default: "ios-cloud-upload-outline"
+    }
+  },
+  data() {
+    return {
+      accessToken: {}, // 验证token
+      currentValue: this.value, // 当前值
+      loading: false, // 加载状态
+      viewImage: false, // 是否预览图片
+      uploadFileUrl: uploadFile // 上传列表
+    };
+  },
+  methods: {
+    init() {
+      this.accessToken = {
+        accessToken: this.getStore("accessToken")
+      };
+    },
+    handleFormatError(file) {
+      this.loading = false;
+      this.$Notice.warning({
+        title: "不支持的文件格式",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
+      });
+    },
+    handleMaxSize(file) {
+      this.loading = false;
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
+      });
+    },
+    beforeUpload() {
+      this.loading = true;
+      return true;
+    },
+    handleSuccess(res, file) {
+      this.loading = false;
+      if (res.success) {
+        this.currentValue = res.result;
+        this.$emit("input", this.currentValue);
+        this.$emit("on-change", this.currentValue);
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.loading = false;
+      this.$Message.error(error.toString());
+    },
+    handleChange(v) {
+      this.$emit("input", this.currentValue);
+      this.$emit("on-change", this.currentValue);
+      this.$attrs.rollback && this.$attrs.rollback()
+    },
+    setCurrentValue(value) {
+      if (value === this.currentValue) {
+        return;
+      }
+      this.currentValue = value;
+      this.$emit("on-change", this.currentValue);
+    }
+  },
+  watch: {
+    value(val) {
+      this.setCurrentValue(val);
+    }
+  },
+  created() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.see-icon {
+  font-size: 16px;
+  margin-left: -32px;
+  margin-top: 3px;
+  padding: 7px;
+  cursor: pointer;
+}
+
+.upload {
+  display: inline-block;
+  margin-left: 10px;
+}
+</style>
+
diff --git a/seller/src/views/my-components/lili/upload-pic-thumb.vue b/seller/src/views/my-components/lili/upload-pic-thumb.vue
new file mode 100644
index 00000000..88979b74
--- /dev/null
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@@ -0,0 +1,296 @@
+<template>
+  <div>
+    <vuedraggable
+      :list="uploadList"
+      :disabled="!draggable||!multiple"
+      :animation="200"
+      class="list-group"
+      ghost-class="thumb-ghost"
+      @end="onEnd"
+    >
+      <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
+        <div v-if="item.status == 'finished'">
+          <img :src="item.url" />
+          <div class="upload-list-cover">
+            <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
+            <Icon v-if="remove" type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+          </div>
+        </div>
+        <div v-else>
+          <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+        </div>
+      </div>
+    </vuedraggable>
+    <Upload
+      :disabled="disable"
+      ref="upload"
+      :multiple="multiple"
+      :show-upload-list="false"
+      :on-success="handleSuccess"
+      :on-error="handleError"
+      :format="['jpg','jpeg','png','gif']"
+      :max-size="maxSize*1024"
+      :on-format-error="handleFormatError"
+      :on-exceeded-size="handleMaxSize"
+      :before-upload="handleBeforeUpload"
+      type="drag"
+      :action="uploadFileUrl"
+      :headers="accessToken"
+      style="display: inline-block;width:58px;"
+    >
+      <div style="width: 58px;height:58px;line-height: 58px;">
+        <Icon type="md-camera" size="20"></Icon>
+      </div>
+    </Upload>
+
+    <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
+      <img :src="imgUrl" alt="无效的图片链接" style="width: 100%;margin: 0 auto;display: block;" />
+      <div slot="footer">
+        <Button @click="viewImage=false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from "@/api/index";
+import vuedraggable from "vuedraggable";
+export default {
+  name: "uploadPicThumb",
+  components: {
+    vuedraggable
+  },
+  props: {
+    value: {
+      type: Object
+    },
+    draggable: {
+      type: Boolean,
+      default: true
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    maxSize: {
+      type: Number,
+      default: 5
+    },
+    disable:{
+      type: Boolean,
+      default: false
+    },
+    remove:{
+      type: Boolean,
+      default: true
+    },
+    limit: {
+      type: Number,
+      default: 10
+    }
+  },
+  data() {
+    return {
+      accessToken: {}, // 验证token
+      uploadFileUrl: uploadFile, // 上传文件
+      uploadList: [], // 上传文件列表
+      viewImage: false, // 是否预览图片
+      imgUrl: "" // 图片地址
+    };
+  },
+  methods: {
+    onEnd() {
+      this.returnValue();
+    },
+    init() {
+      this.setData(this.value, true);
+      this.accessToken = {
+        accessToken: this.getStore("accessToken")
+      };
+    },
+    handleView(imgUrl) {
+      this.imgUrl = imgUrl;
+      this.viewImage = true;
+    },
+    handleRemove(file) {
+      const uploadList = this.uploadList;
+      this.uploadList.splice(uploadList.indexOf(file), 1);
+      this.returnValue();
+    },
+    handleSuccess(res, file) {
+      if (res.success) {
+        file.url = res.result;
+        // 单张图片处理
+        if (!this.multiple && this.uploadList.length > 0) {
+          // 删除第一张
+          this.uploadList.splice(0, 1);
+        }
+        this.uploadList.push(file);
+        // 返回组件值
+        this.returnValue();
+      } else {
+        this.$Message.error(res.message);
+      }
+    },
+    handleError(error, file, fileList) {
+      this.$Message.error(error.toString());
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "不支持的文件格式",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’格式不正确, 请选择 .jpg .jpeg .png .gif图片格式文件"
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "文件大小过大",
+        desc:
+          "所选文件‘ " +
+          file.name +
+          " ’大小过大, 不得超过 " +
+          this.maxSize +
+          "M."
+      });
+    },
+    handleBeforeUpload() {
+      if (this.multiple && this.uploadList.length >= this.limit) {
+        this.$Message.warning("最多只能上传" + this.limit + "张图片");
+        return false;
+      }
+      return true;
+    },
+    returnValue() {
+      if (!this.uploadList || this.uploadList.length < 1) {
+        if (!this.multiple) {
+          this.$emit("input", "");
+          this.$emit("on-change", "");
+        } else {
+          this.$emit("input", []);
+          this.$emit("on-change", []);
+        }
+        return;
+      }
+      if (!this.multiple) {
+        // 单张
+        let v = this.uploadList[0].url;
+        this.$emit("input", v);
+        this.$emit("on-change", v);
+      } else {
+        let v = [];
+        this.uploadList.forEach(e => {
+          v.push(e.url);
+        });
+        this.$emit("input", v);
+        this.$emit("on-change", v);
+      }
+    },
+    setData(v, init) {
+      if (typeof v == "string") {
+        // 单张
+        if (this.multiple) {
+          this.$Message.warning("多张上传仅支持数组数据类型");
+          return;
+        }
+        if (!v) {
+          return;
+        }
+        this.uploadList = [];
+        let item = {
+          url: v,
+          status: "finished"
+        };
+        this.uploadList.push(item);
+        this.$emit("on-change", v);
+      } else if (typeof v == "object") {
+        // 多张
+        if (!this.multiple) {
+          this.$Message.warning("单张上传仅支持字符串数据类型");
+          return;
+        }
+        this.uploadList = [];
+        if (v.length > this.limit) {
+          for (let i = 0; i < this.limit; i++) {
+            let item = {
+              url: v[i],
+              status: "finished"
+            };
+            this.uploadList.push(item);
+          }
+          this.$emit("on-change", v.slice(0, this.limit));
+          if (init) {
+            this.$emit("input", v.slice(0, this.limit));
+          }
+          this.$Message.warning("最多只能上传" + this.limit + "张图片");
+        } else {
+          v.forEach(e => {
+            let item = {
+              url: e,
+              status: "finished"
+            };
+            this.uploadList.push(item);
+          });
+          this.$emit("on-change", v);
+        }
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.setData(val);
+    }
+  },
+  mounted() {
+    this.init();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 5px;
+}
+.upload-list img {
+  width: 100%;
+  height: 100%;
+}
+.upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.upload-list:hover .upload-list-cover {
+  display: block;
+}
+.upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+.list-group {
+  display: inline-block;
+}
+.thumb-ghost {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
+</style>
+
diff --git a/seller/src/views/my-components/map/index.vue b/seller/src/views/my-components/map/index.vue
new file mode 100644
index 00000000..5d8a5a2e
--- /dev/null
+++ b/seller/src/views/my-components/map/index.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="map">
+    <Modal
+        v-model="showMap"
+        title="选择地址"
+        width="800"
+        >
+        <div class="address">{{addrContent.address}}</div>
+        <div id="map-container"></div>
+
+        <div class="search-con">
+            <Input placeholder="输入关键字搜索" id="input-map" v-model="mapSearch"/>
+            <ul>
+                <li v-for="(tip, index) in tips" :key="index" @click="selectAddr(tip.location)">
+                    <p>{{tip.name}}</p>
+                    <p>{{tip.district + tip.address}}</p>
+                </li>
+            </ul>
+        </div>
+        <div slot="footer">
+            <Button type="default" @click="showMap = false">取消</Button>
+            <Button type="primary" :loading="loading" @click="ok">确定</Button>
+        </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import AMapLoader from '@amap/amap-jsapi-loader';
+import {getRegion} from '@/api/common.js'
+export default {
+name:'map',
+data() {
+    return {
+        showMap:false, // 地图显隐
+        mapSearch:'', // 地图搜索
+        map:null, // 初始化地图
+        autoComplete:null, // 初始化搜索方法
+        geocoder:null, // 初始化地理、坐标转化
+        positionPicker:null, // 地图拖拽选点
+        tips:[], //搜索关键字列表
+        addrContent:{}, // 回显地址信息
+        loading:false, // 加载状态
+    };
+},
+watch:{
+    mapSearch:function(val){
+        this.searchOfMap(val)
+    }
+},
+methods: {
+    ok(){ // 确定选择
+
+         this.loading = true
+
+         const codeObj = {}
+         const params = {
+             cityCode: this.addrContent.regeocode.addressComponent.citycode,
+             townName: this.addrContent.regeocode.addressComponent.township
+         }
+      getRegion(params).then(res=>{
+             if(res.code == 200) {
+                  this.addrContent.addr = res.result.name.replace(/,/g," ")
+                  this.addrContent.addrId = res.result.id
+                  this.loading = false
+                  this.showMap = false;
+                  this.$emit('getAddress',this.addrContent);
+
+             }
+         })
+
+    },
+    init() {
+        AMapLoader.load({
+            key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
+            version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+            plugins: [
+            "AMap.ToolBar",
+            "AMap.Autocomplete",
+            "AMap.PlaceSearch",
+            "AMap.Geolocation",
+            'AMap.Geocoder'
+            ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+            "AMapUI": {             // 是否加载 AMapUI，缺省不加载
+                "version": '1.1',   // AMapUI 缺省 1.1
+                "plugins":['misc/PositionPicker'],       // 需要加载的 AMapUI ui插件
+            },
+        })
+        .then((AMap) => {
+            let that = this;
+            this.map = new AMap.Map("map-container",{
+                zoom:12
+            });
+            that.map.addControl(new AMap.ToolBar());
+            that.map.addControl(new AMap.Autocomplete());
+            that.map.addControl(new AMap.PlaceSearch());
+            that.map.addControl(new AMap.Geocoder());
+
+            // 实例化Autocomplete
+            let autoOptions = {
+                city: "全国"
+            };
+            that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
+            that.geocoder = new AMap.Geocoder(autoOptions)
+
+
+            that.positionPicker = new AMapUI.PositionPicker({ // 拖拽选点
+                mode: 'dragMap',
+                map:that.map
+            });
+            that.positionPicker.start()
+            /**
+             *
+             * 所有回显数据，都在positionResult里面
+             * 需要字段可以查找
+             *
+             */
+            that.positionPicker.on('success', function(positionResult) {
+                that.addrContent = positionResult;
+            });
+
+        })
+        .catch((e) => {});
+    },
+    searchOfMap(val) { // 地图搜索
+        let that = this;
+        this.autoComplete.search(val, function (status, result) {
+            // 搜索成功时，result即是对应的匹配数据
+            if(status == 'complete' && result.info == 'OK'){
+                that.tips = result.tips;
+            }else {
+                that.tips = []
+            }
+        });
+    },
+    selectAddr(location) { // 选择坐标
+        if(!location){
+            this.$Message.warning('请选择正确点位')
+            return false;
+        }
+        const lnglat = [location.lng,location.lat]
+        this.positionPicker.start(lnglat)
+    }
+},
+mounted() {
+    this.init()
+},
+};
+</script>
+<style lang="scss" scoped>
+    #map-container{
+        width: 500px;
+        height: 400px;
+    }
+
+    .search-con{
+        position: absolute;
+        right: 20px;
+        top: 64px;
+        width: 260px;
+        ul{
+            width: 260px;
+            height: 400px;
+            overflow: scroll;
+            li{
+                padding: 5px;
+                p:nth-child(2){
+                    color: #999;
+                    font-size: 12px;
+                }
+                &:hover{
+                    background-color:#eee;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
+    .address{
+        margin-bottom: 10px;
+        // color: $theme_color;
+        font-weight: bold;
+    }
+</style>
diff --git a/seller/src/views/my-components/tree-table/Checkbox/Checkbox.less b/seller/src/views/my-components/tree-table/Checkbox/Checkbox.less
new file mode 100644
index 00000000..ff144fe4
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Checkbox/Checkbox.less
@@ -0,0 +1,117 @@
+// text
+@prefixCls: zk-checkbox;
+// color
+@border: #dddee1;
+@hoverBorder: #bcbcbc;
+@blue: #2d8cf0;
+
+.@{prefixCls}-wrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.@{prefixCls} {
+  display: inline-block;
+  position: relative;
+  line-height: 1;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  outline: none;
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @hoverBorder;
+    }
+  }
+}
+
+.@{prefixCls}__inner {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  position: relative;
+  top: 0;
+  left: 0;
+  border: 1px solid @border;
+  border-radius: 2px;
+  background-color: #ffffff;
+  transition: border-color .2s ease-in-out,background-color .2s ease-in-out;
+  &::after {
+    content: "";
+    display: table;
+    width: 4px;
+    height: 8px;
+    position: absolute;
+    top: 1px;
+    left: 4px;
+    border: 2px solid #fff;
+    border-top: 0;
+    border-left: 0;
+    transform: rotate(45deg) scale(0);
+    transition: all .2s ease-in-out;
+  }
+}
+
+.@{prefixCls}--indeterminate {
+  .@{prefixCls}__inner {
+    background-color: @blue;
+    border-color: @blue;
+    &::after {
+      content: "";
+      width: 8px;
+      height: 1px;
+      transform: scale(1);
+      position: absolute;
+      left: 2px;
+      top: 5px;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @blue;
+    }
+  }
+}
+
+.@{prefixCls}--checked {
+  .@{prefixCls}__inner {
+    border-color: @blue;
+    background-color: @blue;
+    &::after {
+      content: "";
+      display: table;
+      width: 4px;
+      height: 8px;
+      position: absolute;
+      top: 1px;
+      left: 4px;
+      border: 2px solid #ffffff;
+      border-top: 0;
+      border-left: 0;
+      transform: rotate(45deg) scale(1);
+      transition: all .2s ease-in-out;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @blue;
+    }
+  }
+}
+
+.@{prefixCls}--disabled {
+  cursor: not-allowed;
+  .@{prefixCls}__inner {
+    background-color: #f3f3f3;
+    border-color: @border;
+    &::after {
+      animation-name: none;
+      border-color: #ccc;
+    }
+  }
+  &:hover {
+    .@{prefixCls}__inner {
+      border-color: @border;
+    }
+  }
+}
diff --git a/seller/src/views/my-components/tree-table/Checkbox/Checkbox.vue b/seller/src/views/my-components/tree-table/Checkbox/Checkbox.vue
new file mode 100644
index 00000000..df87b2f1
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Checkbox/Checkbox.vue
@@ -0,0 +1,58 @@
+<template lang="html">
+  <label :class="`${prefixCls}-wrapper`">
+    <span :class="checkboxClass">
+      <span
+        :class="`${prefixCls}__inner`"
+        @click="toggle"></span>
+    </span>
+  </label>
+</template>
+
+<script>
+  export default {
+    name: 'zk-checkbox',
+    props: {
+      value: {
+        type: Boolean,
+        default: false,
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      indeterminate: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        prefixCls: 'zk-checkbox',
+      };
+    },
+    computed: {
+      checkboxClass() {
+        return [
+          `${this.prefixCls}`,
+          {
+            [`${this.prefixCls}--disabled`]: this.disabled,
+            [`${this.prefixCls}--checked`]: this.value,
+            [`${this.prefixCls}--indeterminate`]: this.indeterminate,
+          },
+        ];
+      },
+    },
+    methods: {
+      toggle() {
+        if (this.disabled) {
+          return false;
+        }
+        const value = !this.value;
+        this.$emit('input', value);
+        return this.$emit('on-change', value);
+      },
+    },
+  };
+</script>
+
+<style lang="less" src="./Checkbox.less"></style>
diff --git a/seller/src/views/my-components/tree-table/Table/Table.less b/seller/src/views/my-components/tree-table/Table/Table.less
new file mode 100644
index 00000000..6fd20e92
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/Table.less
@@ -0,0 +1,170 @@
+@import "./font/iconfont";
+
+// text
+@prefixCls: zk-table;
+// color
+@black: #515a6e;
+@white: #ffffff;
+@border: #e9eaec;
+@hoverRow: #ebf7ff;
+@backgroundRow: #f8f8f9;
+
+.@{prefixCls} {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  background-color: @white;
+  border: 1px solid @border;
+  font-size: 14px;
+  line-height: 26px;
+  color: @black;
+  overflow: hidden;
+}
+
+.@{prefixCls}__header-cell {
+  font-weight: bold;
+}
+
+.@{prefixCls}__cell-inner {
+  padding: 0px 18px;
+}
+
+.@{prefixCls}-default {
+  font-size: 14px;
+
+  .@{prefixCls}__header-row {
+    height: 40px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 48px !important;
+  }
+}
+
+.@{prefixCls}-small {
+  font-size: 12px;
+
+  .@{prefixCls}__header-row {
+    height: 36px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 40px !important;
+  }
+}
+
+.@{prefixCls}-large {
+  font-size: 16px;
+
+  .@{prefixCls}__header-row {
+    height: 43px !important;
+  }
+
+  .@{prefixCls}__body-row {
+    height: 60px !important;
+  }
+}
+
+.@{prefixCls}__header-wrapper,
+.@{prefixCls}__footer-wrapper {
+  overflow: hidden;
+}
+
+.@{prefixCls}__body-wrapper {
+  overflow: auto;
+}
+
+.@{prefixCls}__header,
+.@{prefixCls}__body,
+.@{prefixCls}__footer {
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.@{prefixCls}__header-row {
+  height: 40px;
+  box-sizing: border-box;
+  background-color: @backgroundRow;
+  border-bottom: 1px solid @border;
+}
+
+.@{prefixCls}__footer-row {
+  height: 40px;
+  box-sizing: border-box;
+  background-color: @white;
+  border-top: 1px solid @border;
+}
+
+.@{prefixCls}__body-row {
+  height: 48px;
+  box-sizing: border-box;
+
+  &:not(:first-of-type) {
+    border-top: 1px solid @border;
+  }
+}
+
+.@{prefixCls}__header-cell,
+.@{prefixCls}__body-cell,
+.@{prefixCls}__footer-cell {
+  box-sizing: border-box;
+  text-align: left;
+  vertical-align: middle;
+  word-break: break-all;
+  overflow: hidden;
+}
+
+.@{prefixCls}--firstProp-header-inner {
+  padding-left: 32px;
+}
+
+.@{prefixCls}--empty-row {
+  height: 80px;
+}
+
+.@{prefixCls}--empty-content {
+  text-align: center;
+}
+
+.@{prefixCls}--center-cell {
+  text-align: center;
+}
+
+.@{prefixCls}--right-cell {
+  text-align: right;
+}
+
+.@{prefixCls}--stripe-row {
+  background-color: @backgroundRow;
+}
+
+.@{prefixCls}--row-hover {
+  background-color: @hoverRow;
+}
+
+.@{prefixCls}--border-cell {
+  &:not(:last-of-type) {
+    border-right: 1px solid @border;
+  }
+}
+
+.@{prefixCls}--tree-icon {
+  margin-right: 6px;
+  cursor: pointer;
+}
+
+.@{prefixCls}--expand-inner {
+  text-align: center;
+  cursor: pointer;
+  transition: transform .2s ease-in-out;
+}
+
+.@{prefixCls}--expanded-inner {
+  transform: rotate(90deg);
+}
+
+.@{prefixCls}--expand-content {
+  padding: 20px;
+}
\ No newline at end of file
diff --git a/seller/src/views/my-components/tree-table/Table/Table.vue b/seller/src/views/my-components/tree-table/Table/Table.vue
new file mode 100644
index 00000000..2f6c4b6b
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/Table.vue
@@ -0,0 +1,396 @@
+<template lang="html">
+  <div
+    v-if="columns.length > 0"
+    ref="table"
+    :class="[prefixCls, `${prefixCls}-${size}`, tableClass]">
+    <Spin fix v-if="loading"></Spin>
+    <div
+      v-show="showHeader"
+      ref="header-wrapper"
+      :class="`${prefixCls}__header-wrapper`"
+      @mousewheel="handleEvent('header', $event)">
+      <table-header
+        ref="table-header">
+      </table-header>
+    </div>
+    <div
+      ref="body-wrapper"
+      :style="bodyWrapperStyle"
+      :class="`${prefixCls}__body-wrapper`"
+      @scroll="handleEvent('body', $event)">
+      <table-body
+        ref="table-body"
+        :class="bodyClass">
+      </table-body>
+    </div>
+    <div
+      v-show="showSummary && data.length > 0"
+      ref="footer-wrapper"
+      :class="`${prefixCls}__footer-wrapper`"
+      @mousewheel="handleEvent('footer', $event)">
+      <table-footer
+        ref="table-footer">
+      </table-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import TableHeader from "./TableHeader";
+import TableBody from "./TableBody";
+import TableFooter from "./TableFooter";
+import { mixins, scrollBarWidth as getSbw } from "./utils";
+
+/* eslint-disable no-underscore-dangle */
+/* eslint-disable no-param-reassign */
+
+// function getBodyData(data, isTreeType, childrenProp, isFold, level = 1) {
+function getBodyData(
+  primaryKey,
+  oldBodyData,
+  data,
+  isTreeType,
+  childrenProp,
+  isFold,
+  parentFold,
+  level = 1
+) {
+  let bodyData = [];
+  data.forEach((row, index) => {
+    const children = row[childrenProp];
+    const childrenLen =
+      Object.prototype.toString.call(children).slice(8, -1) === "Array"
+        ? children.length
+        : 0;
+    let curIsFold = isFold;
+    if (
+      isFold &&
+      typeof primaryKey === "string" &&
+      Array.isArray(oldBodyData)
+    ) {
+      for (let i = 0; i < oldBodyData.length; i++) {
+        const oldRow = oldBodyData[i];
+        if (oldRow[primaryKey] === row[primaryKey]) {
+          if ("_isFold" in oldRow) {
+            curIsFold = oldRow._isFold;
+          }
+          break;
+        }
+      }
+    }
+    bodyData.push({
+      _isHover: false,
+      _isExpanded: false,
+      _isChecked: false,
+      _level: level,
+      // _isHide: isFold ? level !== 1 : false,
+      // _isFold: isFold,
+      _isHide: level !== 1 ? isFold && parentFold : false,
+      _isFold: isFold && curIsFold,
+      _childrenLen: childrenLen,
+      _normalIndex: index + 1,
+      ...row
+    });
+    if (isTreeType) {
+      if (childrenLen > 0) {
+        // bodyData = bodyData.concat(getBodyData(children, true, childrenProp, isFold, level + 1));
+        bodyData = bodyData.concat(
+          getBodyData(
+            primaryKey,
+            oldBodyData,
+            children,
+            true,
+            childrenProp,
+            isFold,
+            curIsFold,
+            level + 1
+          )
+        );
+      }
+    }
+  });
+  return bodyData;
+}
+
+function initialState(table, expandKey) {
+  return {
+    bodyHeight: "auto",
+    firstProp: expandKey || (table.columns[0] && table.columns[0].key),
+    // bodyData: getBodyData(table.data, table.treeType, table.childrenProp, table.isFold),
+    bodyData: getBodyData(
+      table.primaryKey,
+      table.bodyData,
+      table.data,
+      table.treeType,
+      table.childrenProp,
+      table.isFold,
+      false
+    )
+  };
+}
+
+function initialColumns(table, clientWidth) {
+  let columnsWidth = 0;
+  const minWidthColumns = [];
+  const otherColumns = [];
+  const columns = table.columns.concat();
+  if (table.expandType) {
+    columns.unshift({
+      width: "50"
+    });
+  }
+  if (table.selectable) {
+    columns.unshift({
+      width: "50"
+    });
+  }
+  if (table.showIndex) {
+    columns.unshift({
+      width: "50px",
+      key: "_normalIndex",
+      title: table.indexText
+    });
+  }
+  columns.forEach((column, index) => {
+    let width = "";
+    let minWidth = "";
+    if (!column.width) {
+      if (column.minWidth) {
+        minWidth =
+          typeof column.minWidth === "number"
+            ? column.minWidth
+            : parseInt(column.minWidth, 10);
+      } else {
+        minWidth = 80;
+      }
+      minWidthColumns.push({
+        ...column,
+        minWidth,
+        _index: index
+      });
+    } else {
+      width =
+        typeof column.width === "number"
+          ? column.width
+          : parseInt(column.width, 10);
+      otherColumns.push({
+        ...column,
+        width,
+        _index: index
+      });
+    }
+    columnsWidth += minWidth || width;
+  });
+  const scrollBarWidth = getSbw();
+  const totalWidth = columnsWidth + scrollBarWidth;
+  const isScrollX = totalWidth > clientWidth;
+  if (!isScrollX) {
+    const extraWidth = clientWidth - totalWidth;
+    const averageExtraWidth = Math.floor(extraWidth / minWidthColumns.length);
+    minWidthColumns.forEach(column => {
+      column.computedWidth = column.minWidth + averageExtraWidth;
+    });
+  }
+  const tableColumns = otherColumns.concat(minWidthColumns);
+  tableColumns.sort((a, b) => a._index - b._index);
+  return tableColumns;
+}
+
+export default {
+  name: "TreeTable",
+  mixins: [mixins],
+  components: {
+    TableHeader,
+    TableBody,
+    TableFooter
+  },
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    },
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    size: {
+      default() {
+        return !this.$IVIEW || this.$IVIEW.size === ""
+          ? "default"
+          : this.$IVIEW.size;
+      }
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    maxHeight: {
+      type: [String, Number],
+      default: "auto"
+    },
+    stripe: {
+      type: Boolean,
+      default: false
+    },
+    border: {
+      type: Boolean,
+      default: false
+    },
+    treeType: {
+      type: Boolean,
+      default: true
+    },
+    childrenProp: {
+      type: String,
+      default: "children"
+    },
+    isFold: {
+      type: Boolean,
+      default: true
+    },
+    expandType: {
+      type: Boolean,
+      default: true
+    },
+    selectable: {
+      type: Boolean,
+      default: true
+    },
+    selectType: {
+      type: String,
+      default: "checkbox"
+    },
+    emptyText: {
+      type: String,
+      default: "暂无数据"
+    },
+    showHeader: {
+      type: Boolean,
+      default: true
+    },
+    showIndex: {
+      type: Boolean,
+      default: false
+    },
+    indexText: {
+      type: String,
+      default: "#"
+    },
+    showSummary: {
+      type: Boolean,
+      default: false
+    },
+    sumText: {
+      type: String,
+      default: "合计"
+    },
+    primaryKey: String,
+    summaryMethod: Function,
+    showRowHover: {
+      type: Boolean,
+      default: true
+    },
+    rowKey: Function,
+    rowClassName: [String, Function],
+    cellClassName: [String, Function],
+    rowStyle: [Object, Function],
+    cellStyle: [Object, Function],
+    expandKey: String
+  },
+  data() {
+    return {
+      computedWidth: "",
+      computedHeight: "",
+      tableColumns: [],
+      ...initialState(this, this.expandKey)
+    };
+  },
+  computed: {
+    bodyWrapperStyle() {
+      return {
+        height: this.bodyHeight
+      };
+    },
+    tableClass() {
+      return {
+        [`${this.prefixCls}--border`]: this.border
+      };
+    },
+    bodyClass() {
+      return {
+        [`${this.prefixCls}--stripe`]: this.stripe
+      };
+    }
+  },
+  methods: {
+    handleEvent(type, $event) {
+      this.validateType(type, ["header", "body", "footer"], "handleEvent");
+      const eventType = $event.type;
+      if (eventType === "scroll") {
+        this.$refs["header-wrapper"].scrollLeft = $event.target.scrollLeft;
+        this.$refs["footer-wrapper"].scrollLeft = $event.target.scrollLeft;
+      }
+      if (eventType === "mousewheel") {
+        const deltaX = $event.deltaX;
+        const $body = this.$refs["body-wrapper"];
+        if (deltaX > 0) {
+          $body.scrollLeft += 10;
+        } else {
+          $body.scrollLeft -= 10;
+        }
+      }
+      return this.$emit(`${type}-${eventType}`, $event);
+    },
+    // computedWidth, computedHeight, tableColumns
+    measure() {
+      this.$nextTick(() => {
+        const { clientWidth, clientHeight } = this.$el;
+        this.computedWidth = clientWidth + 2;
+        this.computedHeight = clientHeight + 2;
+
+        const maxHeight = parseInt(this.maxHeight, 10);
+        if (this.maxHeight !== "auto" && this.computedHeight > maxHeight) {
+          this.bodyHeight = `${maxHeight - 83}px`;
+        }
+        this.tableColumns = initialColumns(this, clientWidth);
+      });
+    },
+    getCheckedProp(key = "index") {
+      if (!this.selectable) {
+        return [];
+      }
+      const checkedIndexs = [];
+      this.bodyData.forEach((item, index) => {
+        if (item._isChecked) {
+          if (key === "index") {
+            checkedIndexs.push(index);
+          } else {
+            checkedIndexs.push(item[key]);
+          }
+        }
+      });
+      return checkedIndexs;
+    }
+  },
+  watch: {
+    $props: {
+      deep: true,
+      handler() {
+        Object.assign(this.$data, initialState(this, this.expandKey));
+      }
+    }
+  },
+  updated() {
+    this.measure();
+  },
+  mounted() {
+    this.measure();
+    window.addEventListener("resize", this.measure);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.measure);
+  }
+};
+</script>
+
+<style lang="less" src="./Table.less"></style>
diff --git a/seller/src/views/my-components/tree-table/Table/TableBody.js b/seller/src/views/my-components/tree-table/Table/TableBody.js
new file mode 100644
index 00000000..99cf9e3e
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/TableBody.js
@@ -0,0 +1,327 @@
+import Checkbox from '../Checkbox/Checkbox'; // eslint-disable-line
+// import Radio from '../Radio/Radio'; // eslint-disable-line
+import { mixins } from './utils';
+import { Radio } from 'view-design'; // eslint-disable-line
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: 'TreeTable__body',
+  mixins: [mixins],
+  components: { Radio },
+  data() {
+    return {
+      radioSelectedIndex: -1,
+    };
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    },
+  },
+  methods: {
+    toggleStatus(type, row, rowIndex, value) {
+      this.validateType(type, ['Expanded', 'Checked', 'Hide', 'Fold'], 'toggleStatus', false);
+      const target = this.table.bodyData[rowIndex];
+      this.table.bodyData.splice(rowIndex, 1, {
+        ...target,
+        [`_is${type}`]: typeof value === 'undefined' ? !row[`_is${type}`] : value,
+      });
+    },
+    getChildrenIndex(parentLevel, parentIndex, careFold = true) {
+      const data = this.table.bodyData;
+      let childrenIndex = [];
+      for (let i = parentIndex + 1; i < data.length; i++) {
+        if (data[i]._level <= parentLevel) break;
+        if (data[i]._level - 1 === parentLevel) {
+          childrenIndex.push(i);
+        }
+      }
+      const len = childrenIndex.length; // important!!!
+      if (len > 0) {
+        for (let i = 0; i < len; i++) {
+          const childData = data[childrenIndex[i]];
+          if (
+            childData._childrenLen &&
+            (!careFold || (careFold && !childData._isFold))
+          ) {
+            childrenIndex = childrenIndex.concat(
+              this.getChildrenIndex(childData._level, childrenIndex[i], careFold));
+          }
+        }
+      }
+      return childrenIndex;
+    },
+    handleEvent($event, type, data, others) {
+      const certainType = this.validateType(type, ['cell', 'row', 'checkbox', 'icon', 'radio'], 'handleEvent');
+      const eventType = $event ? $event.type : '';
+      const { row, rowIndex, column, columnIndex } = data;
+      const latestData = this.table.bodyData;
+      // Checkbox
+      if (certainType.checkbox) {
+        const { isChecked } = others;
+        this.toggleStatus('Checked', row, rowIndex, isChecked);
+        if (row._childrenLen > 0) {
+          const childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
+          for (let i = 0; i < childrenIndex.length; i++) {
+            this.toggleStatus('Checked', latestData[childrenIndex[i]], childrenIndex[i], isChecked);
+          }
+        }
+        return this.table.$emit('checkbox-click', latestData[rowIndex], column, columnIndex, $event);
+      }
+      // Radio
+      if (certainType.radio) {
+        this.radioSelectedIndex = rowIndex;
+        return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
+      }
+      // Tree's icon
+      if (certainType.icon) {
+        $event.stopPropagation();
+        this.toggleStatus('Fold', row, rowIndex);
+        const childrenIndex = this.getChildrenIndex(row._level, rowIndex);
+        for (let i = 0; i < childrenIndex.length; i++) {
+          this.toggleStatus('Hide', latestData[childrenIndex[i]], childrenIndex[i]);
+        }
+        return this.table.$emit('tree-icon-click', latestData[rowIndex], column, columnIndex, $event);
+      }
+      if (certainType.cell && eventType === 'click') {
+        // 点击扩展单元格
+        if (this.isExpandCell(this.table, columnIndex)) {
+          this.toggleStatus('Expanded', row, rowIndex);
+          return this.table.$emit('expand-cell-click', latestData[rowIndex], column, columnIndex, $event);
+        }
+      }
+      // 行：Hover
+      if (certainType.row && (eventType === 'mouseenter' || eventType === 'mouseleave')) {
+        const { hover } = others;
+        const target = latestData[rowIndex];
+        latestData.splice(rowIndex, 1, {
+          ...target,
+          _isHover: hover,
+        });
+      }
+      if (certainType.row && others && others.clickRow && certainType.radio) {
+        this.radioSelectedIndex = rowIndex;
+        return this.table.$emit('radio-click', { row, rowIndex, column, columnIndex, $event });
+      }
+      if (certainType.cell) {
+        return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, column, columnIndex, $event);
+      }
+      return this.table.$emit(`${type}-${eventType}`, latestData[rowIndex], rowIndex, $event);
+    },
+  },
+  render() {
+    // key
+    // function getKey(row, rowIndex) {
+    //   const rowKey = this.table.rowKey;
+    //   if (rowKey) {
+    //     return rowKey.call(null, row, rowIndex);
+    //   }
+    //   return rowIndex;
+    // }
+
+    // style
+    function getStyle(type, row, rowIndex, column, columnIndex) {
+      const certainType = this.validateType(type, ['cell', 'row'], 'getStyle');
+      const style = this.table[`${type}Style`];
+      if (typeof style === 'function') {
+        if (certainType.row) {
+          return style.call(null, row, rowIndex);
+        }
+        if (certainType.cell) {
+          return style.call(null, row, rowIndex, column, columnIndex);
+        }
+      }
+      return style;
+    }
+
+    // className
+    function getClassName(type, row, rowIndex, column, columnIndex) {
+      const certainType = this.validateType(type, ['cell', 'row', 'inner'], 'getClassName');
+      const classList = [];
+      if (column && column.key == "_normalIndex") {
+        classList.push(`${this.prefixCls}--center-cell`);
+      }
+      if (certainType.row || certainType.cell) {
+        const className = this.table[`${type}ClassName`];
+        if (typeof className === 'string') {
+          classList.push(className);
+        } else if (typeof className === 'function') {
+          if (certainType.row) {
+            classList.push(className.call(null, row, rowIndex) || '');
+          }
+          if (certainType.cell) {
+            classList.push(className.call(null, row, rowIndex, column, columnIndex) || '');
+          }
+        }
+        if (certainType.row) {
+          classList.push(`${this.prefixCls}__body-row`);
+          if (this.table.stripe && rowIndex % 2 !== 0) {
+            classList.push(`${this.prefixCls}--stripe-row`);
+          }
+          if (this.table.showRowHover && row._isHover) {
+            classList.push(`${this.prefixCls}--row-hover`);
+          }
+        }
+        if (certainType.cell) {
+          classList.push(`${this.prefixCls}__body-cell`);
+          if (this.table.border) {
+            classList.push(`${this.prefixCls}--border-cell`);
+          }
+          const align = column.align;
+          if (['center', 'right'].indexOf(align) > -1) {
+            classList.push(`${this.prefixCls}--${align}-cell`);
+          }
+        }
+      }
+      if (certainType.inner) {
+        classList.push(`${this.prefixCls}__cell-inner`);
+        if (this.isExpandCell(this.table, columnIndex)) {
+          classList.push(`${this.prefixCls}--expand-inner`);
+          if (row._isExpanded) {
+            classList.push(`${this.prefixCls}--expanded-inner`);
+          }
+        }
+      }
+      return classList.join(' ');
+    }
+
+    // 根据type渲染单元格Cell
+    function renderCell(row, rowIndex, column, columnIndex) {
+      // ExpandType
+      if (this.isExpandCell(this.table, columnIndex)) {
+        return <i class='zk-icon zk-icon-angle-right'></i>;
+      }
+      // SelectionType's Checkbox
+      if (this.isSelectionCell(this.table, columnIndex)) {
+        let res = null;
+        if (this.table.selectType === 'checkbox') {
+          let allCheck;
+          let childrenIndex;
+          const hasChildren = row._childrenLen > 0;
+          if (hasChildren) {
+            childrenIndex = this.getChildrenIndex(row._level, rowIndex, false);
+            allCheck = true;
+            for (let i = 0; i < childrenIndex.length; i++) {
+              if (!this.table.bodyData[childrenIndex[i]]._isChecked) {
+                allCheck = false;
+                break;
+              }
+            }
+          } else {
+            allCheck = row._isChecked;
+          }
+          let indeterminate = false;
+          if (hasChildren && !allCheck) {
+            for (let i = 0; i < childrenIndex.length; i++) {
+              if (this.table.bodyData[childrenIndex[i]]._isChecked) {
+                indeterminate = true;
+                break;
+              }
+            }
+          }
+          // res = <Checkbox
+          //   indeterminate={indeterminate}
+          //   value={allCheck}
+          //   onOn-change={isChecked => this.handleEvent(null, 'checkbox', { row, rowIndex, column, columnIndex }, { isChecked })}>
+          // </Checkbox>;
+        } else {
+          res = <Radio value={this.radioSelectedIndex === rowIndex} on-on-change={() => this.handleEvent(null, 'radio', { row, rowIndex, column, columnIndex })}></Radio>;
+        }
+        return res;
+      }
+
+      // Tree's firstProp
+      if (this.table.treeType && this.table.firstProp === column.key) {
+        return <span
+          class={`${this.prefixCls}--level-${row._level}-cell`}
+          style={{
+            marginLeft: `${(row._level - 1) * 24}px`,
+            paddingLeft: row._childrenLen === 0 ? '20px' : '',
+          }}>
+          {row._childrenLen > 0 &&
+            <i
+              class={`${this.prefixCls}--tree-icon zk-icon zk-icon-${row._isFold ? 'plus' : 'minus'}-square-o`}
+              on-click={$event => this.handleEvent($event, 'icon', { row, rowIndex, column, columnIndex }, { isFold: row._isFold })}></i>
+          }
+          {row[column.key] ? row[column.key] : ''}
+        </span>;
+      }
+      // TreeType children's index
+      if (this.table.showIndex && this.table.treeType && column.key === '_normalIndex' && row._level > 1) {
+        return '';
+      }
+      if (column.type === undefined || column.type === 'custom') {
+        return row[column.key];
+      } else if (column.type === 'template') {
+        return this.table.$scopedSlots[column.template]
+          ? this.table.$scopedSlots[column.template]({ row, rowIndex, column, columnIndex })
+          : '';
+      }
+      return '';
+    }
+
+    // Template
+    return (
+      <table cellspacing="0" cellpadding="0" border="0" class={`${this.prefixCls}__body`}>
+        {/* <colgroup>
+          {this.table.tableColumns.map(column =>
+            <col width={column.computedWidth || column.minWidth || column.width}></col>)
+          }
+        </colgroup> */}
+        <tbody>
+          {  this.table.bodyData.length > 0
+            ? this.table.bodyData.map((row, rowIndex) =>
+              [
+                <tr
+                  v-show={!row._isHide}
+                  key={`table_row_${rowIndex}`}
+                  style={getStyle.call(this, 'row', row, rowIndex)}
+                  class={getClassName.call(this, 'row', row, rowIndex)}
+                  on-click={$event => this.handleEvent($event, 'row', { row, rowIndex }, { clickRow: true })}
+                  on-dblclick={$event => this.handleEvent($event, 'row', { row, rowIndex })}
+                  on-contextmenu={$event => this.handleEvent($event, 'row', { row, rowIndex })}
+                  on-mouseenter={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: true })}
+                  on-mouseleave={$event => this.handleEvent($event, 'row', { row, rowIndex }, { hover: false })}>
+                  {   this.table.tableColumns.map((column, columnIndex) =>
+                  column.key ?  <td
+                      style={getStyle.call(this, 'cell', row, rowIndex, column, columnIndex)}
+                      class={getClassName.call(this, 'cell', row, rowIndex, column, columnIndex)}
+                      on-click={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-dblclick={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-contextmenu={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-mouseenter={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}
+                      on-mouseleave={$event => this.handleEvent($event, 'cell', { row, rowIndex, column, columnIndex })}>
+                      <div class={getClassName.call(this, 'inner', row, rowIndex, column, columnIndex)}>
+                        {renderCell.call(this, row, rowIndex, column, columnIndex)}
+                      </div>
+                    </td>:"")
+                  }
+                </tr>,
+                this.table.expandType && row._isExpanded &&
+                <tr
+                  key={rowIndex}
+                  class={`${this.prefixCls}__body-row ${this.prefixCls}--expand-row`}>
+                  <td
+                    class={`${this.prefixCls}--expand-content`}
+                    colspan={this.table.tableColumns.length}>
+                    {this.table.$scopedSlots.expand
+                      ? this.table.$scopedSlots.expand({ row, rowIndex })
+                      : ''
+                    }
+                  </td>
+                </tr>,
+              ])
+            : <tr
+              class={`${this.prefixCls}--empty-row`}>
+              <td
+                class={`${this.prefixCls}__body-cell ${this.prefixCls}--empty-content`}
+                colspan={this.table.tableColumns.length}>
+                {this.table.emptyText}
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    );
+  },
+};
diff --git a/seller/src/views/my-components/tree-table/Table/TableFooter.js b/seller/src/views/my-components/tree-table/Table/TableFooter.js
new file mode 100644
index 00000000..b3eed8a6
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/TableFooter.js
@@ -0,0 +1,84 @@
+import { mixins } from './utils';
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: 'TreeTable__footer',
+  mixins: [mixins],
+  data() {
+    return {
+
+    };
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    },
+  },
+  methods: {
+
+  },
+  render() {
+    // 计算各列总和
+    function renderCell({ key }, columnIndex) {
+      if (columnIndex === 0) {
+        return this.table.sumText;
+      }
+      const rows = this.table.bodyData;
+      const values = rows.map(row => Number(row[key]));
+      const precisions = [];
+      let notNumber = true;
+      values.forEach((value) => {
+        if (!isNaN(value)) {
+          notNumber = false;
+          const decimal = value.toString().split('.')[1];
+          precisions.push(decimal ? decimal.length : 0);
+        }
+      });
+      const precision = Math.max.apply(null, precisions);
+      if (!notNumber) {
+        return values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return parseFloat((prev + curr).toFixed(precision));
+          }
+          return prev;
+        }, 0);
+      }
+      return '';
+    }
+
+    // className
+    function getClassName() {
+      const classList = [];
+      classList.push(`${this.prefixCls}__footer-cell`);
+      if (this.table.border) {
+        classList.push(`${this.prefixCls}--border-cell`);
+      }
+      return classList.join(' ');
+    }
+
+    // Template
+    return (
+      <table cellspacing="0" cellpadding="0" border="0" class={ `${this.prefixCls}__footer` }>
+        <colgroup>
+          { this.table.tableColumns.map(column =>
+            <col width={ column.computedWidth || column.minWidth || column.width }></col>)
+          }
+        </colgroup>
+        <tfoot>
+          <tr class={ `${this.prefixCls}__footer-row` }>
+            { this.table.tableColumns.map((column, columnIndex) =>
+              <td class={ getClassName.call(this) }>
+                <div class={ `${this.prefixCls}__cell-inner` }>
+                  { this.table.summaryMethod
+                    ? this.table.summaryMethod(this.table.bodyData, column, columnIndex)
+                    : renderCell.call(this, column, columnIndex) }
+                </div>
+              </td>)
+            }
+          </tr>
+        </tfoot>
+      </table>
+    );
+  },
+};
diff --git a/seller/src/views/my-components/tree-table/Table/TableHeader.js b/seller/src/views/my-components/tree-table/Table/TableHeader.js
new file mode 100644
index 00000000..23570dfa
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/TableHeader.js
@@ -0,0 +1,108 @@
+import Checkbox from "../Checkbox/Checkbox"; // eslint-disable-line
+import { mixins } from "./utils";
+
+/* eslint-disable no-underscore-dangle */
+export default {
+  name: "TreeTable__header",
+  mixins: [mixins],
+  data() {
+    return {};
+  },
+  computed: {
+    table() {
+      return this.$parent;
+    }
+  },
+  methods: {
+    toggleAllChecked(checked) {
+      this.table.bodyData = this.table.bodyData.map(row => ({
+        ...row,
+        _isChecked: checked
+      }));
+    }
+  },
+  render() {
+    // className
+    function getClassName(type, { headerAlign, key }) {
+      const certainType = this.validateType(
+        type,
+        ["cell", "inner"],
+        "getClassName"
+      );
+      const classList = [];
+      if (key == "_normalIndex") {
+        classList.push(`${this.prefixCls}--center-cell`);
+      }
+      if (certainType.cell) {
+        classList.push(`${this.prefixCls}__header-cell`);
+        if (this.table.border) {
+          classList.push(`${this.prefixCls}--border-cell`);
+        }
+        if (["center", "right"].indexOf(headerAlign) > -1) {
+          classList.push(`${this.prefixCls}--${headerAlign}-cell`);
+        }
+      }
+      if (certainType.inner) {
+        classList.push(`${this.prefixCls}__cell-inner`);
+        if (this.table.treeType && this.table.firstProp === key) {
+          classList.push(`${this.prefixCls}--firstProp-header-inner`);
+        }
+      }
+      return classList.join(" ");
+    }
+
+    // 根据type渲染单元格Label
+    function renderLabel(column, columnIndex) {
+      if (
+        this.isSelectionCell(this.table, columnIndex) &&
+        this.selectType === "checkbox"
+      ) {
+        const allCheck = this.table.bodyData.every(row => row._isChecked);
+        const indeterminate =
+          !allCheck && this.table.bodyData.some(row => row._isChecked);
+        return (
+          <Checkbox
+            indeterminate={indeterminate}
+            value={allCheck}
+            onOn-change={checked => this.toggleAllChecked(checked)}
+          ></Checkbox>
+        );
+      }
+      return column.title ? column.title : "";
+    }
+
+    // Template
+    return (
+      <table
+        cellspacing="0"
+        cellpadding="0"
+        border="0"
+        class={`${this.prefixCls}__header`}
+      >
+        {/* <colgroup>
+          {this.table.tableColumns.map(column => (
+            <col
+              width={column.computedWidth || column.minWidth || column.width}
+            ></col>
+          ))}
+        </colgroup> */}
+        <thead>
+          <tr class={`${this.prefixCls}__header-row`}>
+            {
+              this.table.tableColumns.map((column, columnIndex) =>
+                column.key ? (
+                  <th class={getClassName.call(this, "cell", column)}>
+                    <div class={getClassName.call(this, "inner", column)}>
+                      {renderLabel.call(this, column, columnIndex)}
+                    </div>
+                  </th>
+                ) : (
+                  ""
+                )
+              )}
+          </tr>
+        </thead>
+      </table>
+    );
+  }
+};
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.eot b/seller/src/views/my-components/tree-table/Table/font/iconfont.eot
new file mode 100644
index 00000000..2b35d90c
Binary files /dev/null and b/seller/src/views/my-components/tree-table/Table/font/iconfont.eot differ
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.less b/seller/src/views/my-components/tree-table/Table/font/iconfont.less
new file mode 100644
index 00000000..ca06f860
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/font/iconfont.less
@@ -0,0 +1,22 @@
+// icon
+@font-face {font-family: "iconfont";
+  src: url('iconfont.eot?t=1505310522875'); /* IE9*/
+  src: url('iconfont.eot?t=1505310522875#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAW0AAsAAAAACOQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kggY21hcAAAAYAAAABuAAABojLtBtFnbHlmAAAB8AAAAa8AAAKA73SzT2hlYWQAAAOgAAAALwAAADYO3fRqaGhlYQAAA9AAAAAcAAAAJAfeA4ZobXR4AAAD7AAAABMAAAAUE+kAAGxvY2EAAAQAAAAADAAAAAwBbAHYbWF4cAAABAwAAAAeAAAAIAEUAF1uYW1lAAAELAAAAUUAAAJtPlT+fXBvc3QAAAV0AAAAQAAAAFryy5h0eJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/s04gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDwzZm7438AQw9zA0AAUZgTJAQAoHgyieJzFkcENwyAUQ98HyqHKKDmEZoEOklOnYOK/RmI+uXSCWDLG/pZAALyALK5iAfthDBxKLfLMO/LCJl+lRqL7fp7y3VuoKprV0KxO0qbyGOy5o/+xxPq9nV6YflNX9DY5fsA/k6Pj+yTpAn3jEO8AAHiclVDNitNQFD7n3slNE9vE5N7kpOn0J0mbKB3DGDMZRGw3bhQXA2LB5TyAbmfjohvBhQvfYEAEoc8wr+EDiK4KPkITU0EcXDmHw3fOgfN9fHygATTf+BUPQMIduA9P4AwAxRxjiw0xysqczdGLNI+UxbMki/QkzvljpFgov6jKlIQubLRwhA+iospyluFJuWCPsPCHiP1B+MKdHbr8I5pBNnpXP2Of0Bsnh/biXv30aKmKiexcdF2377ofOkLTOowd2Ba+Jt/QDFPUnzU79K7Gd9kYu/0sfP6qNxm45+/LN8MZGYjrNcrBxPqydEKn7behL92+frvXCcJeMlV48eNWILvD9Du0hXtgl+wSHIBZnJZLzNKyKgh9paPAdVca260hAxPBMBowz9t1uzUDuT8CswEDDtq8Gr7mADaM4QgetrKRhbozQooWeOrkKJVIojg9ccqqjcT3uBJ6lGNZnUYjnBU+ORbGaeYskM93m+kx4vGUrX5PQXK3kUSSrSS9JFWvFJHCjaIGJCFSugcOLeM6c7f6wyFZf/37+PO6AgD/x/vNnN/A7H8bhF86tmcbAHicY2BkYGAAYl/p/jnx/DZfGbhZGEDg6v0IKwT9/yELA7MEkMvBwAQSBQAZYgnZAHicY2BkYGBu+N/AEMPCAAJAkpEBFbACAEcLAm54nGNhYGBgfsnAwMKAwAAOmwD9AAAAAAAAdgCYAPYBQHicY2BkYGBgZQgEYhBgAmIuIGRg+A/mMwAAES0BcgAAeJxlj01OwzAQhV/6B6QSqqhgh+QFYgEo/RGrblhUavdddN+mTpsqiSPHrdQDcB6OwAk4AtyAO/BIJ5s2lsffvHljTwDc4Acejt8t95E9XDI7cg0XuBeuU38QbpBfhJto41W4Rf1N2MczpsJtdGF5g9e4YvaEd2EPHXwI13CNT+E69S/hBvlbuIk7/Aq30PHqwj7mXle4jUcv9sdWL5xeqeVBxaHJIpM5v4KZXu+Sha3S6pxrW8QmU4OgX0lTnWlb3VPs10PnIhVZk6oJqzpJjMqt2erQBRvn8lGvF4kehCblWGP+tsYCjnEFhSUOjDFCGGSIyujoO1Vm9K+xQ8Jee1Y9zed0WxTU/3OFAQL0z1xTurLSeTpPgT1fG1J1dCtuy56UNJFezUkSskJe1rZUQuoBNmVXjhF6XNGJPyhnSP8ACVpuyAAAAHicY2BigAAuBuyAlZGJkZmRhZGVkY2BsYI7MS89J1W3KDM9o4S3IKe0WLe4sDSxKFU3ny83Mw+Jy8AAAHSWD8A=') format('woff'),
+  url('iconfont.ttf?t=1505310522875') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('iconfont.svg?t=1505310522875#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.zk-icon {
+  font-family: "iconfont" !important;
+  font-size: 14px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.zk-icon-plus-square-o:before { content: "\e631"; }
+
+.zk-icon-minus-square-o:before { content: "\e632"; }
+
+.zk-icon-angle-right:before { content: "\e633"; }
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.svg b/seller/src/views/my-components/tree-table/Table/font/iconfont.svg
new file mode 100644
index 00000000..085fd562
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/font/iconfont.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="angle-right" unicode="&#58931;" d="M384.087 97.474c-7.857 0-15.713 2.997-21.707 8.992-11.989 11.989-11.989 31.426 0 43.415l234.118 234.12-234.118 234.118c-11.988 11.989-11.988 31.427 0 43.416 11.989 11.988 31.426 11.988 43.416 0l255.826-255.827c11.989-11.989 11.989-31.427 0-43.416l-255.826-255.827c-5.995-5.995-13.851-8.992-21.708-8.992z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="plus-square-o" unicode="&#58929;" d="M810.666667 768H213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333v-597.333334c0-46.933333 38.4-85.333333 85.333333-85.333333h597.333334c46.933333 0 85.333333 38.4 85.333333 85.333333V682.666667c0 46.933333-38.4 85.333333-85.333333 85.333333z m42.666666-682.666667c0-25.6-17.066667-42.666667-42.666666-42.666666H213.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666V682.666667c0 25.6 17.066667 42.666667 42.666666 42.666666h597.333334c25.6 0 42.666667-17.066667 42.666666-42.666666v-597.333334zM768 384c0-25.6-17.066667-42.666667-42.666667-42.666667H298.666667c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h426.666666c25.6 0 42.666667-17.066667 42.666667-42.666667zM512 640c25.6 0 42.666667-17.066667 42.666667-42.666667v-426.666666c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667V597.333333c0 25.6 17.066667 42.666667 42.666667 42.666667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="minus-square-o" unicode="&#58930;" d="M810.666667 768H213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333v-597.333334c0-46.933333 38.4-85.333333 85.333333-85.333333h597.333334c46.933333 0 85.333333 38.4 85.333333 85.333333V682.666667c0 46.933333-38.4 85.333333-85.333333 85.333333z m42.666666-682.666667c0-25.6-17.066667-42.666667-42.666666-42.666666H213.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666V682.666667c0 25.6 17.066667 42.666667 42.666666 42.666666h597.333334c25.6 0 42.666667-17.066667 42.666666-42.666666v-597.333334zM768 384c0-25.6-17.066667-42.666667-42.666667-42.666667H298.666667c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h426.666666c25.6 0 42.666667-17.066667 42.666667-42.666667z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf b/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf
new file mode 100644
index 00000000..545bf911
Binary files /dev/null and b/seller/src/views/my-components/tree-table/Table/font/iconfont.ttf differ
diff --git a/seller/src/views/my-components/tree-table/Table/font/iconfont.woff b/seller/src/views/my-components/tree-table/Table/font/iconfont.woff
new file mode 100644
index 00000000..fe9b1d70
Binary files /dev/null and b/seller/src/views/my-components/tree-table/Table/font/iconfont.woff differ
diff --git a/seller/src/views/my-components/tree-table/Table/utils/index.js b/seller/src/views/my-components/tree-table/Table/utils/index.js
new file mode 100644
index 00000000..dfbbb101
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/utils/index.js
@@ -0,0 +1,6 @@
+import mixins from './mixins';
+import scrollBarWidth from './scrollBarWidth';
+export {
+    mixins,
+    scrollBarWidth
+}
diff --git a/seller/src/views/my-components/tree-table/Table/utils/mixins.js b/seller/src/views/my-components/tree-table/Table/utils/mixins.js
new file mode 100644
index 00000000..5b9ee251
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/utils/mixins.js
@@ -0,0 +1,34 @@
+export default {
+  data() {
+    return {
+      prefixCls: 'zk-table',
+    };
+  },
+  methods: {
+    validateType(type, validTypes, funcName, isReturn = true) {
+      if (validTypes.indexOf(type) < 0) throw new Error(`${funcName}'s type must is ${validTypes.join(' or ')}.`);
+      if (isReturn) {
+        const certainType = {};
+        validTypes.forEach((item) => {
+          certainType[item] = item === type;
+        });
+        return certainType;
+      }
+      return true;
+    },
+    isExpandCell(table, columnIndex) {
+      return table.expandType && (
+        (table.showIndex && columnIndex === 1) ||
+        (!table.showIndex && columnIndex === 0)
+      );
+    },
+    isSelectionCell(table, columnIndex) {
+      return table.selectable && (
+        (table.showIndex && table.expandType && columnIndex === 2) ||
+        (!table.showIndex && table.expandType && columnIndex === 1) ||
+        (table.showIndex && !table.expandType && columnIndex === 1) ||
+        (!table.showIndex && !table.expandType && columnIndex === 0)
+      );
+    },
+  },
+};
diff --git a/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js b/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
new file mode 100644
index 00000000..9bd201d4
--- /dev/null
+++ b/seller/src/views/my-components/tree-table/Table/utils/scrollBarWidth.js
@@ -0,0 +1,28 @@
+import Vue from 'vue';
+
+let scrollBarWidth;
+
+export default function () {
+  if (Vue.prototype.$isServer) return 0;
+  if (scrollBarWidth !== undefined) return scrollBarWidth;
+
+  const outer = document.createElement('div');
+  outer.style.visibility = 'hidden';
+  outer.style.width = '100px';
+  outer.style.position = 'absolute';
+  outer.style.top = '-9999px';
+  document.body.appendChild(outer);
+
+  const widthNoScroll = outer.offsetWidth;
+  outer.style.overflow = 'scroll';
+
+  const inner = document.createElement('div');
+  inner.style.width = '100%';
+  outer.appendChild(inner);
+
+  const widthWithScroll = inner.offsetWidth;
+  outer.parentNode.removeChild(outer);
+  scrollBarWidth = widthNoScroll - widthWithScroll;
+
+  return scrollBarWidth;
+}
diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue
new file mode 100644
index 00000000..8bb6b2bf
--- /dev/null
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@@ -0,0 +1,357 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入商品名"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="状态" prop="status">
+                <Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="NEW">新投诉</Option>
+                  <Option value="CANCEL">已撤销</Option>
+                  <Option value="WAIT_APPEAL">待申诉</Option>
+                  <Option value="COMMUNICATION">对话中</Option>
+                  <Option value="WAIT_ARBITRATION">等待仲裁</Option>
+                  <Option value="COMPLETE">已完成</Option>
+
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="评价内容">
+          <span v-if="content == ''">暂无评价</span>
+          <span v-else>{{content}}</span>
+        </FormItem>
+        <FormItem label="评价图片">
+          <upload-pic-thumb
+                            v-model="image"
+                            :disable="true"
+                            :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+        <FormItem label="回复内容" prop="reply">
+          <Input v-if="replyStatus == false"
+            v-model="form.reply"
+            type="textarea"
+            maxlength="200"
+            :rows="4"
+            clearable
+            style="width:260px"
+          />
+          <span v-else>
+            {{form.reply}}
+          </span>
+        </FormItem>
+        <FormItem label="回复图片" prop="replyImage">
+          <upload-pic-thumb v-if="replyStatus == false"
+            v-model="form.replyImage"
+            :limit="5"
+          ></upload-pic-thumb>
+          <upload-pic-thumb v-else
+            v-model="form.replyImage"
+            :disable="true"
+             :remove="false"
+          ></upload-pic-thumb>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit" >回复
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import * as API_Member from "@/api/member";
+  import * as API_Order from "@/api/order";
+  import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+  export default {
+    name: "orderComplaint",
+    components: {
+      uploadPicThumb
+    },
+    data() {
+      return {
+        image:[],//评价图片
+        replyStatus:false,//回复状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        openTip: true, // 显示提示
+        loading: true, // 表单加载状态
+        content: "",//评价内容
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        form: {}, // 表单数据
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "订单编号",
+            key: "orderSn",
+            minWidth: 120,
+            sortType: "desc",
+          },
+          {
+            title: "商品名称",
+            key: "goodsName",
+            minWidth: 120,
+            sortType: "desc",
+          },
+          {
+            title: "投诉主题",
+            key: "complainTopic",
+            minWidth: 120,
+          },
+          {
+            title: "投诉时间",
+            key: "createTime",
+            minWidth: 120,
+          },
+          {
+            title: "投诉状态",
+            key: "complainStatus",
+            minWidth: 120,
+            render: (h, params) => {
+              if (params.row.complainStatus == "NEW") {
+                return h('div', [h('span', { }, '新投诉'),]);
+              } else if (params.row.complainStatus == "CANCEL") {
+                return h('div', [h('span', { }, '已撤销'),]);
+              } else if (params.row.complainStatus == "WAIT_APPEAL") {
+                return h('div', [h('span', { }, '待申诉'),]);
+              } else if (params.row.complainStatus == "COMMUNICATION") {
+                return h('div', [h('span', { }, '对话中'),]);
+              }else if (params.row.complainStatus == "WAIT_ARBITRATION") {
+                return h('div', [h('span', { }, '等待仲裁'),]);
+              }else if (params.row.complainStatus == "COMPLETE") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+              if(params.row.complainStatus === "COMPLETE"){
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "primary",
+                        size: "small",
+                        icon: "ios-create-outline",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.detail(params.row);
+                        },
+                      },
+                    },
+                    "详情"
+                  ),
+                ]);
+              }else{
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "primary",
+                        size: "small",
+                        icon: "ios-create-outline",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.detail(params.row);
+                        },
+                      },
+                    },
+                    "处理"
+                  ),
+                ]);
+              }
+
+            },
+          },
+
+        ],
+        data: [], // 表格数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      dropDown() {
+        if (this.drop) {
+          this.dropDownContent = "展开";
+          this.dropDownIcon = "ios-arrow-down";
+        } else {
+          this.dropDownContent = "收起";
+          this.dropDownIcon = "ios-arrow-up";
+        }
+        this.drop = !this.drop;
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.getComplainPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //回复
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            API_Member.replyMemberReview(this.form.id, this.form).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("回复成功");
+                this.getDataList();
+                this.modalVisible = false;
+              }
+            });
+          }
+        });
+      },
+      //投诉详情
+      detail(v) {
+        let id = v.id;
+        this.$router.push({
+          name: "order-complaint-detail",
+          query: { id: id },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/order/after-order/orderComplaintDetail.vue b/seller/src/views/order/after-order/orderComplaintDetail.vue
new file mode 100644
index 00000000..1d45b900
--- /dev/null
+++ b/seller/src/views/order/after-order/orderComplaintDetail.vue
@@ -0,0 +1,554 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card>
+        <div class="main-content">
+          <div class="div-flow-left">
+            <div class="div-form-default">
+              <h3>投诉信息</h3>
+              <dl>
+                <dt>投诉商品</dt>
+                <dd>{{ complaintInfo.goodsName }}</dd>
+              </dl>
+              <dl>
+                <dt>投诉状态</dt>
+                <dd v-if="complaintInfo.complainStatus =='NEW'">新投诉</dd>
+                <dd v-if="complaintInfo.complainStatus =='CANCEL'">已撤销</dd>
+                <dd v-if="complaintInfo.complainStatus =='WAIT_APPEAL'">待申诉</dd>
+                <dd v-if="complaintInfo.complainStatus =='COMMUNICATION'">对话中</dd>
+                <dd v-if="complaintInfo.complainStatus =='WAIT_ARBITRATION'">等待仲裁</dd>
+                <dd v-if="complaintInfo.complainStatus =='COMPLETE'">已完成</dd>
+              </dl>
+              <dl>
+                <dt>投诉时间</dt>
+                <dd>{{ complaintInfo.createTime }}</dd>
+              </dl>
+              <dl>
+                <dt>投诉主题</dt>
+                <dd>{{ complaintInfo.complainTopic }}</dd>
+              </dl>
+              <dl>
+                <dt>投诉内容</dt>
+                <dd>{{ complaintInfo.content }}</dd>
+              </dl>
+              <dl>
+                <dt>投诉凭证</dt>
+                <dd v-if="images === ''">
+                  暂无投诉凭证
+                </dd>
+                <dd v-else>
+                  <div class="div-img" v-for="(item, index) in images">
+                    <img class="complain-img" :src=item>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="complaintInfo.complainStatus !== 'WAIT_APPEAL'">
+              <h3>商家申诉信息</h3>
+              <dl>
+                <dt>申诉时间</dt>
+                <dd>{{ complaintInfo.appealTime }}</dd>
+              </dl>
+              <dl>
+                <dt>申诉内容</dt>
+                <dd>{{ complaintInfo.appealContent }}</dd>
+              </dl>
+              <dl>
+                <dt>申诉凭证</dt>
+                <dd v-if="appealImages == ''">
+                  暂无申诉凭证
+                </dd>
+                <dd v-else>
+                  <div class="div-img" v-for="(item, index) in appealImages">
+                    <img class="complain-img" :src=item>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+
+            <div class="div-form-default" v-if="complaintInfo.complainStatus === 'WAIT_APPEAL'">
+              <h3>商家申诉</h3>
+              <dl>
+                <dt>申诉内容</dt>
+                <dd>
+                  <Input v-model="appeal.appealContent" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                </dd>
+              </dl>
+              <dl>
+                <dt>申诉凭证</dt>
+                <dd>
+                  <div class="complain-upload-list" :key="index" v-for="(item,index) in appeal.appealImages">
+                    <template v-if="item.status === 'finished'">
+                      <img class="complain-img" :src="item.url">
+                      <div class="complain-upload-list-cover">
+                        <Icon type="ios-eye-outline" @click.native="handleView(item.url)"></Icon>
+                        <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
+                      </div>
+                    </template>
+                    <template v-else>
+                      <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+                    </template>
+                  </div>
+                  <Upload ref="upload" :show-upload-list="false" :on-format-error="handleFormatError" :action="uploadFileUrl" :headers="accessToken" :on-success="handleSuccessGoodsPicture"
+                    :format="['jpg','jpeg','png']" :max-size="2048" :on-exceeded-size="handleMaxSize" :before-upload="handleBeforeUpload" multiple type="drag"
+                    style="display: inline-block;width:58px;">
+                    <div style="width: 58px;height:58px;line-height: 58px;">
+                      <Icon type="ios-camera" size="20"></Icon>
+                    </div>
+                  </Upload>
+                  <Modal title="View Image" v-model="visible">
+                    <img :src="imgName" v-if="visible" style="width: 100%">
+                  </Modal>
+
+                  <!-- <Input v-model="appeal.appealImages" type="textarea" maxlength="200" :rows="4" clearable
+                           style="width:260px"/> -->
+                </dd>
+              </dl>
+              <dl>
+                <dt></dt>
+                <dd>
+                  <Button type="primary" :loading="submitLoading" @click="appealSubmit()" style="margin-left: 5px">
+                    提交申诉
+                  </Button>
+                </dd>
+              </dl>
+            </div>
+
+            <div class="div-form-default">
+              <h3>对话详情</h3>
+              <dl>
+                <dt>对话记录</dt>
+                <dd>
+                  <div class="div-content">
+                    <p v-for="(item, index) in complaintInfo.orderComplaintCommunications">
+                      <span v-if="item.owner === 'STORE'">商家[{{ item.createTime }}]</span>
+                      <span v-if="item.owner === 'BUYER'">买家[{{ item.createTime }}]</span>
+                      <span v-if="item.owner === 'PLATFORM'">平台[{{ item.createTime }}]</span>
+                      {{ item.content }}
+                    </p>
+                  </div>
+
+                </dd>
+              </dl>
+              <dl v-if="complaintInfo.complainStatus!='COMPLETE'">
+                <dt>发送对话</dt>
+                <dd>
+                  <Input v-model="params.content" type="textarea" maxlength="200" :rows="4" clearable style="width:260px" />
+                </dd>
+              </dl>
+              <dl>
+                <dt></dt>
+                <dd v-if="complaintInfo.complainStatus != 'COMPLETE'">
+                  <div style="text-align: right;width: 45%;margin-top: 10px">
+                    <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                      回复
+                    </Button>
+                    <Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
+                      返回列表
+                    </Button>
+                  </div>
+                </dd>
+              </dl>
+            </div>
+            <div class="div-form-default" v-if="complaintInfo.complainStatus === 'COMPLETE'">
+              <h3>仲裁结果</h3>
+              <dl>
+                <dt>仲裁意见</dt>
+                <dd>
+                  {{ complaintInfo.arbitrationResult }}
+                </dd>
+              </dl>
+            </div>
+          </div>
+          <div class="div-flow-center">
+
+          </div>
+          <div class="div-flow-right">
+            <div class="div-form-default">
+              <h3>相关商品交易信息</h3>
+              <dl>
+                <dt>
+                  <img :src="complaintInfo.goodsImage" height="60px">
+                </dt>
+                <dd>
+                  <a>{{ complaintInfo.goodsName }}</a><br>
+                  <span>{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量)</span>
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default">
+              <h3>订单相关信息</h3>
+              <dl>
+                <dt>
+                  订单编号
+                </dt>
+                <dd>
+                  {{ complaintInfo.orderSn }}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  下单时间
+                </dt>
+                <dd>
+                  {{ complaintInfo.orderTime }}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  订单金额
+                </dt>
+                <dd>
+                  {{ complaintInfo.orderPrice }}
+                </dd>
+              </dl>
+
+            </div>
+            <div class="div-form-default">
+              <h3>收件人信息</h3>
+              <dl>
+                <dt>
+                  收货人
+                </dt>
+                <dd>
+                  {{ complaintInfo.consigneeName }}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货地址
+                </dt>
+                <dd>
+                  {{ complaintInfo.consigneeAddressPath }}
+                </dd>
+              </dl>
+              <dl>
+                <dt>
+                  收货人手机
+                </dt>
+                <dd>
+                  {{ complaintInfo.consigneeMobile }}
+                </dd>
+              </dl>
+            </div>
+
+          </div>
+        </div>
+
+      </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+import * as API_GOODS from "@/api/goods";
+export default {
+  name: "orderComplaint",
+  components: {
+    uploadPicThumb,
+  },
+  data() {
+    return {
+      //展示图片层
+      visible: false,
+      //上传图片路径
+      uploadFileUrl: API_GOODS.uploadFile,
+      accessToken: "", // 验证token
+      id: 0, // 投诉单id
+      complaintInfo: "", // 投诉信息
+      images: [], //会员申诉图片
+      appealImages: [], //商家申诉的图片
+      applyAppealImages: [], //商家申诉表单填写的图片
+      submitLoading: false, // 添加或编辑提交状态
+      //商家回复内容
+      params: {
+        content: "",
+        complainId: "",
+      },
+      //投诉
+      appeal: {
+        orderComplaintId: "",
+        appealContent: "",
+        appealImages: [],
+      },
+    };
+  },
+  watch: {
+    $route() {
+      this.getDetail();
+    },
+  },
+  methods: {
+    handleView(name) {
+      this.imgName = name;
+      this.visible = true;
+    },
+    handleRemove(file) {
+      this.appeal.appealImages = this.appeal.appealImages.filter(
+        (i) =>  i.url !== file.url
+      );
+    },
+    handleSuccessGoodsPicture(res, file) {
+      if (file.response) {
+        file.url = file.response.result;
+
+        this.appeal.appealImages.push(file);
+      }
+    },
+    handleBeforeUpload() {
+      const check =
+        this.images.images !== undefined && this.images.images.length > 5;
+      if (check) {
+        this.$Notice.warning({
+          title: "Up to five pictures can be uploaded.",
+        });
+      }
+      return !check;
+    },
+    handleFormatError(file) {
+      this.$Notice.warning({
+        title: "图片格式不正确",
+        desc:
+          "File format of " +
+          file.name +
+          " is incorrect, please select jpg or png.",
+      });
+    },
+    handleMaxSize(file) {
+      this.$Notice.warning({
+        title: "超过文件大小限制",
+        desc: "图片  " + file.name + " 不能超过2mb",
+      });
+    },
+    getDetail() {
+      this.loading = true;
+      API_Order.getComplainDetail(this.id).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.complaintInfo = res.result;
+          this.images = (res.result.images || "").split(",");
+          this.appealImages = (res.result.appealImages || "").split(",");
+        }
+      });
+    },
+    //返回列表
+    returnDataList() {
+      this.$router.push({
+        name: "orderComplaint",
+      });
+    },
+    //回复
+    handleSubmit() {
+      if (this.params.content === "") {
+        this.$Message.error("请填写对话内容");
+        return;
+      }
+      this.params.complainId = this.id;
+      API_Order.addOrderComplaint(this.params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("对话成功");
+          this.params.content = "";
+          this.getDetail();
+        }
+      });
+    },
+    //回复
+    appealSubmit() {
+
+      if (this.appeal.appealContent === "") {
+        this.$Message.error("请填写内容");
+        return;
+      }
+      this.appeal.appealImages = this.appeal.appealImages.map(item=> item.url)
+      this.appeal.orderComplaintId = this.id;
+      API_Order.appeal(this.appeal).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("申诉成功");
+          this.getDetail();
+        }
+      });
+    },
+  },
+  mounted() {
+    this.id = this.$route.query.id;
+    this.getDetail();
+    this.accessToken = {
+      accessToken: this.getStore("accessToken"),
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .ivu-col {
+  width: 100% !important;
+}
+
+.complain-upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+  margin-right: 4px;
+}
+.complain-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+.complain-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.complain-upload-list:hover .complain-upload-list-cover {
+  display: block;
+}
+.complain-upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+
+.main-content {
+  min-height: 600px;
+  padding: 10px;
+}
+
+.div-flow-left {
+  width: 49%;
+  letter-spacing: normal;
+  display: inline-block;
+  border-right: solid #f5f5f5 1px;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.div-img {
+  width: 130px;
+  height: 130px;
+  text-align: center;
+  float: left;
+}
+
+.div-flow-center {
+  width: 2%;
+  display: inline-block;
+}
+
+.div-flow-right {
+  width: 49%;
+  vertical-align: top;
+  word-spacing: normal;
+  display: inline-block;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.complain-img {
+  width: 120px;
+  height: 120px;
+  text-align: center;
+}
+
+.div-content {
+  overflow-y: auto;
+  overflow-x: auto;
+  height: 150px;
+}
+</style>
diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue
new file mode 100644
index 00000000..d6a6bfad
--- /dev/null
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="商品" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  clearable
+                  placeholder="请输入商品名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入订单编号"
+                  style="width: 200px"
+                />
+              </Form-item>
+
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 90px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.goodsImage" style="height: 80px;margin-top: 3px">
+                  </div>
+
+                  <div style="margin-left: 13px;margin-top: 3px;">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    name: "returnGoodsOrder",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          serviceType:"RETURN_GOODS",
+          orderSn:"",
+          memberName:"",
+          goodsName:""
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+
+          {
+            title: "售后单号",
+            key: "sn",
+            minWidth: 150,
+          },
+          {
+            title: "订单号",
+            key: "orderSn",
+            minWidth: 150,
+          },
+
+          {
+            title: "商品",
+            key: "sn",
+            minWidth: 200,
+            slot: "goodsSlot",
+
+          },
+          {
+            title: "申请退款金额",
+            key: "applyRefundPrice",
+            width: 130,
+            sortType: "desc",
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 120,
+          },
+          {
+            title: "状态",
+            key: "serviceStatus",
+            width: 120,
+            render: (h, params) => {
+              if (params.row.serviceStatus == "APPLY") {
+                return h('div', [h('span', { }, '申请售后'),]);
+              } else if (params.row.serviceStatus == "PASS") {
+                return h('div', [h('span', { }, '审核通过'),]);
+              } else if (params.row.serviceStatus == "REFUSE") {
+                return h('div', [h('span', { }, '审核拒绝'),]);
+              } else if (params.row.serviceStatus == "BUYER_RETURN") {
+                return h('div', [h('span', { }, '买家退货，待卖家收货'),]);
+              }else if (params.row.serviceStatus == "SELLER_RE_DELIVERY") {
+                return h('div', [h('span', { }, '商家换货/补发'),]);
+              }else if (params.row.serviceStatus == "SELLER_CONFIRM") {
+                return h('div', [h('span', { }, '卖家确认收货'),]);
+              }else if (params.row.serviceStatus == "SELLER_TERMINATION") {
+                return h('div', [h('span', { }, '卖家终止售后'),]);
+              }else if (params.row.serviceStatus == "BUYER_CONFIRM") {
+                return h('div', [h('span', { }, '买家确认收货'),]);
+              }else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('span', { }, '买家取消售后'),]);
+              }else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('span', { }, '完成'),]);
+              }
+            }
+          },
+          {
+            title: "申请时间",
+            key: "createTime",
+            width: 170
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 120,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      dropDown() {
+        if (this.drop) {
+          this.dropDownContent = "展开";
+          this.dropDownIcon = "ios-arrow-down";
+        } else {
+          this.dropDownContent = "收起";
+          this.dropDownIcon = "ios-arrow-up";
+        }
+        this.drop = !this.drop;
+      },
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "return-goods-order-detail",
+          query: { sn: sn },
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue
new file mode 100644
index 00000000..e9076b67
--- /dev/null
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@@ -0,0 +1,312 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="商品" prop="goodsName">
+                <Input
+                  type="text"
+                  v-model="searchForm.goodsName"
+                  clearable
+                  placeholder="请输入商品名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入订单编号"
+                  style="width: 200px"
+                />
+              </Form-item>
+
+              <Form-item label="申请时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+
+              <!-- 商品栏目格式化 -->
+              <template slot="goodsSlot" slot-scope="scope">
+                <div style="margin-top: 5px;height: 90px; display: flex;">
+                  <div style="">
+                    <img :src="scope.row.goodsImage" style="height: 80px;margin-top: 3px">
+                  </div>
+
+                  <div style="margin-left: 13px;margin-top: 3px;">
+                    <div class="div-zoom" >
+                      <a>{{scope.row.goodsName}}</a>
+                    </div>
+                  </div>
+                </div>
+
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    name: "returnMoneyOrder",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          serviceType:"RETURN_MONEY",
+          orderSn:"",
+          memberName:"",
+          goodsName:""
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            title: "退款编号",
+            key: "sn",
+            minWidth: 150,
+          },
+          {
+            title: "订单号",
+            key: "orderSn",
+            minWidth: 150,
+          },
+
+          {
+            title: "商品",
+            key: "sn",
+            minWidth: 250,
+            sortable: false,
+            slot: "goodsSlot",
+          },
+          {
+            title: "申请退款金额",
+            key: "applyRefundPrice",
+            width: 130,
+            sortType: "desc",
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "会员",
+            key: "memberName",
+            minWidth: 130,
+            tooltip: true
+          },
+          {
+            title: "申请时间",
+            key: "createTime",
+            width: 170
+          },
+          {
+            title: "售后状态",
+            key: "serviceStatus",
+            minWidth: 120,
+            render: (h, params) => {
+              if (params.row.serviceStatus == "APPLY") {
+                return h('div', [h('span', { }, '申请售后'),]);
+              } else if (params.row.serviceStatus == "PASS") {
+                return h('div', [h('span', { }, '审核通过'),]);
+              } else if (params.row.serviceStatus == "REFUSE") {
+                return h('div', [h('span', { }, '审核拒绝'),]);
+              } else if (params.row.serviceStatus == "BUYER_RETURN") {
+                return h('div', [h('span', { }, '买家退货，待卖家收货'),]);
+              }else if (params.row.serviceStatus == "SELLER_RE_DELIVERY") {
+                return h('div', [h('span', { }, '商家换货/补发'),]);
+              }else if (params.row.serviceStatus == "SELLER_CONFIRM") {
+                return h('div', [h('span', { }, '卖家确认收货'),]);
+              }else if (params.row.serviceStatus == "SELLER_TERMINATION") {
+                return h('div', [h('span', { }, '卖家终止售后'),]);
+              }else if (params.row.serviceStatus == "BUYER_CONFIRM") {
+                return h('div', [h('span', { }, '买家确认收货'),]);
+              }else if (params.row.serviceStatus == "BUYER_CANCEL") {
+                return h('div', [h('span', { }, '买家取消售后'),]);
+              }else if (params.row.serviceStatus == "WAIT_REFUND") {
+                return h('div', [h('span', { }, '等待平台退款'),]);
+              }else if (params.row.serviceStatus == "COMPLETE") {
+                return h('div', [h('span', { }, '完成'),]);
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 100,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "return-goods-order-detail",
+          query: { sn: sn },
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
new file mode 100644
index 00000000..4b54b99b
--- /dev/null
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -0,0 +1,697 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <div class="main-content">
+            <div class="div-flow-left">
+              <div class="div-form-default">
+                <h3>售后申请</h3>
+                <dl>
+                  <dt>售后状态</dt>
+                  <dd v-if="afterSaleInfo.serviceStatus =='APPLY'">申请售后</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='PASS'">申请通过</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='REFUSE'">申请拒绝</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">买家退货，待卖家收货</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">商家换货</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_CONFIRM'">卖家确认收货</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='SELLER_TERMINATION'">卖家终止售后</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CONFIRM'">买家确认收货</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='BUYER_CANCEL'">买家取消售后</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='WAIT_REFUND'">等待平台退款</dd>
+                  <dd v-if="afterSaleInfo.serviceStatus =='COMPLETE'">已完成</dd>
+                </dl>
+                <dl>
+                  <dt>退货退款编号</dt>
+                  <dd>{{ afterSaleInfo.sn }}</dd>
+                </dl>
+                <dl>
+                  <dt>退货退款原因</dt>
+                  <dd>{{ afterSaleInfo.reason }}</dd>
+                </dl>
+                <dl>
+                  <dt>申请退款金额</dt>
+                  <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
+                </dl>
+                <dl v-if="afterSaleInfo.actualRefundPrice">
+                  <dt>实际退款金额</dt>
+                  <dd>{{ afterSaleInfo.actualRefundPrice | unitPrice('￥') }}</dd>
+                </dl>
+                <dl v-if="afterSaleInfo.refundPoint">
+                  <dt>退还积分</dt>
+                  <dd>{{ afterSaleInfo.refundPoint }}</dd>
+                </dl>
+                <dl>
+                  <dt>退货数量</dt>
+                  <dd>{{ afterSaleInfo.num }}</dd>
+                </dl>
+                <dl>
+                  <dt>问题描述</dt>
+                  <dd>{{ afterSaleInfo.problemDesc }}</dd>
+                </dl>
+                <dl>
+                  <dt>凭证</dt>
+                  <dd v-if="afterSaleImage == ''">
+                    暂无凭证
+                  </dd>
+                  <dd v-else>
+                    <div class="div-img" @click="()=>{picFile=item; picVisible = true}"
+                         v-for="(item, index) in afterSaleImage" :key="index">
+                      <img class="complain-img" :src="item">
+
+                    </div>
+
+                    <Modal footer-hide mask-closable v-model="picVisible">
+                      <img :src="picFile" alt="无效的图片链接" style="width: 100%; margin: 0 auto; display: block"/>
+                    </Modal>
+
+                  </dd>
+                </dl>
+              </div>
+
+              <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
+                <h3>商家处理意见</h3>
+                <dl>
+                  <dt>商家</dt>
+                  <dd>
+                    <div class="div-content">
+                      {{ afterSaleInfo.storeName }}
+                    </div>
+
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>是否同意</dt>
+                  <dd>
+                    <div class="div-content">
+                      <RadioGroup v-model="params.serviceStatus">
+                        <Radio label="PASS">
+                          <span>同意</span>
+                        </Radio>
+                        <Radio label="REFUSE">
+                          <span>拒绝</span>
+                        </Radio>
+                      </RadioGroup>
+                    </div>
+
+                  </dd>
+                </dl>
+
+                <dl>
+                  <dt>申请退款金额</dt>
+                  <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
+                </dl>
+                <dl>
+                  <dt>实际退款金额</dt>
+                  <dd>
+                    <Input v-model="params.actualRefundPrice" style="width:260px"/>
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>备注信息</dt>
+                  <dd>
+                    <Input v-model="params.remark" type="textarea" maxlength="200" :rows="4" clearable
+                           style="width:260px"/>
+                  </dd>
+                </dl>
+                <dl>
+                  <dt></dt>
+                  <dd>
+                    <div style="text-align: right;width: 45%;margin-top: 10px">
+                      <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
+                        确定
+                      </Button>
+                    </div>
+                  </dd>
+                </dl>
+              </div>
+              <div class="div-form-default" v-if="afterSaleInfo.serviceStatus !='APPLY'">
+                <h3>商家处理</h3>
+                <dl>
+                  <dt>商家</dt>
+                  <dd>
+                    <div class="div-content">
+                      {{ afterSaleInfo.storeName }}
+                    </div>
+
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>审核结果</dt>
+                  <dd>
+                    <div class="div-content">
+                    <span v-if="params.serviceStatus=='PASS'">
+                      审核通过
+                    </span>
+                      <span v-else>
+                      审核拒绝
+                    </span>
+                    </div>
+
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>备注信息</dt>
+                  <dd>
+                    {{ afterSaleInfo.auditRemark }}
+                  </dd>
+                </dl>
+              </div>
+            </div>
+            <div class="div-flow-center">
+
+            </div>
+            <div class="div-flow-right">
+              <div class="div-form-default">
+                <h3>相关商品交易信息</h3>
+                <dl>
+                  <dt>
+                    <img :src="afterSaleInfo.goodsImage" height="60px">
+                  </dt>
+                  <dd>
+                    <a>{{ afterSaleInfo.goodsName }}</a><br>
+                    <span>{{ afterSaleInfo.num }}(数量)</span><br>
+
+                  </dd>
+                </dl>
+
+              </div>
+              <div class="div-form-default">
+                <h3>订单相关信息</h3>
+                <dl>
+                  <dt>
+                    订单编号
+                  </dt>
+                  <dd>
+                    {{ afterSaleInfo.orderSn }}
+                  </dd>
+                </dl>
+
+              </div>
+              <div class="div-form-default"
+                   v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN' || afterSaleInfo.serviceStatus =='COMPLETE' &&  afterSaleInfo.serviceType !='RETURN_MONEY'">
+                <h3>回寄物流信息</h3>
+                <dl>
+                  <dt>
+                    物流公司
+                  </dt>
+                  <dd>
+                    {{ afterSaleInfo.mlogisticsName }}
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>
+                    物流单号
+                  </dt>
+                  <dd>
+                    {{ afterSaleInfo.mlogisticsNo }}
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>操作</dt>
+                  <dd>
+                    <Button type="info" :loading="submitLoading" @click="sellerConfirmSubmit('PASS')"
+                            style="margin-left: 5px" v-if="afterSaleInfo.afterSaleAllowOperationVO.rog">
+                      确认收货
+                    </Button>
+                    <Button type="primary" :loading="submitLoading" @click="sellerConfirmSubmit('REFUSE')"
+                            style="margin-left: 5px" v-if="afterSaleInfo.afterSaleAllowOperationVO.rog">
+                      拒收
+                    </Button>
+                    <Button type="default" :loading="submitLoading" @click="logisticsBuyer()" style="margin-left: 5px">
+                      查询物流
+                    </Button>
+                  </dd>
+                </dl>
+
+              </div>
+              <div class="div-form-default"
+                   v-if="afterSaleInfo.afterSaleAllowOperationVO.return_goods && afterSaleInfo.serviceType == 'EXCHANGE_GOODS'">
+                <h3>换货</h3>
+                <dl>
+                  <dt>
+                    换货
+                  </dt>
+                  <dd>
+                    <Button type="primary" :loading="submitLoading" @click="exchangeGoods" style="margin-left: 5px">
+                      发货
+                    </Button>
+                  </dd>
+                </dl>
+              </div>
+              <div class="div-form-default"
+                   v-if=" afterSaleInfo.serviceType == 'EXCHANGE_GOODS' && afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">
+                <h3>物流信息</h3>
+                <dl>
+                  <dt>
+                    物流公司
+                  </dt>
+                  <dd>
+                    {{ afterSaleInfo.slogisticsName }}
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>
+                    物流单号
+                  </dt>
+                  <dd>
+                    {{ afterSaleInfo.slogisticsNo }}
+                  </dd>
+                </dl>
+                <dl>
+                  <dt>操作</dt>
+                  <dd>
+                    <Button type="primary" :loading="submitLoading" @click="logisticsSeller()" style="margin-left: 5px">
+                      查询物流
+                    </Button>
+                  </dd>
+                </dl>
+
+              </div>
+
+            </div>
+          </div>
+
+        </Card>
+      </Col>
+    </Row>
+    <!-- 订单发货 -->
+    <Modal v-model="modalVisible" width="500px">
+      <p slot="header">
+        <span>订单发货</span>
+      </p>
+      <div>
+        <Form ref="form" :model="form" :label-width="90" :rules="formValidate" style="position:relative">
+          <FormItem label="物流公司" prop="logisticsId">
+            <Select v-model="form.logisticsId" placeholder="请选择" style="width:250px">
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{ item.name }}
+              </Option>
+            </Select>
+          </FormItem>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" style="width:250px"/>
+          </FormItem>
+        </Form>
+
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button size="large" @click="orderDeliverCancel">取消</Button>
+        <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
+
+      </div>
+    </Modal>
+    <!-- 查询物流 -->
+    <Modal v-model="logisticsModal" width="40">
+      <p slot="header">
+        <span>查询物流</span>
+      </p>
+      <div class="layui-layer-wrap">
+        <dl>
+          <dt>售后单号：</dt>
+          <dd>
+            <div class="text-box">{{ sn }}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>物流公司：</dt>
+          <dd>
+            <div class="text-box">{{ logisticsInfo.shipper }}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>快递单号：</dt>
+          <dd>
+            <div nctype="ordersSn" class="text-box">{{ logisticsInfo.logisticCode }}</div>
+          </dd>
+        </dl>
+        <div class="div-express-log">
+          <ul class="express-log">
+            <li v-for="(item,index) in logisticsInfo.traces" :key="index">
+              <span class="time">{{ item.AcceptTime }}</span>
+              <span class="detail">{{ item.AcceptStation }}</span>
+            </li>
+          </ul>
+        </div>
+
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="logisticsClose">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+
+export default {
+  name: "orderComplaint",
+  components: {
+    uploadPicThumb,
+  },
+  data() {
+    return {
+      picFile: "", // 预览图片地址
+      picVisible: false, // 预览图片
+      sn: "", // 订单号
+      logisticsModal: false, //查询物流模态框
+      logisticsInfo: {}, //物流信息
+      form: { // 物流信息
+        logisticsNo: "",
+        logisticsId: "",
+      }, //换货发货form
+      formValidate: {
+        logisticsNo: [
+          {required: true, message: "发货单号不能为空", trigger: "change"},
+        ],
+        logisticsId: [
+          {required: true, message: "请选择物流公司", trigger: "blur"},
+        ],
+      },
+      modalVisible: false, // 添加或编辑显示
+      afterSaleInfo: { // 售后信息
+        afterSaleAllowOperationVO: {
+          return_goods: false,
+        },
+      },
+      afterSaleImage: [], //会员申诉图片
+      appealImages: [], //商家申诉的图片
+      submitLoading: false, // 添加或编辑提交状态
+      checkedLogistics: [], //选中的物流公司集合
+      //商家处理意见
+      params: {
+        serviceStatus: "PASS",
+        remark: "",
+        actualRefundPrice: 0,
+      },
+    };
+  },
+  watch: {
+    $route(to, from) {
+    },
+  },
+  methods: {
+    getDetail() {
+      this.loading = true;
+      API_Order.afterSaleOrderDetail(this.sn).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.afterSaleInfo = res.result;
+          this.afterSaleImage = (res.result.afterSaleImage || "").split(",");
+          this.params.actualRefundPrice = res.result.flowPrice;
+        }
+      });
+    },
+    //换货弹出框
+    exchangeGoods() {
+      API_Order.getLogisticsChecked().then((res) => {
+        if (res.success) {
+          this.checkedLogistics = res.result;
+          this.modalVisible = true;
+          this.getDetail();
+        }
+      });
+    },
+    orderDeliverCancel() {
+      this.modalVisible = false;
+    },
+    //商家确认收货
+    sellerConfirmSubmit(type) {
+      let title = "确认收货";
+      let content = "请确认已经收到退货货物?";
+      let message = "收货成功";
+      if (type !== "PASS") {
+        title = "确认拒收";
+        content = "确认拒收此货物？";
+        message = "拒收成功";
+        this.params.serviceStatus = "REFUSE";
+      }
+
+      this.$Modal.confirm({
+        title: title,
+        content: content,
+        loading: true,
+        onOk: () => {
+          API_Order.afterSaleSellerConfirm(this.sn, this.params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success(message);
+              this.getDetail();
+            }
+          });
+        },
+      });
+    },
+    //查询物流
+    logisticsSeller() {
+      this.logisticsModal = true;
+      API_Order.getSellerDeliveryTraces(this.sn).then((res) => {
+        if (res.success && res.result != null) {
+          this.logisticsInfo = res.result;
+        }
+      });
+    },
+    //查询物流
+    logisticsBuyer() {
+      this.logisticsModal = true;
+      API_Order.getAfterSaleTraces(this.sn).then((res) => {
+        if (res.success && res.result != null) {
+          this.logisticsInfo = res.result;
+        }
+      });
+    },
+    //关闭物流弹出框
+    logisticsClose() {
+      this.logisticsModal = false;
+    },
+
+    //换货发货
+    orderDeliverySubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          API_Order.afterSaleSellerDelivery(this.sn, this.form).then((res) => {
+            if (res.success) {
+              this.$Message.success("订单发货成功");
+              this.modalVisible = false;
+              this.getDataDetail();
+            }
+          });
+        }
+      });
+    },
+    //回复
+    handleSubmit() {
+      if (this.params.remark == "") {
+        this.$Message.error("请输入备注信息");
+        return;
+      }
+      API_Order.afterSaleSellerReview(this.sn, this.params).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("审核成功");
+          this.params.remark = "";
+          this.getDetail();
+        }
+      });
+    },
+  },
+
+  mounted() {
+    this.sn = this.$route.query.sn;
+    this.getDetail();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.ivu-row {
+  display: block !important;
+}
+
+.main-content {
+  min-height: 600px;
+  padding: 10px;
+}
+
+.div-flow-left {
+  width: 49%;
+  letter-spacing: normal;
+  display: inline-block;
+  border-right: solid #f5f5f5 1px;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+dl dt {
+  width: 100px;
+  text-align: right;
+}
+
+.div-express-log {
+  max-height: 300px;
+  border: solid 1px #e7e7e7;
+  background: #fafafa;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+.express-log {
+  margin-right: -10px;
+  margin: 5px;
+  padding: 10px;
+  list-style-type: none;
+
+  .time {
+    width: 30%;
+    display: inline-block;
+    float: left;
+  }
+
+  .detail {
+    width: 60%;
+    margin-left: 30px;
+    display: inline-block;
+  }
+
+  li {
+    line-height: 30px;
+  }
+}
+
+.layui-layer-wrap {
+  dl {
+    border-top: solid 1px #f5f5f5;
+    margin-top: -1px;
+    overflow: hidden;
+
+    dt {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 1% 8px 0;
+      color: #999;
+    }
+
+    dd {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 0 8px 8px;
+      border-left: solid 1px #f5f5f5;
+
+      .text-box {
+        line-height: 40px;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.div-img {
+  width: 130px;
+  height: 130px;
+  text-align: center;
+  float: left;
+}
+
+.div-flow-center {
+  width: 2%;
+  display: inline-block;
+}
+
+.div-flow-right {
+  width: 49%;
+  vertical-align: top;
+  word-spacing: normal;
+  display: inline-block;
+
+  .div-form-default {
+    width: 97%;
+
+    h3 {
+      font-weight: 600;
+      line-height: 22px;
+      background-color: #f5f5f5;
+      padding: 6px 0 6px 12px;
+      border-bottom: solid 1px #e7e7e7;
+    }
+
+    dl {
+      font-size: 0;
+      line-height: 30px;
+      clear: both;
+      padding: 0;
+      margin: 0;
+      border-bottom: dotted 1px #e6e6e6;
+      overflow: hidden;
+
+      dt {
+        display: inline-block;
+        width: 13%;
+        vertical-align: top;
+        text-align: right;
+        padding: 15px 1% 15px 0;
+        margin: 0;
+        font-size: 12px;
+      }
+
+      dd {
+        display: inline-block;
+        width: 84%;
+        padding: 15px 0 15px 1%;
+        margin: 0;
+        border-left: 1px solid #f0f0f0;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.complain-img {
+  width: 120px;
+  height: 120px;
+  text-align: center;
+}
+</style>
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
new file mode 100644
index 00000000..6b9c5ced
--- /dev/null
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -0,0 +1,837 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col style="width:100%;">
+      <Row style="flex-direction: column;width: 100%;">
+        <Card style="height: 60px">
+          <div style="">
+            <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
+            <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址
+            </Button>
+            <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
+            <Button @click="orderLog" type="primary">订单日志</Button>
+            <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
+            <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
+          </div>
+        </Card>
+
+          <Card style="height: 400px">
+            <div style="width: 30%; float: left; margin-left: 20px">
+              <div class="div-item">
+                <div class="div-item-left">订单号：</div>
+                <div class="div-item-right">{{ orderInfo.order.sn }}</div>
+              </div>
+              <div class="div-item">
+                <div class="div-item-left">订单来源：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.order.clientType }}
+                </div>
+              </div>
+            </div>
+
+            <div class="div-item">
+              <div class="div-item-left">订单状态：</div>
+              <div class="div-item-right">
+                {{ orderInfo.orderStatusValue }}
+              </div>
+            </div>
+
+            <div class="div-item">
+              <div class="div-item-left">下单时间：</div>
+              <div class="div-item-right">
+                {{ orderInfo.order.createTime }}
+              </div>
+            </div>
+
+
+            <div style="width: 30%; float: left; margin-left: 20px">
+              <div class="div-item" v-if="orderInfo.order.needReceipt == false">
+                <div class="div-item-left">发票信息：</div>
+                <div class="div-item-right">暂无发票信息</div>
+              </div>
+
+            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+              <div class="div-item-left">发票抬头：</div>
+              <div class="div-item-right">{{ orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : '暂无' }}</div>
+            </div>
+
+            <div class="div-item" v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId">
+              <div class="div-item-left">发票税号：</div>
+              <div class="div-item-right">{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : '暂无' }}</div>
+            </div>
+
+            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+              <div class="div-item-left">发票内容：</div>
+              <div class="div-item-right">{{ orderInfo.receipt.receiptContent ? orderInfo.receipt.receiptContent : '暂无' }}</div>
+            </div>
+
+            <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+              <div class="div-item-left">发票金额：</div>
+              <div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
+            </div>
+
+              <div class="div-item" v-if="orderInfo.order.needReceipt == true">
+                <div class="div-item-left">是否开票：</div>
+                <div class="div-item-right">{{ orderInfo.receipt.receiptStatus == 0 ? '未开' : '已开' }}</div>
+              </div>
+            </div>
+            <div style="width: 36%; float: left">
+              <div class="div-item">
+                <div class="div-item-left">收货信息：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.order.consigneeName }}
+                  {{ orderInfo.order.consigneeMobile }}
+                  {{ orderInfo.order.consigneeAddressPath }}
+                  {{ orderInfo.order.consigneeDetail }}
+                </div>
+              </div>
+              <div class="div-item">
+                <div class="div-item-left">支付方式：</div>
+                <div class="div-item-right">
+                  {{ orderInfo.paymentMethodValue }}
+                </div>
+              </div>
+
+              <div class="div-item">
+                <div class="div-item-left">买家留言：</div>
+                <div class="div-item-right">{{ orderInfo.order.remark }}</div>
+              </div>
+
+            <div class="div-item">
+              <div class="div-item-left">配送方式：</div>
+              <div class="div-item-right">
+                {{
+                    orderInfo.deliveryMethodValue
+                      ? orderInfo.deliveryMethodValue
+                      : "暂无配送方式"
+                  }}
+              </div>
+            </div>
+          </div>
+        </Card>
+      </Row>
+      </Col>
+
+      <Card>
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
+          <!-- 商品栏目格式化 -->
+          <template slot="goodsSlot" slot-scope="scope">
+            <div style="margin-top: 5px; height: 80px; display: flex">
+              <div style="">
+                <img :src="scope.row.image" style="height: 60px; margin-top: 1px; width: 60px" />
+              </div>
+
+              <div style="margin-left: 13px">
+                <div class="div-zoom">
+                  <a>{{ scope.row.goodsName }}</a>
+                </div>
+                <div>
+                  <span v-for="(item, key) in JSON.parse(scope.row.specs)">
+                    <span v-show="key!='images'" style="font-size: 12px;color: #999999;">
+                      {{key}} : {{item}}
+                    </span>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </template>
+        </Table>
+        <div class="goods-total">
+          <ul>
+            <li>
+              <span class="label">商品总额：</span>
+              <span class="txt">{{ orderInfo.order.priceDetailDTO.goodsPrice | unitPrice('￥')}}</span>
+            </li>
+            <li>
+              <span class="label">优惠金额：</span>
+              <span class="txt">
+                {{
+                  orderInfo.order.priceDetailDTO.couponPrice +
+                  orderInfo.order.priceDetailDTO.discountPrice
+                | unitPrice('￥')}}
+              </span>
+            </li>
+            <li>
+              <span class="label">运费：</span>
+              <span class="txt">{{ orderInfo.order.freightPrice | unitPrice('￥')}}</span>
+            </li>
+            <li v-if="orderInfo.order.priceDetailDTO.payPoint != 0">
+              <span class="label">使用积分：</span>
+              <span class="txt">{{
+                orderInfo.order.priceDetailDTO.payPoint
+              }}</span>
+            </li>
+
+            <li>
+              <span class="label">应付金额：</span>
+              <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
+            </li>
+          </ul>
+        </div>
+      </Card>
+    </Row>
+    <Modal v-model="modal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>修改金额</span>
+      </p>
+      <div>
+        <Form ref="modifyPriceForm" :model="modifyPriceForm" label-position="left" :label-width="100" :rules="modifyPriceValidate">
+          <FormItem label="订单金额" prop="orderPrice">
+            <InputNumber style="width:100%;" v-model="modifyPriceForm.orderPrice" size="large" :min="0.01" :max="99999"><span slot="append">元</span></InputNumber>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="modifyPriceSubmit">调整</Button>
+      </div>
+    </Modal>
+    <!--收件地址弹出框-->
+    <Modal v-model="addressModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>修改收件信息</span>
+      </p>
+      <div>
+        <Form ref="addressForm" :model="addressForm" label-position="left" :label-width="100" :rules="addressRule">
+          <FormItem label="收件人" prop="consigneeName">
+            <Input v-model="addressForm.consigneeName" size="large" maxlength="20"></Input>
+          </FormItem>
+          <FormItem label="联系方式" prop="consigneeMobile">
+            <Input v-model="addressForm.consigneeMobile" size="large" maxlength="11"></Input>
+          </FormItem>
+          <FormItem label="地址信息" prop="consigneeAddressPath">
+            <Input v-model="addressForm.consigneeAddressPath" disabled style="width: 325px" v-if="showRegion == false" />
+            <Button v-if="showRegion == false" size="small" @click="regionClick" :loading="submitLoading" type="primary" style="margin-left: 8px">修改
+            </Button>
+            <region style="width: 400px" @selected="selectedRegion" v-if="showRegion == true" />
+          </FormItem>
+          <FormItem label="详细地址" prop="consigneeDetail">
+            <Input v-model="addressForm.consigneeDetail" size="large" maxlength="11"></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="editAddressSubmit">修改</Button>
+      </div>
+    </Modal>
+    <!-- 订单核销 -->
+    <Modal v-model="orderTakeModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>订单核销</span>
+      </p>
+      <div>
+        <Form ref="orderTakeForm" :model="orderTakeForm" label-position="left" :label-width="100" :rules="orderTakeValidate">
+          <FormItem label="核销码" prop="qrCode">
+            <Input v-model="orderTakeForm.qrCode" size="large" maxlength="10"></Input>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button type="success" size="large" @click="orderTakeSubmit">核销</Button>
+      </div>
+    </Modal>
+    <!-- 订单日志 -->
+    <Modal v-model="orderLogModal" width="60">
+      <p slot="header">
+        <span>订单日志</span>
+      </p>
+      <div class="order-log-div">
+        <Table :loading="loading" border :columns="orderLogColumns" :data="orderLogData" ref="table" sortable="custom"></Table>
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="handelCancel">取消</Button>
+      </div>
+    </Modal>
+    <!-- 查询物流 -->
+    <Modal v-model="logisticsModal" width="40">
+      <p slot="header">
+        <span>查询物流</span>
+      </p>
+      <div class="layui-layer-wrap">
+        <dl>
+          <dt>订单号：</dt>
+          <dd>
+            <div class="text-box">{{ sn }}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>物流公司：</dt>
+          <dd>
+            <div class="text-box">{{ logisticsInfo.shipper }}</div>
+          </dd>
+        </dl>
+        <dl>
+          <dt>快递单号：</dt>
+          <dd>
+            <div nctype="ordersSn" class="text-box">
+              {{ logisticsInfo.logisticCode }}
+            </div>
+          </dd>
+        </dl>
+        <div class="div-express-log">
+          <ul class="express-log">
+            <li v-for="(item, index) in logisticsInfo.traces" :key="index">
+              <span class="time">{{ item.AcceptTime }}</span>
+              <span class="detail">{{ item.AcceptStation }}</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="logisticsClose">取消</Button>
+      </div>
+    </Modal>
+    <!-- 订单发货 -->
+    <Modal v-model="orderDeliverModal" width="500px">
+      <p slot="header">
+        <span>订单发货</span>
+      </p>
+      <div>
+        <Form ref="orderDeliveryForm" :model="orderDeliveryForm" :label-width="90" :rules="orderDeliverFormValidate" style="position: relative">
+          <FormItem label="物流公司" prop="logisticsId">
+            <Select v-model="orderDeliveryForm.logisticsId" placeholder="请选择" style="width: 250px">
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.id">{{ item.name }}
+              </Option>
+            </Select>
+          </FormItem>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="orderDeliveryForm.logisticsNo" style="width: 250px" />
+          </FormItem>
+        </Form>
+      </div>
+
+      <div slot="footer" style="text-align: right">
+        <Button size="large" @click="orderDeliverHandelCancel">取消</Button>
+        <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import * as API_Order from "@/api/order";
+import liliMap from "@/views/my-components/map/index";
+import * as RegExp from "@/libs/RegExp.js";
+import region from "@/views/lili-components/region";
+
+export default {
+  name: "orderDetail",
+  components: {
+    liliMap,
+    region,
+  },
+  data() {
+    return {
+      submitLoading: false, // 添加或编辑提交状态
+      region: [], //地区
+      regionId: [], //地区id
+      showRegion: false,
+      orderLogInfo: [], //订单日志数据
+      orderLogModal: false, //弹出调整价格框
+      logisticsModal: false, //弹出查询物流框
+      receiptModal: false, //开发票弹出框
+      orderDeliverModal: false, //订单发货弹出框
+      orderTakeModal: false, //订单核销弹出框
+      checkedLogistics: [], //选中的物流公司集合
+      allowOperation: {}, //订单可才做选项
+      logisticsInfo: {
+        shipper: "",
+      }, //物流信息
+      sn: "", //订单编号
+      orderInfo: { // 订单信息
+        order: {
+          priceDetailDTO: {},
+        },
+      },
+      modal: false, //弹出调整价格框
+      searchForm: {
+        pageNumber: 1, // 当前页数
+        pageSize: 100, // 页面大小
+      },
+      //调整价格表单
+      modifyPriceForm: {
+        orderPrice: 0,
+      },
+      //订单核销表单
+      orderTakeForm: {
+        qrCode: "",
+      },
+      //验证要调整的订单金额
+      orderTakeValidate: {
+        qrCode: [
+          { required: true, message: "订单核销码不能为空", trigger: "blur" },
+        ],
+      },
+      //订单发货
+      orderDeliveryForm: {
+        logisticsNo: "", //发货单号
+        logisticsId: "", //物流公司
+      },
+      //验证要调整的订单金额
+      modifyPriceValidate: {
+        orderPrice: [
+          { required: true, message: "请输入大于等于0或小于99999的合法金额" },
+          {
+            pattern: /^\d+(\.(([1-9])|(0[1-9])|([\d^0]\d)))?$/,
+            message: "请输入大于0小于9999的合法金额",
+            trigger: "change",
+          },
+        ],
+      },
+      addressModal: false, //弹出修改收件信息框
+      //收件地址表单
+      addressForm: {
+        consigneeName: "",
+        consigneeMobile: "",
+        consigneeDetail: "",
+        consigneeAddressPath: "",
+        consigneeAddressIdPath: "",
+      },
+      orderDeliverFormValidate: {
+        logisticsNo: [
+          { required: true, message: "发货单号不能为空", trigger: "change" },
+        ],
+        logisticsId: [
+          { required: true, message: "请选择物流公司", trigger: "blur" },
+        ],
+      },
+      addressRule: {
+        consigneeName: [
+          { required: true, message: "收货人姓名不能为空", trigger: "blur" },
+        ],
+        consigneeMobile: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+          {
+            pattern: RegExp.mobile,
+            trigger: "blur",
+            message: "请输入正确的手机号",
+          },
+        ],
+        consigneeDetail: [
+          { required: true, message: "详细地址不能为空", trigger: "blur" },
+        ],
+      },
+
+      columns: [
+        {
+          title: "商品",
+          key: "goodsName",
+          minWidth: 400,
+          slot: "goodsSlot",
+        },
+        {
+          title: "优惠",
+          key: "num",
+          minWidth: 100,
+          render: (h, params) => {
+            let resultText = "";
+            if (params.row.promotionType) {
+              let type = params.row.promotionType.split(",");
+              if (type.indexOf("PINTUAN") != -1) {
+                resultText += "拼团 ";
+              }
+              if (type.indexOf("SECKILL") != -1) {
+                resultText += "秒杀 ";
+              }
+              if (type.indexOf("COUPON") != -1) {
+                resultText += "优惠券 ";
+              }
+              if (type.indexOf("FULL_DISCOUNT") != -1) {
+                resultText += "满减 ";
+              }
+              if (type.indexOf("POINTS_GOODS") != -1) {
+                resultText += "积分商品 ";
+              }
+            }
+            if (resultText === "") {
+              resultText = "暂无未参与任何促销";
+            }
+            return h("div", resultText);
+          },
+        },
+        {
+          title: "单价",
+          key: "unitPrice",
+          minWidth: 100,
+          render: (h, params) => {
+            if (!params.row.priceDetailDTO.unitPrice) {
+              return h("div", this.$options.filters.unitPrice(0, "￥"));
+            }
+            return h(
+              "div",
+              this.$options.filters.unitPrice(
+                params.row.priceDetailDTO.unitPrice,
+                "￥"
+              )
+            );
+          },
+        },
+
+        {
+          title: "数量",
+          key: "num",
+          minWidth: 80,
+        },
+        {
+          title: "小计",
+          key: "subTotal",
+          minWidth: 100,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.subTotal, "￥")
+            );
+          },
+        },
+      ],
+      data: [], // 表单数据
+      orderLogColumns: [
+        // 表头
+        {
+          title: "时间",
+          key: "createTime",
+          minWidth: 120,
+        },
+        {
+          title: "操作者",
+          key: "operatorName",
+          minWidth: 120,
+        },
+        {
+          title: "操作类型",
+          key: "operatorType",
+          minWidth: 120,
+        },
+        {
+          title: "日志",
+          key: "message",
+          minWidth: 200,
+        },
+      ],
+      orderLogData: [],
+    };
+  },
+  methods: {
+    //修改地址
+    regionClick() {
+      this.showRegion = true;
+      this.regionId = "";
+    },
+    //弹出订单核销框
+    orderTake() {
+      this.orderTakeModal = true;
+    },
+    //订单核销提交
+    orderTakeSubmit() {
+      this.$refs.orderTakeForm.validate((valid) => {
+        if (valid) {
+          API_Order.orderTake(this.sn, this.orderTakeForm).then((res) => {
+            if (res.success) {
+              this.$Message.success("订单核销成功");
+              this.orderTakeModal = false;
+              this.getDataDetail();
+            }
+          });
+        }
+      });
+    },
+    //获取订单详细信息
+    getDataDetail() {
+      this.loading = true;
+      API_Order.getOrderDetail(this.sn).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.orderInfo = res.result;
+          this.allowOperation = res.result.allowOperationVO;
+          this.data = res.result.orderItems;
+          this.orderLogData = res.result.orderLogs;
+        }
+      });
+    },
+
+    modifyPrice() {
+      //默认要修改的金额为订单总金额
+      this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
+      this.modal = true;
+    },
+    //修改订单金额提交
+    modifyPriceSubmit() {
+      this.$refs.modifyPriceForm.validate((valid) => {
+        if (valid) {
+          API_Order.modifyOrderPrice(this.sn, this.modifyPriceForm).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("修改订单金额成功");
+                this.modal = false;
+                this.getDataDetail();
+              }
+            }
+          );
+        }
+      });
+    },
+    // 选中的地址
+    selectedRegion(val) {
+      this.region = val[1];
+      this.regionId = val[0];
+    },
+    //查询物流
+    logistics() {
+      this.logisticsModal = true;
+      API_Order.getTraces(this.sn).then((res) => {
+        if (res.success && res.result != null) {
+          this.logisticsInfo = res.result;
+        }
+      });
+    },
+    //关闭物流弹出框
+    logisticsClose() {
+      this.logisticsModal = false;
+    },
+    //订单发货
+    orderDeliver() {
+      API_Order.getLogisticsChecked().then((res) => {
+        if (res.success) {
+          this.checkedLogistics = res.result;
+          this.orderDeliverModal = true;
+        }
+      });
+    },
+    //订单日志取消
+    orderDeliverHandelCancel() {
+      this.orderDeliverModal = false;
+    },
+    //订单发货提交
+    orderDeliverySubmit() {
+      this.$refs.orderDeliveryForm.validate((valid) => {
+        if (valid) {
+          API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("订单发货成功");
+                this.orderDeliverModal = false;
+                this.getDataDetail();
+              }
+            }
+          );
+        }
+      });
+    },
+
+    //订单日志
+    orderLog() {
+      this.orderLogModal = true;
+    },
+    //订单日志取消
+    handelCancel() {
+      this.orderLogModal = false;
+    },
+    //弹出修改收货地址框
+    editAddress() {
+      this.addressModal = true;
+      this.showRegion = false;
+      this.regionId = this.orderInfo.order.consigneeAddressIdPath;
+      this.region = this.orderInfo.order.consigneeAddressPath;
+      this.addressForm.consigneeName = this.orderInfo.order.consigneeName;
+      this.addressForm.consigneeMobile = this.orderInfo.order.consigneeMobile;
+      this.addressForm.consigneeDetail = this.orderInfo.order.consigneeDetail;
+      this.addressForm.consigneeAddressPath = this.orderInfo.order.consigneeAddressPath;
+      this.addressForm.consigneeAddressIdPath = this.orderInfo.order.consigneeAddressIdPath;
+    },
+    //修改收货地址
+    editAddressSubmit() {
+      if (this.regionId == "") {
+        this.$Message.error("请选择地址");
+        return;
+      }
+      this.addressForm.consigneeAddressPath = this.region;
+      this.addressForm.consigneeAddressIdPath = this.regionId;
+      this.$refs.addressForm.validate((valid) => {
+        if (valid) {
+          API_Order.editOrderConsignee(this.sn, this.addressForm).then(
+            (res) => {
+              if (res.success) {
+                this.$Message.success("收货地址修改成功");
+                this.addressModal = false;
+                this.getDataDetail();
+              }
+            }
+          );
+        }
+      });
+    },
+  },
+  mounted() {
+    this.sn = this.$route.query.sn;
+    this.getDataDetail();
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 建议引入通用样式 可删除下面样式代码
+// @import "@/styles/table-common.scss";
+.order-log-div {
+  line-height: 30px;
+  height: 500px;
+  overflow-y: scroll;
+}
+
+dl dt {
+  width: 100px;
+  text-align: right;
+}
+.div-express-log {
+  max-height: 300px;
+  border: solid 1px #e7e7e7;
+  background: #fafafa;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+.express-log {
+  margin-right: -10px;
+  margin: 5px;
+  padding: 10px;
+  list-style-type: none;
+  .time {
+    width: 30%;
+    display: inline-block;
+    float: left;
+  }
+  .detail {
+    width: 60%;
+    margin-left: 30px;
+    display: inline-block;
+  }
+  li {
+    line-height: 30px;
+  }
+}
+
+.layui-layer-wrap {
+  dl {
+    border-top: solid 1px #f5f5f5;
+    margin-top: -1px;
+    overflow: hidden;
+
+    dt {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 1% 8px 0;
+      color: #999;
+    }
+
+    dd {
+      font-size: 14px;
+      line-height: 28px;
+      display: inline-block;
+      padding: 8px 0 8px 8px;
+      border-left: solid 1px #f5f5f5;
+
+      .text-box {
+        line-height: 40px;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.flex-card {
+  display: flex;
+  height: 600px;
+}
+
+.card-item {
+  margin: 5px 0;
+}
+
+.flex-card-left {
+  flex: 4;
+  //background: #f8f8f8;
+}
+
+.flex-card-right {
+  flex: 6;
+}
+
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+
+  .select-clear {
+    margin-left: 10px;
+  }
+
+  .div-item {
+    line-height: 35px;
+    display: flex;
+
+    > .div-item-left {
+      width: 80px;
+    }
+
+    > .div-item-right {
+      flex: 1;
+      word-break: break-all;
+    }
+  }
+
+  .div-status-right {
+    margin-top: 20px;
+    margin-left: 30px;
+    font-size: 20px;
+  }
+
+  .page {
+    margin-top: 2vh;
+  }
+
+  button {
+    margin-left: 5px;
+  }
+
+  .goods-total {
+    padding: 20px;
+    height: 150px;
+    width: 100%;
+
+    ul {
+      margin-right: 10px;
+      display: block;
+      float: right;
+      list-style-type: none;
+      line-height: 25px;
+    }
+
+    .label {
+      float: left;
+      width: 500px;
+      text-align: right;
+    }
+
+    .txt {
+      float: left;
+      width: 130px;
+      text-align: right;
+      font-family: verdana;
+    }
+
+    .flowPrice {
+      color: #cc0000;
+      font-size: 22px;
+    }
+  }
+}
+</style>
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
new file mode 100644
index 00000000..c61c93c5
--- /dev/null
+++ b/seller/src/views/order/order/orderList.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入订单编号"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="buyerName">
+                <Input
+                  type="text"
+                  v-model="searchForm.buyerName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="订单状态" prop="orderStatus">
+                <Select v-model="searchForm.orderStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="UNPAID">未付款</Option>
+                  <Option value="PAID">已付款</Option>
+                  <Option value="UNDELIVERED">待发货</Option>
+                  <Option value="DELIVERED">已发货</Option>
+                  <Option value="COMPLETED">已完成</Option>
+                  <Option value="TAKE">待核验</Option>
+                  <Option value="CANCELLED">已取消</Option>
+                </Select>
+              </Form-item>
+              <Form-item label="下单时间">
+                <DatePicker
+                  v-model="selectDate"
+                  type="datetimerange"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  @on-change="selectDateRange"
+                  placeholder="选择起始时间"
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+
+  export default {
+    name: "orderList",
+    components: {
+    },
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+          orderSn:"",
+          buyerName:"",
+          orderStatus:""
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "订单号",
+            key: "sn",
+            minWidth: 240,
+            tooltip: true
+          },
+          {
+            title: "订单来源",
+            key: "clientType",
+            width: 120,
+          },
+          {
+            title: "订单类型",
+            key: "orderType",
+            width: 120,
+            render: (h, params) => {
+              if (params.row.orderType == "NORMAL") {
+                return h('div', [h('span', { }, '普通订单'),]);
+              } else if (params.row.orderType == "PINTUAN") {
+                return h('div', [h('span', { }, '拼团订单'),]);
+              } else if (params.row.orderType == "GIFT") {
+                return h('div', [h('span', { }, '赠品订单'),]);
+              }
+            }
+          },
+          {
+            title: "买家名称",
+            key: "memberName",
+            minWidth: 130,
+            tooltip: true
+          },
+          {
+            title: "订单金额",
+            key: "flowPrice",
+            minWidth: 100,
+            tooltip: true,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+              );
+            },
+          },
+
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            minWidth: 100,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', { }, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', { }, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', { }, '待发货'),]);
+              }else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', { }, '已发货'),]);
+              }else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', { }, '待核验'),]);
+              }else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', { }, '已取消'),]);
+              }
+            }
+          },
+          {
+            title: "下单时间",
+            key: "createTime",
+            width: 170,
+            sortable: true,
+            sortType: "desc",
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 100,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.selectDate = null;
+        this.searchForm.startDate = "";
+        this.searchForm.endDate = "";
+        // 重新加载数据
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Order.getOrderList(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+
+      detail(v) {
+        let sn = v.sn;
+        this.$router.push({
+          name: "order-detail",
+          query: { sn: sn },
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
new file mode 100644
index 00000000..83e47c0a
--- /dev/null
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="订单编号" prop="orderSn">
+                <Input
+                  type="text"
+                  v-model="searchForm.orderSn"
+                  clearable
+                  placeholder="请输入订单编号"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="会员名称" prop="memberName">
+                <Input
+                  type="text"
+                  v-model="searchForm.memberName"
+                  clearable
+                  placeholder="请输入会员名称"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="发票抬头" prop="receiptTitle">
+                <Input
+                  type="text"
+                  v-model="searchForm.receiptTitle"
+                  clearable
+                  placeholder="请输入发票抬头"
+                  style="width: 200px"
+                />
+              </Form-item>
+              <Form-item label="状态" prop="receiptStatus">
+                <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="0">未开票</Option>
+                  <Option value="1">已开票</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            >
+              <!-- 订单详情格式化 -->
+              <template slot="orderSlot" slot-scope="scope">
+                <a
+                  @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
+              </template>
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Order from "@/api/order";
+
+  export default {
+    name: "storeBill",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          receiptStatus: "", // 起始时间
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "订单号",
+            key: "orderSn",
+            minWidth: 120,
+            slot: "orderSlot",
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            minWidth: 90,
+            tooltip: true
+          },
+
+          {
+            title: "发票抬头",
+            key: "receiptTitle",
+            minWidth: 90,
+            tooltip: true
+          },
+          {
+            title: "纳税人识别号",
+            key: "taxpayerId",
+            minWidth: 100,
+            tooltip: true
+
+          },
+          {
+            title: "发票内容",
+            key: "receiptContent",
+            minWidth: 120,
+            tooltip: true
+          },
+          {
+            title: "发票金额",
+            key: "billPrice",
+            width: 90,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "发票状态",
+            key: "receiptStatus",
+            width: 90,
+            tooltip: true,
+            render: (h, params) => {
+              if(params.row.receiptStatus == 0){
+                return h(
+                  "div",
+                  "未开票"
+                );
+              }else{
+                return h(
+                  "div",
+                  "已开票"
+                );
+              }
+
+            },
+          },
+          {
+            title: "订单状态",
+            key: "orderStatus",
+            width: 90,
+            render: (h, params) => {
+              if (params.row.orderStatus == "UNPAID") {
+                return h('div', [h('span', { }, '未付款'),]);
+              } else if (params.row.orderStatus == "PAID") {
+                return h('div', [h('span', { }, '已付款'),]);
+              } else if (params.row.orderStatus == "UNDELIVERED") {
+                return h('div', [h('span', { }, '待发货'),]);
+              }else if (params.row.orderStatus == "DELIVERED") {
+                return h('div', [h('span', { }, '已发货'),]);
+              }else if (params.row.orderStatus == "COMPLETED") {
+                return h('div', [h('span', { }, '已完成'),]);
+              }else if (params.row.orderStatus == "TAKE") {
+                return h('div', [h('span', { }, '待核验'),]);
+              }else if (params.row.orderStatus == "CANCELLED") {
+                return h('div', [h('span', { }, '已取消'),]);
+              }
+            }
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 80,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    attrs: {
+                      disabled: params.row.orderStatus == "COMPLETED"  && params.row.receiptStatus == 0? false : true,
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.invoicing(params.row);
+                      },
+                    },
+                  },
+                  "开票"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getData();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getData();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getData();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getData();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getData();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getData() {
+        this.loading = true;
+        API_Order.getReceiptPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //开发票
+      invoicing(params){
+        this.$Modal.confirm({
+          title: "确认开票",
+          content: "您确认已经开具发票 ?",
+          loading: true,
+          onOk: () => {
+            API_Order.invoicing(params.id).then((res) => {
+              if (res.success) {
+                this.$Message.success("开票成功");
+              }
+              this.$Modal.remove();
+              this.getData();
+            });
+
+
+          }
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
new file mode 100644
index 00000000..2f0ee847
--- /dev/null
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -0,0 +1,410 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="100"
+          class="search-form"
+        >
+          <Form-item label="优惠券名称">
+            <Input
+              type="text"
+              v-model="searchForm.couponName"
+              placeholder="请输入优惠券名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button
+            @click="handleSearch"
+            type="primary"
+            class="search-btn"
+            icon="ios-search"
+            >搜索</Button
+          >
+        </Form>
+      </Row>
+      <Row class="operator padding-row">
+        <Button @click="add" type="primary">添加</Button>&nbsp;
+        <Button @click="delAll">批量下架</Button>&nbsp;
+        <!-- <Button @click="upAll">批量上架</Button> -->
+      </Row>
+      <Row class="padding-row">
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
+              type="primary"
+              size="small"
+              style="margin-right: 10px"
+              @click="edit(row)"
+              >编辑</Button
+            >
+            <Button
+              v-if="row.promotionStatus !== 'CLOSE'"
+              type="error"
+              size="small"
+              @click="remove(row)"
+              >下架</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  getShopCouponList,
+  deleteShopCoupon,
+  updateCouponStatus,
+} from "@/api/promotion";
+
+export default {
+  name: "coupon",
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        promotionName: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        promotionName: [
+          { required: true, message: "不能为空", trigger: "blur" },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "优惠券名称",
+          key: "couponName",
+          minWidth: 120,
+        },
+        {
+          title: "优惠券类型",
+          key: "couponType",
+          minWidth: 50,
+          render: (h, params) => {
+            let text = "未知";
+            if (params.row.couponType == "DISCOUNT") {
+              text = "打折";
+            } else if (params.row.couponType == "PRICE") {
+              text = "减免现金";
+            }
+            return h("div", [text]);
+          },
+        },
+        {
+          title: "面额",
+          key: "price",
+          minWidth: 40,
+        },
+        {
+          title: "折扣",
+          key: "couponDiscount",
+          minWidth: 40,
+        },
+        {
+          title: "状态",
+          key: "status",
+          minWidth: 30,
+          render: (h, params) => {
+            let text = "未知",
+              color = "default";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "red";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "品类描述",
+          key: "scopeType",
+          minWidth: 120,
+          render: (h, params) => {
+            let text = "未知";
+            if (params.row.scopeType == "ALL") {
+              text = "全品类";
+            } else if (params.row.scopeType == "PORTION_GOODS_CATEGORY") {
+              text = "部分商品分类";
+            } else if (params.row.scopeType == "PORTION_GOODS") {
+              text = "指定商品";
+            } else if (params.row.scopeType == "PORTION_SHOP_CATEGORY") {
+              text = "部分店铺分类";
+            }
+            return h("div", [text]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 200,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    add() {
+      this.$router.push({ name: "add-coupon" });
+    },
+    /** 跳转至领取详情页面 */
+    receiveInfo(v) {
+      this.$router.push({ name: "member-receive-coupon", query: { id: v.id } });
+    },
+    info(v) {
+      this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.getDataList();
+    },
+
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getDataList();
+    },
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getShopCouponList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+
+    edit(v) {
+      this.$router.push({ name: "add-coupon", query: { id: v.id } });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认下架",
+        // 记得确认修改此处
+        content: "确认要下架此优惠券么?",
+        loading: true,
+        onOk: () => {
+          this.loading = false;
+          let params = {
+            couponIds: v.id,
+            promotionStatus: "CLOSE",
+          };
+          // 批量删除
+          updateCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    upAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("请选择要上架的优惠券");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认上架",
+        content: "您确认要上架所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          let params = {
+            couponIds: ids.toString(),
+            promotionStatus: "START",
+          };
+          // 批量上架
+          updateCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要作废的优惠券");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认作废",
+        content: "您确认要作废所选的 " + this.selectCount + " 条数据?",
+        loading: true,
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+
+          let params = {
+            couponIds: ids.toString(),
+            promotionStatus: "CLOSE",
+          };
+          // 批量删除
+          updateCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("下架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath == "/promotion/coupon") {
+        this.init();
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+@import "@/styles/table-common.scss";
+.search-form {
+  width: 100% !important;
+}
+</style>
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
new file mode 100644
index 00000000..ca803917
--- /dev/null
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -0,0 +1,655 @@
+<template>
+  <div class="wrapper">
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input
+                type="text"
+                v-model="form.promotionName"
+                placeholder="活动名称"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="优惠券名称" prop="couponName">
+              <Input
+                type="text"
+                v-model="form.couponName"
+                placeholder="优惠券名称"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="优惠券类型" prop="couponType">
+              <Select v-model="form.couponType" style="width: 260px">
+                <Option value="DISCOUNT">打折</Option>
+                <Option value="PRICE">减免现金</Option>
+              </Select>
+            </FormItem>
+            <FormItem
+              label="折扣"
+              prop="discount"
+              v-if="form.couponType == 'DISCOUNT'"
+            >
+              <Input
+                type="number"
+                v-model="form.couponDiscount"
+                placeholder="折扣"
+                clearable
+                style="width: 260px"
+              />
+              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
+            </FormItem>
+            <FormItem
+              label="面额"
+              prop="price"
+              v-if="form.couponType == 'PRICE'"
+            >
+              <Input
+                type="text"
+                v-model="form.price"
+                placeholder="面额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="活动类型" prop="getType">
+              <Select v-model="form.getType" style="width: 260px">
+                <Option value="FREE">免费领取</Option>
+                <Option value="ACTIVITY">活动赠送</Option>
+              </Select>
+            </FormItem>
+
+            <FormItem label="发放数量" prop="publishNum">
+              <Input
+                v-model="form.publishNum"
+                placeholder="发放数量"
+                style="width: 260px"
+              />
+            </FormItem>
+          </div>
+          <h4>使用限制</h4>
+          <div class="form-item-view">
+            <FormItem label="消费门槛" prop="consumeThreshold">
+              <Input
+                type="text"
+                v-model="form.consumeThreshold"
+                placeholder="消费门槛"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="领取限制" prop="couponLimitNum">
+              <Input
+                v-model="form.couponLimitNum"
+                placeholder="领取限制"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="有效期" prop="startTime">
+              <DatePicker
+                type="datetime"
+                v-model="form.startTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+              -
+              <DatePicker
+                type="datetime"
+                v-model="form.endTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                :options="options"
+                placeholder="请选择"
+                clearable
+                style="width: 200px"
+              >
+              </DatePicker>
+            </FormItem>
+            <FormItem label="使用范围" prop="scopeType">
+              <RadioGroup v-model="form.scopeType">
+                <Radio label="ALL">全品类</Radio>
+                <Radio label="PORTION_GOODS">指定商品</Radio>
+                <Radio label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>
+              </RadioGroup>
+            </FormItem>
+
+            <FormItem
+              style="width: 100%"
+              v-if="form.scopeType == 'PORTION_GOODS'"
+            >
+              <div style="display: flex; margin-bottom: 10px">
+                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                  >选择商品</Button
+                >
+                <Button
+                  type="error"
+                  ghost
+                  style="margin-left: 10px"
+                  @click="delSelectGoods"
+                  >批量删除</Button
+                >
+              </div>
+              <Table
+                border
+                :columns="columns"
+                :data="form.promotionGoodsList"
+                @on-selection-change="changeSelect"
+              >
+                <template slot-scope="{ row }" slot="QRCode">
+                  <img
+                    :src="row.QRCode || '../../../assets/lili.png'"
+                    width="50px"
+                    height="50px"
+                    alt=""
+                  />
+                </template>
+              </Table>
+            </FormItem>
+
+            <FormItem v-if="form.scopeType == 'PORTION_GOODS_CATEGORY'">
+              <Cascader @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;" v-model="form.scopeIdGoods"></Cascader>
+
+            </FormItem>
+
+            <FormItem label="范围描述" prop="description">
+              <Input
+                v-model="form.description"
+                type="textarea"
+                :rows="4"
+                maxlength="50"
+                show-word-limit
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <div>
+              <Button type="text" @click="$router.push({ name: 'coupon' })"
+                >返回</Button
+              >
+              <Button
+                type="primary"
+                :loading="submitLoading"
+                @click="handleSubmit"
+                >提交</Button
+              >
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+
+<script>
+import { saveShopCoupon, getShopCoupon, editShopCoupon } from "@/api/promotion";
+import { getGoodsCategoryAll } from "@/api/goods";
+import { regular } from "@/utils";
+import skuSelect from "@/views/lili-dialog";
+export default {
+  name: "addCoupon",
+  components: {
+    skuSelect,
+  },
+  data() {
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("面额不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("面额设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("消费门槛不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("消费门槛设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const isLtEndDate = (rule, value, callback) => {
+      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    const isGtStartDate = (rule, value, callback) => {
+      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    return {
+      modalType: 0, // 判断是新增还是编辑优惠券 0 新增  1 编辑
+      categoryId: 0, // 分类id
+      form: {
+        /** 店铺承担比例 */
+        sellerCommission: 0,
+        /** 发行数量 */
+        publishNum: 1,
+        /** 运费承担者 */
+        scopeType: "ALL",
+        /** 限领数量 */
+        couponLimitNum: 1,
+        /** 活动类型 */
+        couponType: "PRICE",
+        /** 优惠券名称 */
+        couponName: "",
+        getType: "FREE",
+        promotionGoodsList: [],
+        scopeIdGoods: [],
+      },
+      id: this.$route.query.id,
+      submitLoading: false, // 添加或编辑提交状态
+      selectedGoods: [], // 已选商品列表，便于删除
+      goodsCategoryList: [], // 商品分类列表
+      shopCategoryList: [], // 店铺分类列表
+      cascaderProps: {
+        multiple: true,
+        label: "name",
+        value: "id",
+      }, // 级联选择器配置项
+      formRule: {
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        couponName: [{ required: true, message: "优惠券名称不能为空" }],
+        couponLimitNum: [{ required: true, message: "领取限制不能为空" }],
+        price: [
+          { required: true, message: "请输入面额" },
+          { validator: checkPrice },
+        ],
+        consumeThreshold: [
+          { required: true, message: "请输入消费门槛" },
+          { validator: checkWeight },
+        ],
+        startTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择开始时间",
+          },
+          {
+            trigger: "change",
+            message: "开始时间要小于结束时间",
+            validator: isLtEndDate,
+          },
+        ],
+        endTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择结束时间",
+          },
+          {
+            trigger: "change",
+            message: "结束时间要大于开始时间",
+            validator: isGtStartDate,
+          },
+        ],
+        couponDiscount: [
+          { required: true, message: "请输入折扣" },
+          {
+            pattern: regular.discount,
+            message: "请输入0-10的数字,可有一位小数",
+          },
+        ],
+        sellerCommission: [
+          { required: true, message: "请输入店铺承担比例" },
+          { pattern: regular.rate, message: "请输入0-100的正整数" },
+        ],
+        publishNum: [
+          { required: true, message: "请输入发放数量" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        couponLimitNum: [
+          { required: true, message: "请输入领取限制" },
+          { pattern: regular.integer, message: "请输入正整数" },
+        ],
+        description: [{ required: true, message: "请输入范围描述" }],
+      },
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 40,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          minWidth: 50,
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "Button",
+              {
+                props: {
+                  size: "small",
+                  type: "error",
+                  ghost: true,
+                },
+                on: {
+                  click: () => {
+                    this.delGoods(params.index);
+                  },
+                },
+              },
+              "删除"
+            );
+          },
+        },
+      ],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  async mounted() {
+    await this.getCagetoryList();
+    // 如果id不为空则查询信息
+    if (this.id) {
+      this.getCoupon();
+      this.modalType = 1;
+    }
+  },
+  methods: {
+    getCoupon() {
+      getShopCoupon(this.id).then((res) => {
+        let data = res.result;
+        if (!data.promotionGoodsList) data.promotionGoodsList = [];
+        if (data.scopeType == "PORTION_GOODS_CATEGORY") {
+          let prevCascader = data.scopeId.split(",");
+          function next(params, prev) {
+            for (let i = 0; i < params.length; i++) {
+              const item = params[i];
+              if (item.children) {
+                next(item.children, [...prev, item]);
+              } else {
+                if (prevCascader.includes(item.id)) {
+                  prevCascader = prevCascader.map((key) => {
+                    if (key === item.id) {
+                      let result = prev.map((item) => item.id);
+                      return [...result, item.id];
+                    } else {
+                      return key;
+                    }
+                  });
+                } else {
+                  i === params.length - 1 && (prev = []);
+                }
+              }
+            }
+          }
+          next(this.goodsCategoryList, []);
+          data.scopeIdGoods = prevCascader;
+        }
+        this.form = data;
+      });
+    },
+    /** 保存平台优惠券 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const params = JSON.parse(JSON.stringify(this.form));
+          const strat = this.$options.filters.unixToDate(
+            this.form.startTime / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.endTime / 1000
+          );
+          let scopeId = [];
+          params.startTime = strat;
+          params.endTime = end;
+
+          if (
+            params.scopeType == "PORTION_GOODS" &&
+            (!params.promotionGoodsList ||
+              params.promotionGoodsList.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择指定商品" });
+            return;
+          }
+
+          if (
+            params.scopeType == "PORTION_GOODS_CATEGORY" &&
+            (!params.scopeIdGoods || params.scopeIdGoods.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择商品分类" });
+            return;
+          }
+
+          if (params.scopeType == "PORTION_GOODS") {
+            //指定商品
+            params.promotionGoodsList.forEach((item) => {
+              scopeId.push(item.skuId);
+            });
+            params.scopeId = scopeId.toString();
+          } else if (params.scopeType == "ALL") {
+            delete params.promotionGoodsList;
+          } else if (params.scopeType == "PORTION_GOODS_CATEGORY") {
+            //部分商品分类
+            scopeId = this.filterCategoryId(params.scopeIdGoods, []);
+            params.scopeId = scopeId.toString();
+            delete params.promotionGoodsList;
+          }
+          delete params.scopeIdGoods;
+
+          this.submitLoading = true;
+          if (this.modalType === 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+            saveShopCoupon(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("优惠券发送成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            delete params.consumeLimit;
+            delete params.couponDiscount;
+            delete params.updateTime;
+
+            editShopCoupon(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("优惠券修改成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add-coupon");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.push({
+        path: "promotion/coupon",
+      });
+    },
+    changeSelect(e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+    delSelectGoods() {
+      // 多选删除商品
+      if (this.selectedGoods.length <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选商品吗?",
+        onOk: () => {
+          let ids = [];
+          this.selectedGoods.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+            (item) => {
+              return !ids.includes(item.id);
+            }
+          );
+        },
+      });
+    },
+    delGoods(index) {
+      // 删除商品
+      this.form.promotionGoodsList.splice(index, 1);
+    },
+    selectedGoodsData(item) {
+      // 回显已选商品
+      let ids = [];
+      let list = [];
+      this.form.promotionGoodsList.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            sellerName: e.sellerName,
+            skuId: e.id,
+          });
+        }
+      });
+      this.form.promotionGoodsList.push(...list);
+    },
+    getGoodsCategory(e) {
+      // 获取级联选择器商品分类id
+    },
+
+    async getCagetoryList() {
+      // 获取全部商品分类
+      let data = await getGoodsCategoryAll();
+      this.goodsCategoryList = this.filterCategory(data.result);
+      // 过滤出可显示的值
+
+      this.goodsCategoryList = this.goodsCategoryList.map((item) => {
+        if (item.children) {
+          item.children = item.children.map((child) => {
+            if (child.children) {
+              child.children = child.children.map((son) => {
+                return {
+                  value: son.id,
+                  label: son.name,
+                };
+              });
+              return {
+                value: child.id,
+                label: child.name,
+                children: child.children,
+              };
+            } else {
+              return {
+                value: child.id,
+                label: child.name,
+              };
+            }
+          });
+        }
+        return { value: item.id, label: item.name, children: item.children };
+      });
+    },
+    filterCategory(list) {
+      // 递归删除空children
+      list.forEach((item) => {
+        if (item.children.length == 0) {
+          delete item.children;
+        } else {
+          this.filterCategory(item.children);
+        }
+      });
+      return list;
+    },
+    filterCategoryId(list, idArr) {
+      // 递归获取分类id
+      list.forEach((e) => {
+        if (e instanceof Array) {
+          this.filterCategoryId(e, idArr);
+        } else {
+          if (!idArr.includes(e)) idArr.push(e);
+        }
+      });
+      return idArr;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scpoed>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+.ivu-form-item{
+  margin-bottom: 24px !important;
+}
+.wrapper{
+  min-height: 1000px;
+}
+</style>
+
diff --git a/seller/src/views/promotion/fullCut/full-cut.vue b/seller/src/views/promotion/fullCut/full-cut.vue
new file mode 100644
index 00000000..4d7cd2ef
--- /dev/null
+++ b/seller/src/views/promotion/fullCut/full-cut.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="full-cut">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="活动名称">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation">
+        <Button type="primary" @click="newAct">新增</Button>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+          <template slot-scope="{ row }" slot="applyEndTime">
+            {{ unixDate(row.applyEndTime) }}
+          </template>
+          <template slot-scope="{ row }" slot="promotionType">
+            {{ row.isFullMinus ? "满减" : "满折" }}
+          </template>
+          <template slot-scope="{ row }" slot="hours">
+            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+              item
+            }}</Tag>
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <div>
+              <Button
+                type="primary"
+                v-if="row.promotionStatus == 'NEW'"
+                size="small"
+                @click="edit(row)"
+                >编辑</Button
+              >&nbsp;
+              <Button type="success" v-else size="small" @click="edit(row)"
+                >查看</Button
+              >&nbsp;
+              <Button
+                type="error"
+                :disabled="row.promotionStatus == 'START'"
+                ghost
+                size="small"
+                @click="del(row)"
+                >删除</Button
+              >
+            </div>
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page operation">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+<script>
+import { getFullDiscountList, delFullDiscount } from "@/api/promotion.js";
+export default {
+  data() {
+    return {
+      loading: false, // 表单加载状态
+      searchForm: { // 列表请求参数
+        pageNumber: 0,
+        pageSize: 10,
+        sort: "startTime",
+        order: "desc",
+      },
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "开始时间",
+          key: "startTime",
+          minWidth: 60,
+        },
+        {
+          title: "结束时间",
+          key: "endTime",
+          minWidth: 60,
+        },
+        {
+          title: "活动类型",
+          slot: "promotionType",
+          minWidth: 60,
+        },
+        {
+          title: "活动状态",
+          key: "promotionStatus",
+          minWidth: 60,
+          render: (h, params) => {
+            let text = "未知",
+              color = "default";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 200,
+        },
+      ],
+      data: [], // 表格数据
+    };
+  },
+  methods: {
+    newAct() {
+      // 新增活动
+      this.$router.push({ name: "full-cut-detail" });
+    },
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      // 改变页数
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      // 改变页码
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      // 搜索
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    edit(row) {
+      //  编辑
+      this.$router.push({ name: "full-cut-detail", query: { id: row.id } });
+    },
+    del(row) {
+      this.$Modal.confirm({
+        title: "提示",
+        // 记得确认修改此处
+        content: "确认删除此活动吗?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          delFullDiscount(row.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      getFullDiscountList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath == "/promotion/full-cut") {
+        this.init();
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.operation {
+  margin: 10px 0;
+}
+</style>
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
new file mode 100644
index 00000000..dadfad8f
--- /dev/null
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -0,0 +1,576 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <h4>基本信息</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input
+                type="text"
+                v-model="form.promotionName"
+                :disabled="form.promotionStatus != 'NEW'"
+                placeholder="活动名称"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="活动时间" prop="rangeTime">
+              <DatePicker
+                type="datetimerange"
+                v-model="form.rangeTime"
+                :disabled="form.promotionStatus != 'NEW'"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                style="width: 320px"
+              >
+              </DatePicker>
+            </FormItem>
+            <FormItem label="活动描述" prop="description">
+              <Input
+                v-model="form.description"
+                :disabled="form.promotionStatus != 'NEW'"
+                type="textarea"
+                :rows="4"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+          </div>
+
+          <h4>优惠设置</h4>
+          <div class="form-item-view">
+            <FormItem label="优惠门槛" prop="fullMoney">
+              <Input
+                type="text"
+                v-model="form.fullMoney"
+                :disabled="form.promotionStatus != 'NEW'"
+                placeholder="优惠门槛"
+                clearable
+                style="width: 260px"
+              />
+              <span class="describe">消费达到当前金额可以参与优惠</span>
+            </FormItem>
+            <FormItem label="优惠方式">
+              <RadioGroup v-model="form.discountType">
+                <Radio
+                  :disabled="form.promotionStatus != 'NEW'"
+                  label="isFullMinus"
+                  >减现金</Radio
+                >
+                <Radio
+                  :disabled="form.promotionStatus != 'NEW'"
+                  label="isFullRate"
+                  >打折</Radio
+                >
+              </RadioGroup>
+            </FormItem>
+            <FormItem
+              v-if="form.discountType == 'isFullMinus'"
+              label="优惠金额"
+              prop="fullMinus"
+            >
+              <Input
+                :disabled="form.promotionStatus != 'NEW'"
+                type="text"
+                v-model="form.fullMinus"
+                placeholder="优惠金额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem
+              v-if="form.discountType == 'isFullRate'"
+              label="优惠折扣"
+              prop="fullRate"
+            >
+              <Input
+                :disabled="form.promotionStatus != 'NEW'"
+                type="text"
+                v-model="form.fullRate"
+                placeholder="优惠折扣"
+                clearable
+                style="width: 260px"
+              />
+              <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
+            </FormItem>
+            <FormItem label="额外赠送">
+              <Checkbox
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.isFreeFreight"
+                >免邮费</Checkbox
+              >&nbsp;
+              <Checkbox
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.isCoupon"
+                >送优惠券</Checkbox
+              >&nbsp;
+              <Checkbox
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.isGift"
+                >送赠品</Checkbox
+              >&nbsp;
+              <Checkbox
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.isPoint"
+                >送积分</Checkbox
+              >
+            </FormItem>
+            <FormItem v-if="form.isCoupon" label="赠送优惠券" prop="couponId">
+              <Select
+                v-model="form.couponId"
+                :disabled="form.promotionStatus != 'NEW'"
+                filterable
+                :remote-method="getCouponList"
+                placeholder="输入优惠券名称搜索"
+                :loading="couponLoading"
+                style="width: 260px"
+              >
+                <Option
+                  v-for="item in couponList"
+                  :value="item.id"
+                  :key="item.id"
+                  >{{ item.couponName }}</Option
+                >
+              </Select>
+            </FormItem>
+            <FormItem v-if="form.isGift" label="赠品" prop="giftId">
+              <Select
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.giftId"
+                filterable
+                :remote-method="getGiftList"
+                placeholder="输入赠品名称搜索"
+                :loading="giftLoading"
+                style="width: 260px"
+              >
+                <Option
+                  v-for="item in giftList"
+                  :value="item.id"
+                  :key="item.id"
+                  >{{ item.goodsName }}</Option
+                >
+              </Select>
+            </FormItem>
+            <FormItem v-if="form.isPoint" label="赠积分" prop="point">
+              <Input
+                :disabled="form.promotionStatus != 'NEW'"
+                v-model="form.point"
+                type="number"
+                :min="0"
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="使用范围" prop="scopeType">
+              <RadioGroup v-model="form.scopeType">
+                <Radio :disabled="form.promotionStatus != 'NEW'" label="ALL"
+                  >全品类</Radio
+                >
+                <Radio
+                  :disabled="form.promotionStatus != 'NEW'"
+                  label="PORTION_GOODS"
+                  >指定商品</Radio
+                >
+              </RadioGroup>
+            </FormItem>
+
+            <FormItem
+              style="width: 100%"
+              v-if="form.scopeType == 'PORTION_GOODS'"
+            >
+              <div
+                style="display: flex; margin-bottom: 10px"
+                v-if="form.promotionStatus == 'NEW'"
+              >
+                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                  >选择商品</Button
+                >
+                <Button
+                  type="error"
+                  ghost
+                  style="margin-left: 10px"
+                  @click="delSelectGoods"
+                  >批量删除</Button
+                >
+              </div>
+              <Table
+                border
+                :columns="columns"
+                :data="form.promotionGoodsList"
+                @on-selection-change="changeSelect"
+              >
+                <template slot-scope="{ row }" slot="QRCode">
+                  <img
+                    :src="row.QRCode || '../../../assets/lili.png'"
+                    width="50px"
+                    height="50px"
+                    alt=""
+                  />
+                </template>
+                <template slot-scope="{ index }" slot="action">
+                  <Button
+                    type="error"
+                    :disabled="form.promotionStatus != 'NEW' && id"
+                    size="small"
+                    ghost
+                    @click="delGoods(index)"
+                    >删除</Button
+                  >
+                </template>
+              </Table>
+            </FormItem>
+
+            <div>
+              <Button type="text" @click="closeCurrentPage"
+                >返回</Button
+              >
+              <Button
+                type="primary"
+                :disabled="form.promotionStatus != 'NEW' && id"
+                :loading="submitLoading"
+                @click="handleSubmit"
+                >提交</Button
+              >
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+
+<script>
+import {
+  getShopCouponList,
+  getFullDiscountById,
+  newFullDiscount,
+  editFullDiscount,
+} from "@/api/promotion";
+import { getGoodsSkuListDataSeller } from "@/api/goods";
+import { regular } from "@/utils";
+import skuSelect from "@/views/lili-dialog";
+export default {
+  name: "addFullCut",
+  components: {
+    skuSelect,
+  },
+  data() {
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("面额不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("面额设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("优惠门槛不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("优惠门槛设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      form: { // 活动表单
+        discountType: "isFullMinus",
+        scopeType: "ALL",
+        promotionGoodsList: [],
+        promotionStatus: "NEW",
+      },
+      id: this.$route.query.id, // 活动id
+      submitLoading: false, // 添加或编辑提交状态
+      selectedGoods: [], // 已选商品列表，便于删除
+      formRule: { // 验证规则
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        rangeTime: [{ required: true, message: "请选择活动时间" }],
+        description: [{ required: true, message: "请填写活动描述" }],
+        price: [
+          { required: true, message: "请输入面额" },
+          { validator: checkPrice },
+        ],
+        consumptionLimit: [{ required: true, validator: checkWeight }],
+        fullMoney: [{ required: true, validator: checkWeight }],
+        fullMinus: [
+          { required: true, message: "请填写优惠金额" },
+          { pattern: regular.money, message: "请输入正确金额" },
+        ],
+        fullRate: [
+          { required: true, message: "请填写优惠折扣" },
+          {
+            pattern: regular.discount,
+            message: "请输入0-10的数字,可有一位小数",
+          },
+        ],
+        couponId: [{ required: true, message: "请选择优惠券" }],
+        giftId: [{ required: true, message: "请选择赠品" }],
+        point: [{ required: true, message: "请填写积分" }],
+      },
+      couponList: [], // 店铺优惠券列表
+      giftList: [], // 赠品列表
+      giftLoading: false, // 请求赠品状态
+      columns: [ // 表头
+        {
+          type: "selection",
+          width: 60,
+          align: "center",
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "商品价格",
+          key: "price",
+          minWidth: 40,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price, "￥")
+            );
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+        {
+          title: "商品二维码",
+          slot: "QRCode",
+        },
+        {
+          title: "操作",
+          slot: "action",
+          minWidth: 50,
+        },
+      ],
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  async mounted() {
+    if (this.id) {
+      this.getDetail();
+    }
+    this.getCouponList();
+    this.getGiftList();
+  },
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "full-cut-detail");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    getDetail() {
+      // 获取活动详情
+      getFullDiscountById(this.id).then((res) => {
+        let data = res.result;
+        if (data.number == -1) {
+          data.promotionGoodsList = [];
+          data.scopeType = "ALL";
+        } else {
+          data.scopeType = "PORTION_GOODS";
+        }
+        if (data.isFullMinus) {
+          data.discountType = "isFullMinus";
+          delete data.isFullMinus;
+        } else {
+          data.discountType = "isFullMinus";
+          delete data.isFullRate;
+        }
+        data.rangeTime = [];
+        data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
+
+        this.form = data;
+      });
+    },
+    /** 保存 */
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const params = JSON.parse(JSON.stringify(this.form));
+          const strat = this.$options.filters.unixToDate(
+            this.form.rangeTime[0] / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.rangeTime[1] / 1000
+          );
+          params.startTime = strat;
+          params.endTime = end;
+
+          if (
+            params.scopeType == "PORTION_GOODS" &&
+            (!params.promotionGoodsList ||
+              params.promotionGoodsList.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择指定商品" });
+            return;
+          }
+          if (params.scopeType == "ALL") {
+            delete params.promotionGoodsList;
+            params.number = -1;
+          } else {
+            params.number = 1;
+            params.promotionGoodsList.forEach((e) => {
+              e.startTime = params.stratTime;
+              e.endTime = params.endTime;
+            });
+          }
+          if (params.discountType == "isFullMinus") {
+            params.isFullMinus = true;
+          } else {
+            params.isFullRate = true;
+          }
+          delete params.scopeType;
+          delete params.rangeTime;
+          this.submitLoading = true;
+          if (!this.id) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+            newFullDiscount(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加活动成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            delete params.updateTime;
+
+            editFullDiscount(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("编辑活动成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+
+    changeSelect(e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+    delSelectGoods() {
+      // 多选删除商品
+      if (this.selectedGoods.length <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选商品吗?",
+        onOk: () => {
+          let ids = [];
+          this.selectedGoods.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+            (item) => {
+              return !ids.includes(item.id);
+            }
+          );
+        },
+      });
+    },
+    delGoods(index) {
+      // 删除商品
+      this.form.promotionGoodsList.splice(index, 1);
+    },
+    selectedGoodsData(item) {
+      // 回显已选商品
+      let ids = [];
+      let list = [];
+      this.form.promotionGoodsList.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            sellerName: e.sellerName,
+            skuId: e.id,
+          });
+        }
+      });
+      this.form.promotionGoodsList.push(...list);
+    },
+    getCouponList(query) {
+      // 优惠券列表
+      let params = {
+        pageSize: 10,
+        pageNumber: 0,
+        getType: "ACTIVITY",
+        couponName: query,
+      };
+      this.couponLoading = true;
+      getShopCouponList(params).then((res) => {
+        this.couponLoading = false;
+        if (res.success) {
+          this.couponList = res.result.records;
+        }
+      });
+    },
+    getGiftList(query) {
+      // 赠品列表
+      let params = {
+        pageSize: 10,
+        pageNumber: 1,
+        goodsName: query,
+      };
+      this.giftLoading = true;
+      getGoodsSkuListDataSeller(params).then((res) => {
+        this.giftLoading = false;
+        if (res.success) {
+          this.giftList = res.result.records;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+</style>
+
diff --git a/seller/src/views/promotion/pintuan/newPintuan.vue b/seller/src/views/promotion/pintuan/newPintuan.vue
new file mode 100644
index 00000000..fb938388
--- /dev/null
+++ b/seller/src/views/promotion/pintuan/newPintuan.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="new-pintuan">
+    <Card>
+      <Form ref="form" :model="form" :label-width="130" :rules="formValidate">
+        <FormItem label="活动名称" prop="promotionName" :label-width="130">
+          <Input v-model="form.promotionName" clearable style="width: 260px" />
+          <div style="color: #cccccc">
+            活动名称将显示在对人拼团活动列表中，方便商家管理使用，最多输入25个字符
+          </div>
+        </FormItem>
+        <FormItem label="活动时间" prop="startTime">
+          <DatePicker
+            type="datetime"
+            v-model="form.startTime"
+            format="yyyy-MM-dd HH:mm:ss"
+            :options="options"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+          </DatePicker>
+          -
+          <DatePicker
+            type="datetime"
+            v-model="form.endTime"
+            format="yyyy-MM-dd HH:mm:ss"
+            :options="options"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+          </DatePicker>
+        </FormItem>
+
+        <FormItem label="参团人数" prop="requiredNum" :label-width="130">
+          <Input v-model="form.requiredNum" style="width: 260px">
+            <span slot="append">人</span>
+          </Input>
+          <span style="color: #cccccc"
+            >建议参团人数不少于2人，不超过20人。</span
+          >
+        </FormItem>
+        <FormItem label="限购数量" prop="limitNum" :label-width="130">
+          <Input v-model="form.limitNum" type="number" style="width: 260px">
+            <span slot="append">件/人</span>
+          </Input>
+          <span style="color: #cccccc">如果设置为0则视为不限制购买数量</span>
+        </FormItem>
+        <FormItem label="虚拟成团" prop="fictitious">
+          <RadioGroup v-model="form.fictitious">
+            <Radio title="开启" :label="true">
+              <span>开启</span>
+            </Radio>
+            <Radio title="关闭" :label="false">
+              <span>关闭</span>
+            </Radio>
+          </RadioGroup>
+          <br />
+          <span style="color: #cccccc"
+            >开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span
+          >
+        </FormItem>
+        <FormItem label="拼团规则" prop="pintuanRule">
+          <Input
+            v-model="form.pintuanRule"
+            type="textarea"
+            :rows="4"
+            clearable
+            style="width: 260px"
+          />
+          <br />
+          <span style="color: #cccccc"
+            >拼团规则描述不能为空且不能大于255个字，会在WAP拼团详情页面显示</span
+          >
+        </FormItem>
+      </Form>
+      <div>
+        <Button type="text" @click="closeCurrentPage">返回</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Card>
+  </div>
+</template>
+<script>
+import { savePintuan, editPintuan, getPintuanDetail } from "@/api/promotion";
+export default {
+  data() {
+    const isLtEndDate = (rule, value, callback) => {
+      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    const isGtStartDate = (rule, value, callback) => {
+      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
+        callback(new Error());
+      } else {
+        callback();
+      }
+    };
+    return {
+      id: this.$route.query.id, // 拼团id
+      form: {
+        // 添加或编辑表单对象初始化数据
+        promotionName: "",
+        promotionTitle: "",
+        pintuanRule: "",
+        requiredNum: "",
+        fictitious: false,
+        limitNum: "",
+        startTime: "",
+        endTime: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        requiredNum: [
+          { required: true, message: "参团人数不能为空" },
+          {
+            pattern: /^(1|[1-9]\d?|100)$/,
+            message: "参团人数不合法",
+          },
+        ],
+        limitNum: [
+          { required: true, message: "限购数不能为空" },
+          {
+            pattern: /^(0|[1-9]\d?|100)$/,
+            message: "限购数不合法",
+          },
+        ],
+        startTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择开始时间",
+          },
+          {
+            trigger: "change",
+            message: "开始时间要小于结束时间",
+            validator: isLtEndDate,
+          },
+        ],
+        endTime: [
+          {
+            required: true,
+            type: "date",
+            message: "请选择结束时间",
+          },
+          {
+            trigger: "change",
+            message: "结束时间要大于开始时间",
+            validator: isGtStartDate,
+          },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      options: { // 不可选取的时间段
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  mounted() {
+    if (this.id) {
+      this.getDetail();
+    }
+  },
+
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "new-pintuan");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.startTime = this.$options.filters.unixToDate(
+            this.form.startTime / 1000
+          );
+          params.endTime = this.$options.filters.unixToDate(
+            this.form.endTime / 1000
+          );
+          if (!this.id) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+            savePintuan(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("拼团活动发布成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            if (params.promotionGoodsList == "")
+              delete params.promotionGoodsList;
+            editPintuan(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    getDetail() {
+      getPintuanDetail(this.id).then((res) => {
+        if (res.success) {
+          this.form = res.result;
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .ivu-form-item{
+  padding: 18px 10px !important;
+}
+</style>
diff --git a/seller/src/views/promotion/pintuan/pintuan.scss b/seller/src/views/promotion/pintuan/pintuan.scss
new file mode 100644
index 00000000..a1f97b1f
--- /dev/null
+++ b/seller/src/views/promotion/pintuan/pintuan.scss
@@ -0,0 +1,41 @@
+
+.search {
+  .operation {
+    margin-bottom: 2vh;
+  }
+
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+
+  .select-clear {
+    margin-left: 10px;
+  }
+
+  .page {
+    margin-top: 2vh;
+  }
+
+  .drop-down {
+    margin-left: 5px;
+  }
+}
+
+.newPromotionView {
+  width: 80%;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+
+  Input {
+    flex-direction: row;
+  }
+
+  .slotSpan {
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+}
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
new file mode 100644
index 00000000..a97f2d75
--- /dev/null
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -0,0 +1,341 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      </Col>
+    </Row>
+    <Card>
+      <Row>
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="活动名称" prop="promotionName">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" class="search-btn " icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="newAct" type="primary">添加</Button>
+      </Row>
+      <Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              type="primary"
+              size="small"
+              v-if="row.promotionStatus == 'NEW'"
+              @click="edit(row)"
+              >编辑</Button
+            >&nbsp;
+            <Button
+              type="info"
+              v-if="row.promotionStatus == 'NEW'"
+              size="small"
+              @click="manage(row)"
+              >管理</Button
+            >&nbsp;
+            <Button
+              type="error"
+              size="small"
+              v-if="row.promotionStatus != 'START'"
+              ghost
+              @click="remove(row)"
+              >删除</Button
+            >&nbsp;
+            <Button
+              type="success"
+              v-if="
+                row.promotionStatus == 'NEW' || row.promotionStatus == 'CLOSE'
+              "
+              size="small"
+              @click="open(row)"
+              >开启</Button
+            >
+            <Button
+              type="warning"
+              v-if="row.promotionStatus == 'START'"
+              size="small"
+              @click="close(row)"
+              >关闭</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import {
+  getPintuanList,
+  deletePintuan,
+  openPintuan,
+  closePintuan,
+} from "@/api/promotion";
+export default {
+  name: "pintuan",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      selectDate: null, // 选择的时间
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          minWidth: 120
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          minWidth: 120
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          minWidth: 100,
+          render: (h, params) => {
+            let text = "未知",
+              color = "default";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [h("Tag", { props: { color: color } }, text)]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 250,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    selectDateRange(v) {
+      if (v) {
+        this.searchForm.startDate = v[0];
+        this.searchForm.endDate = v[1];
+      }
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      // 带多条件搜索参数获取表单数据 请自行修改接口
+      getPintuanList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    newAct() {
+      this.$router.push({ name: "new-pintuan" });
+    },
+    edit(v) {
+      this.$router.push({ name: "new-pintuan", query: { id: v.id } });
+    },
+    manage(v) {
+      this.$router.push({ name: "pintuan-goods", query: { id: v.id } });
+    },
+    open(v) {
+      this.$Modal.confirm({
+        title: "确认开启",
+        content: "您确认要开启此拼团活动?",
+        onOk: () => {
+          let params = {
+            startTime: this.openStartTime,
+            endTime: this.openEndTime,
+          };
+          openPintuan(v.id, params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("开启活动成功");
+              this.getDataList();
+            }
+          });
+        },
+        render: (h) => {
+          return h("div", [
+            h("DatePicker", {
+              props: {
+                type: "datetimerange",
+                placeholder: "请选择开始时间和结束时间",
+              },
+              style: {
+                width: "350px",
+              },
+              on: {
+                input: (val) => {
+                  if (val[0]) {
+                    this.openStartTime = val[0].getTime();
+                  }
+                  if (val[1]) {
+                    this.openEndTime = val[1].getTime();
+                  }
+                },
+              },
+            }),
+          ]);
+        },
+      });
+    },
+    close(v) {
+      this.$Modal.confirm({
+        title: "确认关闭",
+        content: "您确认要关闭此拼团活动?",
+        loading: true,
+        onOk: () => {
+          closePintuan(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("关闭活动成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除此拼团活动?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          deletePintuan(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath == "/promotion/pintuan") {
+        this.init();
+      }
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss">
+@import "pintuan.scss";
+@import "@/styles/table-common.scss";
+</style>
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
new file mode 100644
index 00000000..55054274
--- /dev/null
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -0,0 +1,329 @@
+<template>
+  <div class="pintuan-goods">
+    <Card>
+      <Table style="margin: 10px 0" border :columns="columns" :data="data"></Table>
+
+      <Row class="operation">
+        <Button type="primary" @click="openSkuList">选择商品</Button>
+        <Button @click="delAll">批量删除</Button>
+        <Button @click="getDataList" icon="md-refresh">刷新</Button>
+        <Button type="dashed" @click="
+            () => {
+              openTip = !openTip;
+            }
+          ">{{ openTip ? "关闭提示" : "开启提示" }}</Button>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+          <a class="select-clear" @click="clearSelectAll">清空</a>
+        </Alert>
+      </Row>
+      <Row class="operation">
+        <Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+          <template slot-scope="{ row, index }" slot="price">
+            <Input v-model="row.price" @input="goodsData[index].price = row.price" />
+          </template>
+          <template slot-scope="{ row }" slot="QRCode">
+            <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page operation">
+        <Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+      <Row class="operation">
+        <Button @click="closeCurrentPage">返回</Button>
+        <Button type="primary" :loading="submitLoading" @click="save">保存</Button>
+      </Row>
+    </Card>
+
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+  </div>
+</template>
+<script>
+import {
+  getPintuanGoodsList,
+  getPintuanDetail,
+  editPintuan,
+} from "@/api/promotion.js";
+import skuSelect from "@/views/lili-dialog";
+export default {
+  components: {
+    skuSelect,
+  },
+  data() {
+    return {
+      openTip: true, // 显示提示
+      loading: false, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+      },
+
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+          minWidth: 120,
+        },
+        {
+          title: "活动结束时间",
+          key: "endTime",
+          minWidth: 120,
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          minWidth: 100,
+          render: (h, params) => {
+            let text = "未知",
+              color = "";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "blue";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+      ],
+      goodsColumns: [
+        { type: "selection", width: 60, align: "center" },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+
+        {
+          title: "库存",
+          key: "quantity",
+          minWidth: 40,
+        },
+
+        {
+          title: "拼团价格",
+          key: "price",
+          slot: "price",
+          minWidth: 50,
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          minWidth: 50,
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "Button",
+              {
+                props: {
+                  size: "small",
+                  type: "error",
+                  ghost: true,
+                },
+                on: {
+                  click: () => {
+                    this.delGoods(params.index);
+                  },
+                },
+              },
+              "删除"
+            );
+          },
+        },
+      ],
+      goodsData: [], // 商品列表
+    };
+  },
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "pintuan-goods");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    save() {
+      if (this.goodsData.length == 0) {
+        this.$Modal.warning({ title: "提示", content: "请选择活动商品" });
+        return;
+      }
+      for (let i = 0; i < this.goodsData.length; i++) {
+        let data = this.goodsData[i];
+        if (!data.price) {
+          this.$Modal.warning({
+            title: "提示",
+            content: `请填写【${data.goodsName}】的价格`,
+          });
+          return;
+        }
+      }
+      this.goodsData.forEach((item) => {
+        item.promotionId = this.data[0].id;
+        item.startTime = this.data[0].startTime;
+        item.endTime = this.data[0].endTime;
+      });
+      this.data[0].promotionGoodsList = this.goodsData;
+      this.submitLoading = true;
+      editPintuan(this.data[0]).then((res) => {
+        this.submitLoading = false;
+        if (res.success) {
+          this.$Message.success("修改拼团商品成功");
+          this.closeCurrentPage();
+        }
+      });
+    },
+    init() {
+      this.getDataList();
+      this.getPintuanMsg();
+    },
+
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+      this.clearSelectAll();
+    },
+
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    handleReset() {
+      // 重置
+      // this.$refs.searchForm.resetFields();
+      this.searchForm.pageNumber = 0;
+      this.searchForm.promotionName = "";
+      this.selectDate = null;
+
+      // 重新加载数据
+      this.getDataList();
+    },
+
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      // 获取选择数据
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      this.loading = true;
+      this.searchForm.pintuanId = this.$route.query.id;
+
+      getPintuanGoodsList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.goodsData = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+
+    getPintuanMsg() {
+      // 获取拼团详情
+      getPintuanDetail(this.$route.query.id).then((res) => {
+        if (res.success) this.data.push(res.result);
+      });
+    },
+    delGoods(index) {
+      // 删除商品
+      this.goodsData.splice(index, 1);
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.goodsData = this.goodsData.filter((item) => {
+            return !ids.includes(item.id);
+          });
+        },
+      });
+    },
+    selectedGoodsData(item) {
+      let ids = [];
+      let list = [];
+      this.goodsData.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            sellerName: e.sellerName,
+            thumbnail: e.thumbnail,
+            skuId: e.id,
+            categoryPath: e.categoryPath,
+          });
+        }
+      });
+      this.goodsData.push(...list);
+    },
+    openSkuList() {
+      this.$refs.skuSelect.open("goods");
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.operation {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
new file mode 100644
index 00000000..44c9660f
--- /dev/null
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="seckill">
+    <Card>
+      <Row>
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
+          <Form-item label="活动名称" prop="goodsName">
+            <Input
+              type="text"
+              v-model="searchForm.promotionName"
+              placeholder="请输入活动名称"
+              clearable
+              style="width: 200px"
+            />
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select
+              v-model="searchForm.promotionStatus"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <DatePicker
+              v-model="selectDate"
+              type="daterange"
+              clearable
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
+          </Form-item>
+          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+        </Form>
+      </Row>
+
+      <Row class="padding-row">
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+        >
+          <template slot-scope="{ row }" slot="applyEndTime">
+            {{ unixDate(row.applyEndTime) }}
+          </template>
+          <template slot-scope="{ row }" slot="hours">
+            <Tag v-for="item in unixHours(row.hours)" :key="item">{{
+              item
+            }}</Tag>
+          </template>
+          <template slot-scope="{ row }" slot="action">
+            <Button
+              v-if="
+                row.promotionStatus === 'NEW'
+              "
+              type="primary"
+              size="small"
+              @click="manage(row)"
+              >管理</Button
+            >
+          </template>
+        </Table>
+      </Row>
+      <Row type="flex" justify="end" class="page">
+        <Page
+          :current="searchForm.pageNumber + 1"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { seckillList } from "@/api/promotion";
+export default {
+  name: "goods",
+  components: {},
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "startTime",
+        order: "desc", // 默认排序方式
+      },
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+        },
+        {
+          title: "报名截止时间",
+          slot: "applyEndTime",
+        },
+        {
+          title: "时间场次",
+          slot: "hours",
+        },
+        {
+          title: "状态",
+          key: "promotionStatus",
+          render: (h, params) => {
+            let text = "未知",
+              color = "default";
+            if (params.row.promotionStatus == "NEW") {
+              text = "未开始";
+              color = "default";
+            } else if (params.row.promotionStatus == "START") {
+              text = "已开始";
+              color = "green";
+            } else if (params.row.promotionStatus == "END") {
+              text = "已结束";
+              color = "red";
+            } else if (params.row.promotionStatus == "CLOSE") {
+              text = "已关闭";
+              color = "red";
+            }
+            return h("div", [
+              h(
+                "Tag",
+                {
+                  props: {
+                    color: color,
+                  },
+                },
+                text
+              ),
+            ]);
+          },
+        },
+        {
+          title: "操作",
+          slot: "action",
+          align: "center",
+          width: 100,
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v - 1;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 0;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+
+    manage(row) {
+      this.$router.push({ name: "seckill-goods", query: { id: row.id } });
+    },
+    getDataList() {
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      // 带多条件搜索参数获取表单数据
+      seckillList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+    },
+    unixDate(time) {
+      // 处理报名截止时间
+      return this.$options.filters.unixToDate(new Date(time) / 1000);
+    },
+    unixHours(item) {
+      // 处理小时场次
+      let hourArr = item.split(",");
+      for (let i = 0; i < hourArr.length; i++) {
+        hourArr[i] += ":00";
+      }
+      return hourArr;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath == "/promotion/seckill") {
+        this.init();
+      }
+    },
+  },
+};
+</script>
+<style lang="scss"  scoped>
+.seckill {
+  .operation {
+    margin: 10px 0;
+  }
+  .select-count {
+    font-weight: 600;
+    color: #40a9ff;
+  }
+  .select-clear {
+    margin-left: 10px;
+  }
+  .page {
+    margin-top: 2vh;
+  }
+  .drop-down {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
new file mode 100644
index 00000000..3b6fb1fd
--- /dev/null
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -0,0 +1,444 @@
+<template>
+  <div class="seckill-goods">
+    <Card>
+      <Table border :columns="columns" :data="data">
+        <template slot-scope="{ row }" slot="applyEndTime">
+          {{ unixDate(row.applyEndTime) }}
+        </template>
+        <template slot-scope="{ row }" slot="hours">
+          <Tag v-for="item in unixHours(row.hours)" :key="item">{{ item }}</Tag>
+        </template>
+      </Table>
+
+      <Row class="operation">
+        <template v-if="promotionStatus == 'NEW'">
+          <Button type="primary" @click="openSkuList">选择商品</Button>
+          <Button @click="delAll">批量删除</Button>
+        </template>
+      </Row>
+      <Row v-show="openTip">
+        <Alert show-icon>
+          已选择 <span class="select-count">{{ selectCount }}</span> 项
+        </Alert>
+      </Row>
+      <Row class="operation">
+        <Tabs type="card" v-model="tabIndex">
+          <TabPane
+            v-for="(tab, tabIndex) in goodsList"
+            :key="tabIndex"
+            :label="tab.hour"
+            :name="tabIndex"
+          >
+            <Table
+              :loading="loading"
+              border
+              :columns="goodsColumns"
+              :data="tab.list"
+              :ref="'table' + tabIndex"
+              sortable="custom"
+              @on-selection-change="changeSelect"
+            >
+              <template slot-scope="{ row }" slot="originalPrice">
+                <div>{{ row.originalPrice | unitPrice("￥") }}</div>
+              </template>
+
+              <template slot-scope="{ row, index }" slot="quantity">
+                <Input
+                  v-model="row.quantity"
+                  :disabled="row.promotionApplyStatus == 'PASS'"
+                  @input="
+                    goodsList[tabIndex].list[index].quantity = row.quantity
+                  "
+                />
+              </template>
+
+              <template slot-scope="{ row, index }" slot="price">
+                <Input
+                  v-model="row.price"
+                  :disabled="row.promotionApplyStatus == 'PASS'"
+                  @input="goodsList[tabIndex].list[index].price = row.price"
+                />
+              </template>
+
+              <template slot-scope="{ row }" slot="promotionApplyStatus">
+                <Badge
+                  status="success"
+                  v-if="row.promotionApplyStatus == 'PASS'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <Badge
+                  status="blue"
+                  v-if="row.promotionApplyStatus == 'APPLY'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <Badge
+                  status="error"
+                  v-if="row.promotionApplyStatus == 'REFUSE'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <span
+                  v-if="row.promotionApplyStatus == 'REFUSE'"
+                  @click="showReason(row.failReason)"
+                  class="reason"
+                  >（拒绝原因）</span
+                >
+                <Badge
+                  status="error"
+                  v-if="row.promotionApplyStatus == ''"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+              </template>
+
+              <template slot-scope="{ row }" slot="QRCode">
+                <img
+                  v-if="row.QRCode"
+                  :src="row.QRCode || '../../../assets/lili.png'"
+                  width="50px"
+                  height="50px"
+                  alt=""
+                />
+              </template>
+              <template slot-scope="{ row, index }" slot="action">
+                <Button
+                  type="error"
+                  v-if="row.promotionApplyStatus !== 'PASS'"
+                  :disabled="promotionStatus != 'NEW'"
+                  size="small"
+                  ghost
+                  @click="delGoods(index, row.id)"
+                  >删除</Button
+                >
+              </template>
+            </Table>
+          </TabPane>
+        </Tabs>
+      </Row>
+
+      <Row class="operation">
+        <Button @click="closeCurrentPage">返回</Button>
+        <Button
+          type="primary"
+          :loading="submitLoading"
+          :disabled="promotionStatus != 'NEW'"
+          @click="save"
+          >提交</Button
+        >
+      </Row>
+    </Card>
+
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+<script>
+import {
+  seckillGoodsList,
+  seckillDetail,
+  setSeckillGoods,
+  removeSeckillGoods,
+} from "@/api/promotion.js";
+import skuSelect from "@/views/lili-dialog";
+export default {
+  components: {
+    skuSelect,
+  },
+  data() {
+    return {
+      promotionStatus: "", // 活动状态
+      openTip: true,
+      loading: false, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 0, // 当前页数
+        pageSize: 1000, // 页面大小
+      },
+      tabIndex: 0, // 选择商品的下标
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      data: [{}], // 表单数据
+      columns: [
+        {
+          title: "活动名称",
+          key: "promotionName",
+          minWidth: 120,
+        },
+        {
+          title: "活动开始时间",
+          key: "startTime",
+        },
+        {
+          title: "报名截止时间",
+          slot: "applyEndTime",
+        },
+        {
+          title: "时间场次",
+          slot: "hours",
+        },
+      ],
+      goodsColumns: [
+        { type: "selection", width: 60, align: "center" },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+        },
+        {
+          title: "商品价格",
+          slot: "originalPrice",
+          minWidth: 50,
+        },
+        {
+          title: "库存",
+          slot: "quantity",
+          minWidth: 40,
+        },
+        {
+          title: "活动价格",
+          slot: "price",
+          minWidth: 50,
+        },
+        {
+          title: "状态",
+          slot: "promotionApplyStatus",
+          minWidth: 30,
+        },
+        // {
+        //   title: "商品二维码",
+        //   slot: "QRCode",
+        // },
+        {
+          title: "操作",
+          slot: "action",
+          minWidth: 50,
+        },
+      ],
+      goodsList: [] // 商品列表
+    };
+  },
+  computed: {},
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "seckill-goods");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    save() {
+      // 提交
+      // for(let i=0;i<this.goodsData.length;i++){
+      //     let data = this.goodsData[i]
+      //     if(!data.price){
+      //         this.$Modal.warning({
+      //             title:'提示',
+      //             content:`请填写【${data.goodsName}】的价格`
+      //         })
+      //         return
+      //     }
+      // }
+
+      let list = JSON.parse(JSON.stringify(this.goodsList));
+      let params = {
+        seckillId: this.$route.query.id,
+        applyVos: [],
+      };
+      list.forEach((e, index) => {
+        e.list.forEach((i) => {
+          // if(e.id) delete e.id
+          params.applyVos.push(i);
+        });
+      });
+      this.submitLoading = true;
+      setSeckillGoods(params).then((res) => {
+        this.submitLoading = false;
+        if (res && res.success) {
+          this.$Message.success("提交活动商品成功");
+          this.closeCurrentPage();
+        }
+      });
+    },
+    init() {
+      this.getSeckillMsg();
+    },
+
+    clearSelectAll() {
+      this.$refs.table.selectAll(false);
+    },
+    changeSelect(e) {
+      // 获取选择数据
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+
+    getDataList() {
+      // 获取商品详情
+      this.loading = true;
+      this.searchForm.seckillId = this.$route.query.id;
+
+      // 处理过的时间 为‘1:00’
+      let hours = this.unixHours(this.data[0].hours);
+      hours.forEach((e) => {
+        this.goodsList.push({
+          hour: e,
+          list: [],
+        });
+      });
+      seckillGoodsList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success && res.result) {
+          let data = res.result.records;
+          // 未处理时间 为'1'
+          let noFilterhours = this.data[0].hours.split(",");
+          if (data.length) {
+            noFilterhours.forEach((e, index) => {
+              data.forEach((i) => {
+                if (i.timeLine == e) {
+                  this.goodsList[index].list.push(i);
+                }
+              });
+            });
+          }
+        }
+      });
+    },
+
+    getSeckillMsg() {
+      // 获取活动详情
+      seckillDetail(this.$route.query.id).then((res) => {
+        if (res.success && res.result) {
+          this.data = [];
+          this.data.push(res.result);
+          this.promotionStatus = res.result.promotionStatus;
+          this.getDataList();
+        }
+      });
+    },
+    delGoods(index, id) {
+      // 删除商品
+      if (id) {
+        removeSeckillGoods(this.$route.query.id, id).then((res) => {
+          if (res.success) {
+            this.goodsList[this.tabIndex].list.splice(index, 1);
+            this.$Message.success("删除成功！");
+          }
+        });
+      } else {
+        this.goodsList[this.tabIndex].list.splice(index, 1);
+        this.$Message.success("删除成功！");
+      }
+    },
+    delAll() {
+      if (this.selectCount <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
+        onOk: () => {
+          let ids = [];
+          this.selectList.forEach(function (e) {
+            if (e.promotionApplyStatus !== 'PASS') {
+              ids.push(e.id);
+            }
+          });
+          this.goodsList[this.tabIndex].list = this.goodsList[
+            this.tabIndex
+          ].list.filter((item) => {
+            return !ids.includes(item.id);
+          });
+          removeSeckillGoods(this.$route.query.id, ids).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功！");
+            }
+          });
+        },
+      });
+    },
+    selectedGoodsData(item) {
+      // 选择器添加商品
+      let ids = [];
+      let list = [];
+
+      this.goodsList[this.tabIndex].list.forEach((e) => {
+        ids.push(e.id);
+      });
+      item.forEach((e) => {
+        if (!ids.includes(e.id)) {
+          list.push({
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            promotionApplyStatus: "",
+            quantity: e.quantity,
+            seckillId: this.$route.query.id,
+            storeId: e.storeId,
+            storeName: e.storeName,
+            skuId: e.id,
+            timeLine: this.data[0].hours.split(",")[this.tabIndex],
+          });
+        }
+      });
+
+      this.goodsList[this.tabIndex].list.push(...list);
+    },
+    openSkuList() {
+      this.$refs.skuSelect.open("goods");
+    },
+    unixDate(time) {
+      // 处理报名截止时间
+      return this.$options.filters.unixToDate(new Date(time) / 1000);
+    },
+    unixHours(item) {
+      if (item) {
+        // 处理小时场次
+        let hourArr = item.split(",");
+        for (let i = 0; i < hourArr.length; i++) {
+          hourArr[i] += ":00";
+        }
+        return hourArr;
+      }
+      return [];
+    },
+    promotionApplyStatus(key) {
+      switch (key) {
+        case "APPLY":
+          return "申请";
+          break;
+        case "PASS":
+          return "通过";
+          break;
+        case "REFUSE":
+          return "拒绝";
+          break;
+        default:
+          return "未申请";
+          break;
+      }
+    },
+    showReason(reason) {
+      this.$Modal.info({
+        title: "拒绝原因",
+        content: reason,
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.operation {
+  margin: 10px 0;
+}
+.reason {
+  cursor: pointer;
+  color: #2d8cf0;
+  font-size: 12px;
+}
+</style>
diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue
new file mode 100644
index 00000000..ed128e9f
--- /dev/null
+++ b/seller/src/views/shop/bill/accountStatementBill.vue
@@ -0,0 +1,260 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="开始时间" prop="startDay">
+                <DatePicker
+                  type="date"
+                  v-model="searchForm.startDate"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择"
+                  clearable
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="结束时间" prop="endDate">
+                <DatePicker
+                  type="date"
+                  v-model="searchForm.endDate"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  di
+                  placeholder="请选择"
+                  clearable
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Shop from "@/api/shops";
+
+  export default {
+    name: "accountStatementBill",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "账单号",
+            key: "sn",
+            minWidth: 250,
+            tooltip: true          },
+          {
+            title: "生成时间",
+            key: "createTime",
+            minWidth: 120,
+          },
+          {
+            title: "结算时间段",
+            key: "startTime",
+            width: 200,
+            tooltip: true,
+            render: (h, params) => {
+              return h('div', params.row.startTime +"~"+params.row.endTime)
+            }
+          },
+          {
+            title: "结算金额",
+            key: "billPrice",
+            minWidth: 100,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.billPrice, "￥")
+              );
+            },
+          },
+
+
+          {
+            title: "状态",
+            key: "billStatus",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.billStatus == "OUT") {
+                return h( "Badge", {props: { status: "success",text: "已出账" } })
+              } else if (params.row.billStatus == "EXAMINE") {
+                return h( "Badge", {props: { status: "success",text: "已审核" } })
+              } else if (params.row.billStatus == "CHECK") {
+                return h( "Badge", {props: { status: "success",text: "已对账" } })
+              } else if (params.row.billStatus == "PAY") {
+                return h( "Badge", {props: { status: "success",text: "已付款" } })
+              }else if (params.row.billStatus == "COMPLETE") {
+                return h( "Badge", {props: { status: "success",text: "已完成" } })
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 120,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        this.searchForm.billStatus = "OUT"
+        API_Shop.getBillPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+
+      detail(v) {
+        let id = v.id;
+        this.$router.push({
+          name: "bill-detail",
+          query: { id: id },
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+   /deep/ .ivu-col{
+     min-height: 100vh;
+   }
+</style>
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
new file mode 100644
index 00000000..9efd940c
--- /dev/null
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -0,0 +1,632 @@
+<template>
+  <div>
+    <template>
+      <Row>
+        <i-col span="24">
+          <Card>
+            <p slot="title">商家信息</p>
+            <div class="flex flex_align_item">
+              <p>店铺名称：{{ bill.storeName }}</p>
+              <p>银行开户名：{{ bill.bankAccountName }}</p>
+              <p>银行账号：{{ bill.bankAccountNumber }}</p>
+              <p>开户行支行名称：{{ bill.bankName }}</p>
+              <p>支行联行号：{{ bill.bankCode }}</p>
+            </div>
+          </Card>
+        </i-col>
+      </Row>
+    </template>
+    <template>
+      <Row>
+        <i-col span="24">
+          <Card>
+            <p slot="title">账单详细</p>
+
+            <div class="tips-status">
+              <span>商品状态</span>
+
+              <span class="theme_color">{{
+                bill.billStatus | unixSellerBillStatus
+              }}</span>
+
+              <Button
+                v-if="bill.billStatus == 'OUT'"
+                size="mini"
+                @click="reconciliation()"
+                type="primary"
+                >对账</Button
+              >
+            </div>
+
+            <i-table :columns="columns" :data="data" stripe></i-table>
+          </Card>
+        </i-col>
+      </Row>
+    </template>
+    <template>
+      <Tabs active-key="tab" @on-click="clickTabs">
+        <Tab-pane label="订单列表" name="order">
+          <Card>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="orderColumns"
+                :data="orderData"
+                ref="table"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="orderParam.pageNumber"
+                :total="orderTotal"
+                :page-size="orderParam.pageSize"
+                @on-change="orderChangePage"
+                @on-page-size-change="orderChangePageSize"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </Row>
+          </Card>
+        </Tab-pane>
+        <Tab-pane label="退单列表" name="refund">
+          <Card>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="refundColumns"
+                :data="refundData"
+                ref="table"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="refundParam.pageNumber"
+                :total="refundTotal"
+                :page-size="refundParam.pageSize"
+                @on-change="refundChangePage"
+                @on-page-size-change="refundChangePageSize"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </Row>
+          </Card>
+        </Tab-pane>
+        <Tab-pane label="分销费用列表" name="distribution">
+          <Card>
+            <Row>
+              <Table
+                :loading="loading"
+                border
+                :columns="distributionColumns"
+                :data="distributionData"
+                ref="table"
+              ></Table>
+            </Row>
+            <Row type="flex" justify="end" class="page">
+              <Page
+                :current="distributionParam.pageNumber"
+                :total="distributionTotal"
+                :page-size="distributionParam.pageSize"
+                @on-change="distributionChangePage"
+                @on-page-size-change="distributionChangePageSize"
+                size="small"
+                show-total
+                show-elevator
+              ></Page>
+            </Row>
+          </Card>
+        </Tab-pane>
+      </Tabs>
+    </template>
+  </div>
+</template>
+<script>
+import * as filters from "@/utils/filters";
+import * as API_Shop from "@/api/shops";
+export default {
+  name: "bill-detail",
+  data() {
+    return {
+      columns: [
+        {
+          title: "项目",
+          key: "name",
+          width: 250,
+        },
+        {
+          title: "值",
+          key: "value",
+        },
+      ],
+      data: [ // 账单数据
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        },
+
+        {
+          name: "计算公式",
+          value: 0,
+        },
+        {
+          name: "计算中",
+          value: 0,
+        }
+      ],
+      id: "", // 账单id
+      bill: {}, // 商家信息
+      orderParam: {
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "id", // 默认排序字段
+        order: "desc", // 默认排序方式
+        flowType: "PAY",
+      },
+      orderColumns: [
+        {
+          title: "入账时间",
+          key: "createTime",
+          minWidth: 120
+        },
+        {
+          title: "订单编号",
+          key: "sn",
+          minWidth: 120
+        },
+        {
+          title: "订单金额",
+          key: "finalPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "平台分佣",
+          key: "commissionPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "平台优惠券",
+          key: "siteCouponPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.siteCouponPrice == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.siteCouponPrice, "￥")
+              );
+            }
+
+          },
+        },
+        {
+          title: "分销金额",
+          key: "distributionRebate",
+          minWidth: 100,
+          render: (h, params) => {
+            if(params.row.distributionRebate == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+              );
+            }
+
+          },
+        },
+        {
+          title: "应结金额",
+          key: "billPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.billPrice, "￥")
+            );
+          },
+        },
+
+      ],
+      orderData: [], // 订单列表
+      orderTotal: 0, // 订单数量
+      //退单部分
+      refundParam: {
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "id", // 默认排序字段
+        order: "desc", // 默认排序方式
+        flowType: "REFUND",
+      },
+      refundColumns: [
+        {
+          title: "退款时间",
+          key: "createTime",
+          minWidth: 120
+        },
+        {
+          title: "退款流水编号",
+          key: "sn",
+          minWidth: 130
+        },
+        {
+          title: "订单编号",
+          key: "sn",
+          minWidth: 120
+        },
+        {
+          title: "退款金额",
+          key: "finalPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "退还佣金",
+          key: "commissionPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.commissionPrice){
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(0, "￥")
+              );
+            }
+          },
+        },
+
+        {
+          title: "退还平台优惠券",
+          key: "siteCouponCommission",
+          minWidth: 140
+        },
+        {
+          title: "退还分销",
+          key: "distributionRebate",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.distributionRebate == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+              );
+            }
+
+          },
+        },
+
+        {
+          title: "合计金额",
+          key: "billPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            if(params.row.billPrice == null){
+              return h(
+                "div",
+                "-"
+              );
+            }else{
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.billPrice, "￥")
+              );
+            }
+
+          },
+        },
+      ],
+      refundData: [], // 退单数据
+      refundTotal: 0, // 退单数量
+      //分销佣金部分
+      distributionParam: {
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "id", // 默认排序字段
+        order: "desc", // 默认排序方式
+      },
+      distributionColumns: [
+        {
+          title: "订单编号",
+          key: "sn",
+          minWidth: 120
+        },
+        {
+          title: "交易金额",
+          key: "finalPrice",
+          minWidth: 120
+        },
+        {
+          title: "商品名称",
+          key: "goodsName",
+          minWidth: 120,
+          tooltip: true
+        },
+        {
+          title: "规格",
+          key: "finalPrice",
+          minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.finalPrice, "￥")
+            );
+          },
+        },
+        {
+          title: "店铺名称",
+          key: "storeName",
+          minWidth: 120
+        },
+
+        {
+          title: "佣金",
+          key: "distributionRebate",
+          minWidth: 120,
+          render: (h, params) => {
+           if(params.row.flowType === "退款" ){
+             return h(
+               "div",
+               this.$options.filters.unitPrice("-"+params.row.distributionRebate, "￥")
+             );
+           }else{
+             if(params.row.distributionRebate){
+               return h(
+                 "div",
+                 this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+               );
+             }else{
+               return h(
+                 "div",
+                 this.$options.filters.unitPrice(0, "￥")
+               );
+             }
+           }
+          },
+        },
+        {
+          title: "时间",
+          key: "createTime",
+          minWidth: 120
+        },
+      ],
+      distributionData: [], // 分销数据
+      distributionTotal: 0, // 分销总数
+
+    };
+  },
+  watch: {
+    '$route.query.id': function (val) {
+      this.id = val;
+      this.getBill();
+    }
+  },
+  methods: {
+    clickTabs(v) {
+      if (v == "order") {
+        this.orderParam.flowType = "PAY";
+        this.getOrderList()
+      } else if(v === "refund"){
+        this.orderParam.flowType = "REFUND";
+        this.getRefundList()
+      }else{
+        this.getDistributionList()
+      }
+    },
+    //核对结算单
+    reconciliation() {
+      this.$Modal.confirm({
+        title: "确认核对结算单",
+        // 记得确认修改此处
+        content: "您确认要核对此结算单么?",
+        loading: true,
+        onOk: () => {
+          API_Shop.reconciliation(this.id).then((res) => {
+            this.$Modal.remove();
+            if (res.code == 200) {
+              this.$Message.success("账单核对成功");
+              this.init();
+            }
+          });
+        }
+      });
+    },
+
+    init() {
+      this.id = this.$route.query.id;
+      this.getBill();
+    },
+    //订单列表部分
+    orderChangePage(v) {
+      this.orderParam.pageNumber = v;
+      this.getOrderList()
+    },
+    orderChangePageSize(v) {
+      this.orderParam.pageSize = v;
+      this.getOrderList()
+    },
+    getOrderList(){
+      API_Shop.getSellerFlow(this.id,this.orderParam).then((res) => {
+        if (res.success) {
+          this.orderData = res.result.records;
+          this.orderTotal = res.result.total;
+        }
+      });
+    },
+    //退单部分
+    refundChangePage(v) {
+      this.refundParam.pageNumber = v;
+      this.getRefundList()
+    },
+    refundChangePageSize(v) {
+      this.refundParam.pageSize = v;
+      this.getRefundList()
+    },
+    getRefundList() {
+      API_Shop.getSellerFlow(this.id, this.refundParam).then((res) => {
+        this.loading = false;
+        if (res.result) {
+          this.refundData = res.result.records;
+          this.refundTotal = res.result.total;
+        }
+      });
+    },
+    //分销费用列表
+    distributionChangePage(v) {
+      this.distributionParam.pageNumber = v;
+      this.getDistributionList()
+    },
+    distributionChangePageSize(v) {
+      this.distributionParam.pageSize = v;
+      this.getDistributionList()
+    },
+    getDistributionList() {
+      API_Shop.getDistributionFlow(this.id, this.distributionParam).then((res) => {
+        this.loading = false;
+        if (res.result) {
+          this.distributionData = res.result.records;
+          this.distributionTotal = res.result.total;
+        }
+      });
+    },
+    //获取结算单详细
+    getBill(){
+      API_Shop.getBillDetail(this.id).then((res) => {
+        if (res.success) {
+          this.bill = res.result;
+          //初始化表格
+          this.initTable();
+          //初始化订单信息
+          this.getOrderList();
+        }
+      });
+    },
+    initTable() {
+      let bill = this.bill;
+      this.data[0].name = "结算单号";
+      this.data[0].value = bill.sn;
+
+      this.data[1].name = "起止日期";
+      this.data[1].value = bill.startTime + "~" + bill.endTime;
+
+      this.data[2].name = "出帐日期";
+      this.data[2].value = bill.createTime;
+
+      this.data[3].name = "当前状态";
+      this.data[3].value = filters.unixSellerBillStatus(bill.billStatus);
+
+      this.data[4].name = "当前店铺";
+      this.data[4].value = bill.storeName;
+
+      this.data[5].name = "平台打款时间";
+      this.data[5].value = bill.payTime === null ? "未付款" : bill.payTime;
+
+      this.data[6].name = "结算金额";
+      this.data[6].value = filters.unitPrice(bill.billPrice?bill.billPrice:0, "¥");
+
+      this.data[7].name = "结算详细";
+      this.data[7].value =
+        "最终结算金额(" +
+        filters.unitPrice(bill.billPrice, "¥") +
+        ") = 订单付款总金额(" +
+        filters.unitPrice(bill.orderPrice?bill.orderPrice:0, "¥") +
+        ") - 退单金额(" +
+        filters.unitPrice(bill.refundPrice?bill.refundPrice:0, "¥") +
+        ")" +
+        "- 平台收取佣金(" +
+        filters.unitPrice(bill.commissionPrice?bill.commissionPrice:0, "¥") +
+        ") + 退单产生退还佣金金额(" +
+        filters.unitPrice(bill.refundCommissionPrice?bill.refundCommissionPrice:0, "¥") +
+        ") - 分销返现支出(" +
+        filters.unitPrice(bill.distributionCommission?bill.distributionCommission:0, "¥") +
+        ") + 退单分销返现返还(" +
+        filters.unitPrice(bill.distributionRefundCommission?bill.distributionRefundCommission:0, "¥") +
+        ") - 平台优惠券支出(" +
+        filters.unitPrice(bill.siteCouponCommission?bill.siteCouponCommission:0, "¥") +
+        ") + 退单平台优惠券返还(" +
+        filters.unitPrice(bill.siteCouponRefundCommission?bill.siteCouponRefundCommission:0, "¥") +
+        ")";
+    },
+
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex {
+  justify-content: space-between;
+  flex-wrap: wrap;
+  > p {
+    width: 50%;
+    margin: 15px 0;
+  }
+}
+.tips-status {
+  padding: 18px;
+  > span {
+    font-weight: bold;
+    margin-right: 8px;
+  }
+  > span:nth-of-type(2) {
+    color: $theme_color;
+  }
+}
+</style>
diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue
new file mode 100644
index 00000000..dea74c4d
--- /dev/null
+++ b/seller/src/views/shop/bill/storeBill.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row @keydown.enter.native="handleSearch">
+            <Form
+              ref="searchForm"
+              :model="searchForm"
+              inline
+              :label-width="70"
+              class="search-form"
+            >
+              <Form-item label="开始时间" prop="startDay">
+                <DatePicker
+                  type="date"
+                  v-model="searchForm.startDate"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择"
+                  clearable
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="结束时间" prop="endDate">
+                <DatePicker
+                  type="date"
+                  v-model="searchForm.endDate"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  di
+                  placeholder="请选择"
+                  clearable
+                  style="width: 200px"
+                ></DatePicker>
+              </Form-item>
+              <Form-item label="状态" prop="orderStatus">
+                <Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
+                  <Option value="OUT">已出账</Option>
+                  <Option value="CHECK">已对账</Option>
+                  <Option value="COMPLETE">已完成</Option>
+                </Select>
+              </Form-item>
+              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+
+            </Form>
+          </Row>
+          <Row class="padding-row">
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Shop from "@/api/shops";
+
+  export default {
+    name: "storeBill",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          startDate: "", // 起始时间
+          endDate: "", // 终止时间
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "账单号",
+            key: "sn",
+            minWidth: 250,
+            tooltip: true          },
+          {
+            title: "生成时间",
+            key: "createTime",
+            minWidth: 120,
+          },
+          {
+            title: "结算时间段",
+            key: "startTime",
+            width: 200,
+            tooltip: true,
+            render: (h, params) => {
+              return h('div', params.row.startTime +"~"+params.row.endTime)
+            }
+          },
+          {
+            title: "结算金额",
+            key: "billPrice",
+            minWidth: 100,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.billPrice, "￥")
+              );
+            },
+          },
+
+
+          {
+            title: "状态",
+            key: "billStatus",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.billStatus == "OUT") {
+                return h( "Badge", {props: { status: "success",text: "已出账" } })
+              } else if (params.row.billStatus == "EXAMINE") {
+                return h( "Badge", {props: { status: "success",text: "已审核" } })
+              } else if (params.row.billStatus == "CHECK") {
+                return h( "Badge", {props: { status: "success",text: "已对账" } })
+              } else if (params.row.billStatus == "PAY") {
+                return h( "Badge", {props: { status: "success",text: "已付款" } })
+              }else if (params.row.billStatus == "COMPLETE") {
+                return h( "Badge", {props: { status: "success",text: "已完成" } })
+              }
+            }
+          },
+
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 120,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "info",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.detail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      selectDateRange(v) {
+        if (v) {
+          this.searchForm.startDate = v[0];
+          this.searchForm.endDate = v[1];
+        }
+      },
+      getDataList() {
+        this.loading = true;
+        API_Shop.getBillPage(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+
+      detail(v) {
+        let id = v.id;
+        this.$router.push({
+          name: "bill-detail",
+          query: { id: id },
+        });
+
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+   @import "@/styles/table-common.scss";
+
+</style>
diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
new file mode 100644
index 00000000..84685aff
--- /dev/null
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+
+        </Card>
+      </Col>
+    </Row>
+
+  </div>
+</template>
+
+<script>
+  import * as API_Shop from "@/api/shops";
+
+  export default {
+    name: "logistics",
+    components: {},
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "createTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+          sn: "",
+          sellerName: "",
+          startTime: "",
+          endTime: "",
+          billPrice: "",
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+
+          {
+            title: "物流公司",
+            key: "name",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "状态",
+            key: "selected",
+            minWidth: 120,
+            sortable: true,
+            render: (h, params) => {
+              if (params.row.selected === null || params.row.selected === "") {
+                return h( "Badge", {props: { status: "error",text: "关闭" } })
+              } else if (params.row.selected !== "") {
+                return h( "Badge", {props: { status: "success",text: "开启" } })
+              }
+            }
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+              if(params.row.selected === null){
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "success",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.checked(params.row);
+                        },
+                      },
+                    },
+                    "开启"
+                  ),
+                ]);
+              }else{
+                return h("div", [
+                  h(
+                    "Button",
+                    {
+                      props: {
+                        type: "error",
+                        size: "small",
+                      },
+                      style: {
+                        marginRight: "5px",
+                      },
+                      on: {
+                        click: () => {
+                          this.unChecked(params.row);
+                        },
+                      },
+                    },
+                    "关闭"
+                  ),
+                ]);
+              }
+
+            },
+          },
+        ],
+        data: [], // 表单数据
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      getDataList() {
+        this.loading = true;
+        API_Shop.getLogistics().then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+          }
+        });
+        this.loading = false;
+      },
+      //物流公司选中
+      checked(v) {
+        this.$Modal.confirm({
+          title: "确认开启",
+          // 记得确认修改此处
+          content: "您确认开启此物流公司?",
+          loading: true,
+          onOk: () => {
+            API_Shop.logisticsChecked(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.code == 200) {
+                this.$Message.success("物流公司开启成功");
+                this.init();
+              }
+            });
+          }
+        });
+      },
+      //物流公司取消选中
+      unChecked(v){
+        this.$Modal.confirm({
+          title: "确认关闭",
+          // 记得确认修改此处
+          content: "您确认关闭此物流公司?",
+          loading: true,
+          onOk: () => {
+            API_Shop.logisticsUnChecked(v.selected).then((res) => {
+              this.$Modal.remove();
+              if (res.code == 200) {
+                this.$Message.success("物流公司关闭成功");
+                this.init();
+              }
+            });
+          }
+        });
+      }
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  // @import "@/styles/table-common.scss";
+  .search {
+    .operation {
+      margin-bottom: 2vh;
+    }
+
+    .select-count {
+      font-weight: 600;
+      color: #40a9ff;
+    }
+
+    .select-clear {
+      margin-left: 10px;
+    }
+
+    .page {
+      margin-top: 2vh;
+    }
+
+    .drop-down {
+      margin-left: 5px;
+    }
+  }
+</style>
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
new file mode 100644
index 00000000..3ca479fd
--- /dev/null
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -0,0 +1,583 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Row>
+            <Button @click="refresh" >刷新</Button>
+            <Button @click="add" type="primary">添加</Button>
+          </Row>
+          <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+            <TabPane label="运费模板" name="INFO">
+              <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+                <tbody>
+                <tr>
+                  <td class="sep-row" colspan="20"></td>
+                </tr>
+                <tr>
+                  <th colspan="20"><h3>{{item.name}}</h3>
+                    <span class="fr m-r-5">
+                  <time style="margin-right: 20px" title="最后编辑时间">
+                    <i class="icon-time"></i>{{item.updateTime}}
+                  </time>
+                   <Button @click="edit(item)" type="info" >修改</Button>
+                   <Button @click="remove(item.id)" type="error">删除</Button>
+                 </span>
+                  </th>
+                </tr>
+                <tr>
+                  <td class="w10 bdl"></td>
+                  <td class="cell-area tl">运送到</td>
+                  <td class="w150">首件(重)
+
+                  </td>
+                  <td class="w150">运费</td>
+                  <td class="w150">续件(重)
+
+                  </td>
+                  <td class="w150 bdr">运费</td>
+                </tr>
+
+                <tr v-for="(children,index) in item.freightTemplateChildList">
+                  <td class="bdl"></td>
+                  <td class="cell-area tl" style="width: 60%">{{children.area}}</td>
+                  <td>
+                    {{children.firstCompany}}
+                  </td>
+                  <td>
+                    <span class="yuan">￥</span><span class="integer">{{children.firstPrice}}</span>
+                  </td>
+                  <td>
+                    {{children.continuedCompany}}
+                  </td>
+                  <td class="bdr">
+                    <span class="yuan">￥</span><span class="integer">{{children.continuedPrice}}</span>
+                  </td>
+                </tr>
+                </tbody>
+
+              </table>
+
+            </TabPane>
+            <TabPane v-if="csTab" :label=title :name=operation>
+              <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+                <FormItem label="模板名称" prop="name">
+                  <Input v-model="form.name" maxlength="10" clearable style="width: 20%"/>
+                </FormItem>
+                <FormItem label="计价方式" prop="pricingMethod">
+                  <RadioGroup v-model="form.pricingMethod">
+                    <Radio label="WEIGHT">按重量</Radio>
+                    <Radio label="NUM">按件数</Radio>
+                  </RadioGroup>
+                </FormItem>
+                <FormItem label="详细设置">
+                  <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                    <div class="entity">
+                      <div class="tbl-except">
+                        <table cellspacing="0" class="ncsc-default-table">
+                          <thead>
+                          <tr style="border-bottom: 1px solid #ddd;">
+                            <th class="w10"></th>
+                            <th class="tl">运送到</th>
+                            <th class="w10"></th>
+                            <th class="w50">首件(重)</th>
+                            <th class="w110">首费</th>
+                            <th class="w50">续件(重)</th>
+                            <th class="w110">续费</th>
+                            <th class="w150">操作</th>
+                          </tr>
+                          </thead>
+                          <tbody>
+                          <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
+                            <td></td>
+                            <td class="tl cell-area">
+                                <span class="area-group">
+                                <p style="display:inline-block">{{item.area}}</p></span>
+                            </td>
+                            <td></td>
+                            <td>
+                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable/>
+                            </td>
+                            <td>
+                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable/><em
+                              class="add-on">
+                              元
+                            </em>
+                            </td>
+                            <td>
+                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6"
+                                     clearable/>
+                            </td>
+                            <td>
+                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6"
+                                     clearable/><em class="add-on">
+                              元
+                            </em>
+                            </td>
+                            <td class="nscs-table-handle">
+                              <Button
+                                @click="editRegion(item)"
+                                type="info"
+                                size="small"
+                                style="margin-bottom: 5px"
+                              >修改
+                              </Button>
+                              <Button
+                                @click="removeTemplateChildren(index)"
+                                :loading="submitLoading"
+                                type="error"
+                                size="small"
+                                style="margin-bottom: 5px"
+                              >删除
+                              </Button>
+                            </td>
+                          </tr>
+                          </tbody>
+                        </table>
+                      </div>
+                      <div class="tbl-attach p-5">
+                        <div class="div-error" v-if="saveError">
+                          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                          <Icon type="ios-information-circle-outline"/>
+                          指定地区城市为空或指定错误
+                          <Icon type="ios-information-circle-outline"/>
+                          首费应输入正确的金额
+                          <Icon type="ios-information-circle-outline"/>
+                          续费应输入正确的金额
+                          <Icon type="ios-information-circle-outline"/>
+                          首(续)件(重)费应输入大于0的整数
+                        </div>
+                        <Button
+                          @click="addShipTemplateChildren(index)"
+                          :loading="submitLoading"
+                          type="info"
+                          size="small"
+                          icon="ios-create-outline"
+                          style="margin-bottom: 5px"
+                        >为指定城市设置运费模板
+                        </Button>
+                      </div>
+                    </div>
+                  </div>
+                </FormItem>
+                <Form-item>
+                  <Button
+                    @click="handleSubmit"
+                    :loading="submitLoading"
+                    type="primary"
+                    style="margin-right:5px"
+                  >保存
+                  </Button>
+                </Form-item>
+              </Form>
+            </TabPane>
+          </Tabs>
+        </Card>
+      </Col>
+    </Row>
+    <multiple-region ref="region" @selected="handleSelect"  @closed="handleClose">
+
+    </multiple-region>
+
+  </div>
+</template>
+
+<script>
+  import * as API_Shop from "@/api/shops";
+  import multipleRegion from "@/views/lili-components/multiple-region";
+
+
+  export default {
+    name: "shipTemplate",
+    components: {
+      multipleRegion
+    },
+
+    data() {
+      return {
+        item: "", //运费模板子模板
+        shipInfo: {}, // 运费模板数据
+        title: "添加运费模板", // 模态框标题
+        operation: "add", // 操作状态
+        currentTab: "", // 当前模板tab
+        saveError: false, // 是否显示错误提示
+        csTab: false, // 添加运费模板显示
+        form: {
+          // 添加或编辑表单对象初始化数据
+          name: "",
+          pricingMethod: "WEIGHT"
+        },
+        formValidate: {
+          name: [
+            {
+              required: true,
+              message: "请输入模板名称",
+              trigger: "blur",
+            },
+          ],
+          pricingMethod: [ // 计费方式
+            {
+              required: true,
+              message: "请选择计费方式",
+              trigger: "blur",
+            },
+          ],
+        },
+      };
+    },
+    methods: {
+      init() {
+        this.getData();
+      },
+      //切换tabPane
+      handleClickType(v) {
+        if (v == "INFO") {
+          this.getData();
+          this.csTab = false
+        }
+      },
+      //添加运费模板
+      add() {
+        this.title = "添加运费模板"
+        this.csTab = true
+        this.operation = "ADD"
+        this.currentTab = "ADD"
+        this.saveError = false;
+        this.form = {
+          pricingMethod: "WEIGHT",
+          name: "",
+          freightTemplateChildList: [{
+            area: "",
+            areaId: "",
+            firstCompany: "1",
+            firstPrice: "",
+            continuedCompany: "1",
+            continuedPrice: ""
+          }]
+
+        }
+
+      },
+      //修改运费模板
+      edit(item) {
+        this.title = "修改运费模板"
+        this.csTab = true
+        this.operation = "EDIT"
+        this.currentTab = "EDIT"
+        this.saveError = false;
+        //给form赋值
+        this.form = item
+      },
+      //选择地区
+      editRegion(item){
+        this.item = item
+
+        this.$refs.region.open(item)
+      },
+      //刷细数据
+      refresh() {
+        this.csTab = false
+        this.operation = "INFO"
+        this.currentTab = "INFO"
+        this.getData()
+      },
+      //运费模板数据
+      getData() {
+        API_Shop.getShipTemplate().then((res) => {
+          this.shipInfo = res.result
+        });
+      },
+
+      handleSelect(v) {
+        let area = ""
+        let areaId= ""
+        if(v != ""){
+          v.forEach((child, index) => {
+            if(child.selectedList!=""){
+              child.selectedList.forEach((child, index) => {
+                area+=child.name +","
+                areaId+=child.id +","
+              })
+            }
+          })
+        }
+        this.item.area = area
+        this.item.areaId= areaId
+      },
+      //添加或者修改运费模板
+      handleSubmit() {
+        const headers = {
+          "Content-Type": "application/json;charset=utf-8"
+        }
+
+        this.$refs.form.validate((valid) => {
+          const regNumber = /^\+?[1-9][0-9]*$/;
+          const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+          if (valid) {
+            //校验运费模板详细信息
+            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+              if (this.form.freightTemplateChildList[i].area == ""
+                || this.form.freightTemplateChildList[i].firstCompany == ""
+                || this.form.freightTemplateChildList[i].firstPrice == ""
+                || this.form.freightTemplateChildList[i].continuedCompany == ""
+                || this.form.freightTemplateChildList[i].continuedPrice == "") {
+                this.saveError = true;
+                return
+              }
+              if (regNumber.test(this.form.freightTemplateChildList[i].firstCompany) == false
+                || regNumber.test(this.form.freightTemplateChildList[i].continuedCompany) == false
+                || regMoney.test(this.form.freightTemplateChildList[i].firstPrice) == false
+                || regMoney.test(this.form.freightTemplateChildList[i].continuedPrice) == false) {
+                this.saveError = true;
+                return;
+              }
+            }
+            if (this.operation == "ADD") {
+              API_Shop.addShipTemplate(this.form, headers).then((res) => {
+                if (res.success) {
+                  this.$Message.success("新增成功");
+                  this.operation = "INFO"
+                  this.currentTab = "INFO"
+                  this.csTab = false
+                  this.getData()
+                }
+              });
+            } else {
+              API_Shop.editShipTemplate(this.form.id, this.form, headers).then((res) => {
+                if (res.success) {
+                  this.$Message.success("新增成功");
+                  this.operation = "INFO"
+                  this.currentTab = "INFO"
+                  this.csTab = false
+                  this.getData()
+                }
+              });
+            }
+          }
+        })
+      },
+      //添加子模板
+      addShipTemplateChildren() {
+        const params = {
+          area: '',
+          areaId: "",
+          firstCompany: '1',
+          firstPrice: '',
+          continuedCompany: '1',
+          continuedPrice: ''
+        }
+        this.form.freightTemplateChildList.push(params)
+      },
+      //删除一个子模板
+      removeTemplateChildren(index) {
+        if (Object.keys(this.form.freightTemplateChildList).length == 1) {
+          this.$Message.success("必须保留一个子模板");
+          return
+        }
+        this.form.freightTemplateChildList.splice(index, 1);
+      },
+      //删除运费模板
+      remove(id) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "您确认要删除此运费模板 ?",
+          loading: true,
+          onOk: () => {
+            API_Shop.deleteShipTemplate(id).then((res) => {
+              if (res.success) {
+                this.$Message.success("删除成功");
+              }
+              this.$Modal.remove();
+              this.getData();
+            });
+
+
+          }
+        });
+      }
+
+
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  .ncsc-default-table thead th {
+    line-height: 20px;
+    color: #555;
+    background-color: #FAFAFA;
+    text-align: center;
+    height: 20px;
+    padding: 9px 0;
+    border-bottom: solid 1px #DDD;
+  }
+
+  .ncsc-default-table {
+    line-height: 20px;
+    width: 100%;
+    border-collapse: collapse;
+
+    tbody th {
+      background-color: #FAFAFA;
+      border: solid #E6E6E6;
+      border-width: 1px 0;
+      padding: 4px 0;
+
+    }
+
+    tbody td {
+      color: #999;
+      background-color: #FFF;
+      text-align: center;
+      padding: 6px 0;
+    }
+  }
+
+
+  .order tbody tr td {
+    border-bottom: 1px solid #E6E6E6;
+    vertical-align: top;
+  }
+
+  .order tbody tr td.bdr {
+    border-right: 1px solid #E6E6E6;
+  }
+
+  .order tbody tr th {
+    border: solid 1px #DDD;
+  }
+
+  .order tbody tr td.sep-row {
+    height: 14px;
+    border: 0;
+  }
+
+  .w10 {
+    width: 10px !important;
+  }
+
+  .tl {
+    text-align: left !important;
+  }
+
+  .order tbody tr td.bdl {
+    border-left: 1px solid #E6E6E6;
+  }
+
+  .order tbody tr th h3 {
+    font-size: 14px;
+    line-height: 20px;
+    color: #555;
+    vertical-align: middle;
+    display: inline-block;
+    margin: 0 10px;
+  }
+
+  .m-r-5 {
+    margin-right: 5px !important;
+  }
+
+  .fr {
+    float: right !important;
+  }
+
+  .m-b-30 {
+    margin-bottom: 10px !important;
+  }
+
+  Button {
+    margin: 3px 5px 0px 5px;
+  }
+
+  thead {
+    display: table-header-group;
+    vertical-align: middle;
+    border-color: inherit;
+  }
+
+  tr {
+    display: table-row;
+    vertical-align: inherit;
+    border-color: inherit;
+  }
+
+  caption, th {
+    text-align: left;
+  }
+
+  .tl {
+    text-align: left !important;
+  }
+
+  colgroup {
+    display: table-column-group;
+  }
+
+  button, input, select, textarea {
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+  }
+
+  .bd-line td {
+    border-bottom: solid 1px #EEE;
+  }
+
+  .w40 {
+    width: 60px !important;
+  }
+
+  .w60 {
+    width: 80px !important;
+  }
+
+  Input[type="text"], Input[type="password"], Input.text, Input.password {
+    display: inline-block;
+    min-height: 20px;
+    padding: 10px;
+    border: solid 1px #E6E9EE;
+    outline: 0 none;
+  }
+
+  .add-on {
+    line-height: 28px;
+    background-color: #F6F7Fb;
+    vertical-align: top;
+    display: inline-block;
+    text-align: center;
+    width: 30px;
+    height: 30px;
+    border: solid #E6E9EE;
+    border-width: 1px 1px 1px 0;
+  }
+
+  ncsc-default-table {
+    line-height: 20px;
+    width: 100%;
+    border-collapse: collapse;
+    clear: both;
+  }
+
+  .ncsu-trans-type {
+    background-color: #FFF;
+    border: solid #DDD 1px;
+  }
+
+  i, cite, em {
+    font-style: normal;
+  }
+
+  .cell-area {
+    width: 50%;
+  }
+
+  .div-error {
+    margin-left: 7px;
+    margin-bottom: -8px;
+    font-size: 15px;
+    color: #F00;
+  }
+</style>
diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue
new file mode 100644
index 00000000..44fb53c1
--- /dev/null
+++ b/seller/src/views/shop/shopAddress.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+
+          <Row class="operation">
+            <Button @click="add" type="primary">添加</Button>
+          </Row>
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-selection-change="changeSelect"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchForm.pageNumber"
+              :total="total"
+              :page-size="searchForm.pageSize"
+              @on-change="changePage"
+              @on-page-size-change="changePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="名称" prop="addressName">
+          <Input v-model="form.addressName" clearable style="width: 90%"/>
+        </FormItem>
+        <FormItem label="详细地址" prop="address">
+          <Input v-model="form.address" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 90%"/>
+        </FormItem>
+        <FormItem label="联系电话" prop="mobile">
+          <Input v-model="form.mobile" clearable style="width: 90%" maxlength="11"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+    <liliMap ref="liliMap" @getAddress="getAddress"></liliMap>
+  </div>
+</template>
+
+<script>
+  import * as API_Shop from "@/api/shops";
+  import { validateMobile } from "@/libs/validate";
+  import liliMap from "@/views/my-components/map/index";
+
+
+  export default {
+    name: "shopAddress",
+    components: {
+      liliMap
+    },
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
+        selectDate: null,
+        form: {
+          // 添加或编辑表单对象初始化数据
+          addressName: "",
+          center: "",
+          address:"",//详细地址
+          mobile:"",//手机号码
+        },
+
+        // 表单验证规则
+        formValidate: {
+          addressName: [
+            {
+              required: true,
+              message: "请输入地址名称",
+              trigger: "blur",
+            },
+          ],
+          longitude: [
+            {
+              required: true,
+              message: "请输入地址经度",
+              trigger: "blur",
+            },
+          ],
+          latitude: [
+            {
+              required: true,
+              message: "请输入地址纬度",
+              trigger: "blur",
+            },
+          ],
+          mobile: [
+            {
+              required: true,
+              message: "请输入地址纬度",
+              trigger: "blur",
+            },
+            { validator: validateMobile,
+              trigger: "blur"
+            }
+          ],
+          address: [
+            {
+              required: true,
+              message: " ",
+              trigger: "blur",
+            },
+          ],
+        },
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          // 表头
+          {
+            title: "自提点名称",
+            key: "addressName",
+            minWidth: 120,
+            sortable: false,
+          },
+          {
+            title: "详细地址",
+            key: "address",
+            minWidth: 280
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+            minWidth: 120,
+            sortable: true,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "success",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.edit(params.row);
+                      },
+                    },
+                  },
+                  "修改"
+                ),
+                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.deleteSubmit(params.row);
+                      },
+                    },
+                  },
+                  "删除"
+                )
+              ]);
+            },
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+      };
+    },
+    methods: {
+      init() {
+        this.getDataList();
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      handleReset() {
+        this.$refs.searchForm.resetFields();
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        // 重新加载数据
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+        this.selectCount = e.length;
+      },
+      //获取地址
+      getAddress(item){
+
+        this.$set(this.form, 'address', item.addr)
+        this.form.address = item.address
+        this.form.center = item.position.lat + "," + item.position.lng
+      },
+      getDataList() {
+        this.loading = true;
+        API_Shop.getShopAddress(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      //添加弹出框
+      add() {
+        this.$refs.form.resetFields()
+        this.modalVisible = true
+        this.modalTitle = "添加自提地址"
+      },
+      //修改弹出框
+      edit(v) {
+        this.modalType = 1
+        this.modalVisible = true
+        this.modalTitle = "修改自提地址"
+        this.form.id = v.id
+        this.form.address = v.address
+        this.form.addressName = v.addressName
+        this.form.mobile = v.mobile
+        this.form.center = v.center
+        this.form.longitude = v.center.split(',')[0]
+        this.form.latitude = v.center.split(',')[1]
+      },
+
+      //保存或者编辑
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            if (this.modalType == 0) {
+              // 添加
+              delete this.form.id;
+              API_Shop.addShopAddress(this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("添加成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            } else {
+              // 编辑
+              API_Shop.editShopAddress(this.form.id, this.form).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("修改成功");
+                  this.getDataList();
+                  this.modalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      //删除提交
+      deleteSubmit(v){
+        this.$Modal.confirm({
+          title: "确认删除",
+          // 记得确认修改此处
+          content: "确认删除自提地址么？",
+          loading: true,
+          onOk: () => {
+            API_Shop.deleteShopAddress(v.id).then((res) => {
+              this.$Modal.remove();
+              if (res.code == 200) {
+                this.$Message.success("此自自提地址已删除");
+                this.init();
+              }
+            });
+          }
+        });
+      }
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  // @import "@/styles/table-common.scss";
+  .search {
+    .operation {
+      margin-bottom: 2vh;
+    }
+
+    .select-count {
+      font-weight: 600;
+      color: #40a9ff;
+    }
+
+    .select-clear {
+      margin-left: 10px;
+    }
+
+    .page {
+      margin-top: 2vh;
+    }
+
+    .drop-down {
+      margin-left: 5px;
+    }
+  }
+</style>
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
new file mode 100644
index 00000000..43297f99
--- /dev/null
+++ b/seller/src/views/shop/shopSetting.vue
@@ -0,0 +1,311 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+      <Card style="margin-left: 10px">
+        <Tabs @on-click="handleClickType">
+          <TabPane label="基本信息" name="INFO">
+
+            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+              <FormItem label="店铺名称">
+                <Input v-model="storeName" disabled clearable style="width: 20%" />
+              </FormItem>
+              <FormItem label="店铺地址" prop="address">
+                <Input v-model="form.address" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 20%" />
+              </FormItem>
+              <FormItem label="详细地址" prop="shopAddressDetail">
+                <Input v-model="form.storeAddressDetail" clearable style="width: 20%" maxlength="50" />
+              </FormItem>
+              <FormItem label="店铺LOGO：">
+                <upload-pic-thumb v-model="form.storeLogo" :multiple="false"></upload-pic-thumb>
+              </FormItem>
+              <FormItem label="店铺简介" prop="content" class="wangEditor">
+                <editor v-model="form.storeDesc" style="width: 30%"></editor>
+              </FormItem>
+              <Form-item>
+                <Button @click="handleSubmit" :loading="submitLoading" type="primary"  style="margin-right:5px">修改
+                </Button>
+              </Form-item>
+            </Form>
+          </TabPane>
+          <TabPane label="退货地址" name="REFUND_GOODS_ADDRESS">
+            <Form ref="addressForm" :model="addressForm" :label-width="100" :rules="afterFormValidate">
+              <FormItem label="收货人" prop="salesConsigneeName">
+                <Input v-model="addressForm.salesConsigneeName" maxlength="11" clearable style="width: 20%" />
+              </FormItem>
+              <FormItem label="收货人电话" prop="salesConsigneeMobile">
+                <Input v-model="addressForm.salesConsigneeMobile" maxlength="11" style="width: 20%" />
+              </FormItem>
+              <FormItem label="售后地址">
+                <Input v-model="region" disabled style="width: 20%" v-if="showRegion == false" />
+                <Button v-if="showRegion == false" @click="regionClick" :loading="submitLoading" type="primary"  style="margin-left:8px">修改
+                </Button>
+                <region style="width: 20%" @selected="selectedRegion" v-if="showRegion == true" />
+              </FormItem>
+              <FormItem label="详细地址" prop="salesConsigneeDetail">
+                <Input v-model="addressForm.salesConsigneeDetail" clearable style="width: 20%" maxlength="50" />
+              </FormItem>
+
+              <Form-item>
+                <Button @click="afterHandleSubmit" :loading="submitLoading" type="primary"  style="margin-right:5px">修改
+                </Button>
+              </Form-item>
+            </Form>
+          </TabPane>
+          <TabPane label="库存预警" name="STOCK_WARNING">
+
+            <Form ref="stockWarningForm" :model="stockWarningForm" :label-width="100" :rules="stockWarningFormValidate">
+              <FormItem label="预警数" prop="stockWarning">
+                <Input v-model="stockWarningForm.stockWarning" type="number" maxlength="6" clearable style="width: 20%" />
+              </FormItem>
+              <Form-item>
+                <Button @click="stockWarningHandleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">修改
+                </Button>
+              </Form-item>
+            </Form>
+          </TabPane>
+        </Tabs>
+
+      </Card>
+      </Col>
+    </Row>
+
+    <liliMap ref="liliMap" @getAddress="getAddress"></liliMap>
+  </div>
+</template>
+
+<script>
+import * as API_Shop from "@/api/shops";
+import { validateMobile } from "@/libs/validate";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
+import editor from "@/views/my-components/lili/editor";
+import liliMap from "@/views/my-components/map/index";
+import region from "@/views/lili-components/region";
+import * as RegExp from "@/libs/RegExp.js";
+import Cookies from 'js-cookie'
+
+export default {
+  name: "shopSetting",
+  components: {
+    uploadPicThumb,
+    editor,
+    liliMap,
+    region,
+  },
+  data() {
+    return {
+      showRegion: false, // 选择地址模态框显隐
+      storeName: "", //店铺名称
+      region: [], // 地区名称
+      regionId: [], // 地区id
+      addressForm: { // 退货地址
+        salesConsigneeName: "", // 收货人姓名
+        salesConsigneeMobile: "", // 收货人电话
+        salesConsigneeAddressId: "", // 售后地址id,逗号分割
+        salesConsigneeAddressPath: "",// 售后地址，逗号分割
+        salesConsigneeDetail: "", // 详细地址
+      },
+      //库存预警form
+      stockWarningForm: {
+        stockWarning: "", // 库存预警数量
+      },
+      stockWarningFormValidate: {
+        stockWarning: [
+          { required: true, message: "请输入库存预警数", trigger: "blur" },
+        ],
+      },
+      afterFormValidate: {
+        salesConsigneeMobile: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            pattern: RegExp.mobile,
+            trigger: "blur",
+            message: "请输入正确的手机号",
+          },
+        ],
+        salesConsigneeName: [
+          { required: true, message: "请输入收货人", trigger: "blur" },
+        ],
+        salesConsigneeDetail: [
+          { required: true, message: "请输入详细地址", trigger: "blur" },
+        ],
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        storeAddressPath: "", // 店铺地址中文
+        center: "", // 经度 + 纬度
+        longitude: "", //经度
+        latitude: "", //纬度
+        storeAddressDetail: "", //详细地址
+        storeAddressIdPath: "", //地址
+        storeDesc: "", // 店铺描述
+      },
+
+      // 表单验证规则
+      formValidate: {
+        addressName: [
+          {
+            required: true,
+            message: "请输入地址名称",
+            trigger: "blur",
+          },
+        ],
+        longitude: [
+          {
+            required: true,
+            message: "请输入地址经度",
+            trigger: "blur",
+          },
+        ],
+        latitude: [
+          {
+            required: true,
+            message: "请输入地址纬度",
+            trigger: "blur",
+          },
+        ],
+        mobile: [
+          {
+            required: true,
+            message: "请输入地址纬度",
+            trigger: "blur",
+          },
+          {
+            validator: validateMobile,
+            trigger: "blur",
+          },
+        ],
+        storeAddressDetail: [
+          {
+            required: true,
+            message: "请输入详细地址",
+            trigger: "blur",
+          },
+        ],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+    };
+  },
+  methods: {
+    init() {
+      this.getShopInfo();
+    },
+    //获取店铺信息
+    getShopInfo() {
+      this.loading = true;
+      API_Shop.getShopInfo().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.form = res.result;
+          this.$set(this.form, "address", res.result.storeAddressPath);
+          this.storeName = res.result.storeName;
+          this.form.center = res.result.storeCenter;
+          Cookies.set("userInfo", JSON.stringify(res.result));
+          //库存预警数赋值
+
+          this.$nextTick(() => {
+            this.stockWarningForm.stockWarning = res.result.stockWarning+"";
+          });
+        }
+      });
+    },
+    //修改售后地址
+    regionClick() {
+      this.showRegion = true;
+      this.regionId = "";
+    },
+    //重置
+    handleReset() {
+      this.$refs.form.resetFields();
+    },
+    //提交保存
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          API_Shop.saveShopInfo(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("修改成功");
+              this.getShopInfo();
+            }
+          });
+        }
+      });
+    },
+    //修改库存预警数
+    stockWarningHandleSubmit() {
+      this.$refs.stockWarningForm.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          API_Shop.updateStockWarning(this.stockWarningForm).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("修改成功");
+              this.getShopInfo();
+            }
+          });
+        }
+      });
+    },
+    // 选中的地址
+    selectedRegion(val) {
+      this.region = val[1];
+      this.regionId = val[0];
+    },
+    //tab切换
+    handleClickType(v) {
+      //退款
+      if (v == "INFO") {
+        this.getShopInfo();
+      }
+      //退货
+      if (v == "REFUND_GOODS_ADDRESS") {
+        this.getRefundGoodsAddress();
+      }
+    },
+    //获取商家退货地址
+    getRefundGoodsAddress() {
+      API_Shop.getRefundGoodsAddress().then((res) => {
+        if (res.result != null) {
+          this.addressForm = res.result;
+          this.regionId = res.result.salesConsigneeAddressId;
+          this.region = res.result.salesConsigneeAddressPath;
+        }
+      });
+    },
+    //提交保存
+    afterHandleSubmit() {
+      if (this.regionId == "") {
+        this.$Message.error("请选择地址");
+        return;
+      }
+      this.$refs.addressForm.validate((valid) => {
+        if (valid) {
+          this.addressForm.salesConsigneeAddressPath = this.region;
+          this.addressForm.salesConsigneeAddressId = this.regionId;
+          this.submitLoading = true;
+          API_Shop.saveRefundGoodsAddress(this.addressForm).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("修改成功");
+              this.getRefundGoodsAddress();
+              this.showRegion = false;
+            }
+          });
+        }
+      });
+    },
+    //获取地址
+    getAddress(item) {
+      this.$set(this.form, "address", item.addr);
+      this.form.storeAddressPath = item.addr;
+      this.form.storeAddressIdPath = item.addrId;
+      this.form.center = item.position.lat + "," + item.position.lng;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
diff --git a/seller/src/views/statistics/goods.vue b/seller/src/views/statistics/goods.vue
new file mode 100644
index 00000000..6c923c19
--- /dev/null
+++ b/seller/src/views/statistics/goods.vue
@@ -0,0 +1,111 @@
+<template>
+  <div>
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+        <affixTime :closeShop="true" @selected="clickBreadcrumb"/>
+      </Card>
+    </Affix>
+    <Card class="card">
+
+      <Tabs @on-click="handleClickType">
+        <TabPane label="热门商品订单数量" name="NUM">
+          <Table :columns="columns" :data="data"></Table>
+        </TabPane>
+        <TabPane label="热门商品订单金额" name="PRICE">
+          <Table :columns="columns" :data="data"></Table>
+        </TabPane>
+      </Tabs>
+
+    </Card>
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+import Cookies from "js-cookie";
+export default {
+  data() {
+    return {
+      params: { // 请求参数
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        storeId: JSON.parse(Cookies.get("userInfo")).id || '',
+        type: "NUM"
+      },
+      columns: [ // 表格表头
+        {
+          title: "商品名称",
+          key: "goodsName",
+        },
+        {
+          title: "销售数量",
+          key: "num",
+        },
+        {
+          title: "销售金额",
+          key: "price",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.price)
+            );
+          },
+        },
+      ],
+      data: [], // 表格数据
+    };
+  },
+  methods: {
+    handleClickType(name) {
+      this.params.type = name;
+      this.getData();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = item;
+      let type = this.params.type;
+      this.params = {...callback};
+      this.params.type = type;
+      this.getData();
+    },
+    getData() {
+      Promise.all([API_Goods.goodsStatistics(this.params)]).then((res) => {
+        if (res[0].result) {
+          this.data = res[0].result;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.getData();
+  },
+};
+</script>
+<style scoped lang="scss">
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+
+.order-col {
+  display: flex;
+
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+
+.order-list {
+  display: flex;
+}
+
+.tips {
+  margin: 0 8px;
+}
+
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
new file mode 100644
index 00000000..066deed2
--- /dev/null
+++ b/seller/src/views/statistics/order.vue
@@ -0,0 +1,806 @@
+<template>
+
+  <div class="wrapper">
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+
+        <affixTime @selected="clickBreadcrumb" />
+
+      </Card>
+    </Affix>
+
+    <Card class="card">
+      <div>
+        <h4>交易概况</h4>
+        <div class="flex">
+          <div class="transactionList">
+            <div class="transaction-item" v-for="(item,index) in transactionList" :key="index">
+              <h4>{{item.label}}</h4>
+              <div class="transaction-card" v-if="item.label=='转换'">
+
+                <div class="card-item">
+                  <div class="card-item-label">访客数UV</div>
+                  <div class="card-item-value">{{overViewList.uvNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单转化率</div>
+                  <div class="card-item-value">{{overViewList.orderConversionRate || '0%'}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款转化率</div>
+                  <div class="card-item-value">{{overViewList.paymentsConversionRate ||'0%'}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">全店转化率</div>
+                  <div class="card-item-value">{{overViewList.overallConversionRate || '0%'}}</div>
+                </div>
+
+              </div>
+              <div class="transaction-card" v-if="item.label=='订单'">
+
+                <div class="card-item">
+                  <div class="card-item-label">下单笔数</div>
+                  <div class="card-item-value">{{overViewList.orderNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单人数</div>
+                  <div class="card-item-value">{{overViewList.orderMemberNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">下单金额</div>
+                  <div class="card-item-value">{{overViewList.orderAmount| unitPrice('￥') }}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款笔数</div>
+                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">付款金额</div>
+                  <div class="card-item-value">{{overViewList.paymentAmount | unitPrice('￥')}}</div>
+                </div>
+
+              </div>
+              <div class="transaction-card" v-if="item.label=='退单'">
+
+                <div class="card-item">
+                  <div class="card-item-label">退单笔数</div>
+                  <div class="card-item-value">{{overViewList.refundOrderNum || 0}}</div>
+                </div>
+                <div class="card-item">
+                  <div class="card-item-label">退单金额</div>
+                  <div class="card-item-value">{{overViewList.refundOrderPrice || 0}}</div>
+                </div>
+
+              </div>
+            </div>
+          </div>
+          <div class="shap">
+            <div id="overViewChart">
+              <!-- 上 -->
+              <div class="block">
+                <div class="box">
+                  <span>访客数</span>
+                  <span>{{overViewList.uvNum  || 0}}</span>
+                </div>
+              </div>
+              <!-- 中 -->
+              <div class="block">
+                <div class="box">
+                  <span>下单笔数</span>
+                  <span>{{overViewList.orderNum  || 0}}</span>
+                </div>
+              </div>
+              <!-- 下 -->
+              <div class="block">
+                <div class="box">
+                  <span>付款笔数</span>
+                  <span>{{overViewList.paymentsNum  || 0 }}</span>
+                </div>
+              </div>
+
+              <!-- 线 -->
+              <div class="rightBorder">
+
+              </div>
+              <div class="leftTopBorder">
+
+              </div>
+              <div class="leftBottomBorder">
+
+              </div>
+              <!--数据 -->
+              <div class="leftTopTips">
+                <div>下单转化率 </div>
+                <div>{{overViewList.orderConversionRate  || '0%' }}</div>
+              </div>
+              <div class="leftBottomTips">
+                <div>付款转化率</div>
+                <div>{{overViewList.paymentsConversionRate  || '0%'}}</div>
+              </div>
+              <div class="rightTips">
+                <div>整体转换率</div>
+                <div>{{overViewList.overallConversionRate  || '0%'}}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>交易趋势</h4>
+        <div>
+
+        </div>
+      </div>
+
+      <div>
+
+        <div id="orderChart"></div>
+
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>订退单统计</h4>
+        <div class="breadcrumb" style="margin-bottom:20px;">
+          <span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
+        </div>
+        <div>
+          <Table stripe :columns="columns" :data="data"></Table>
+
+        </div>
+        <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
+
+      </div>
+
+    </Card>
+
+  </div>
+</template>
+<script>
+import * as API_Goods from "@/api/goods";
+import { Chart } from "@antv/g2";
+
+import orderRow from "./order/orderDetail";
+import refundRow from "./order/refundOrder";
+import affixTime from "@/views/lili-components/affix-time";
+import Cookies from "js-cookie";
+export default {
+  components: { orderRow, refundRow, affixTime },
+
+  data() {
+    return {
+      total: "0", // 订单总数
+      orderType: [ // tab切换状态
+        {
+          title: "订单",
+          selected: true,
+        },
+        {
+          title: "退单",
+          selected: false,
+        },
+      ],
+      // 订单状态
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+
+      serviceTypeList: { // 服务类型
+        CANCEL: "取消",
+        RETURN_GOODS: "退货",
+        EXCHANGE_GOODS: "换货",
+        RETURN_MONEY: "退款",
+      },
+      serviceStatusList: { // 服务类型
+        APPLY: "申请售后",
+        PASS: "通过售后",
+        REFUSE: "拒绝售后",
+        BUYER_RETURN: "买家退货，待卖家收货",
+        SELLER_RE_DELIVERY: "商家换货/补发",
+        SELLER_CONFIRM: "卖家确认收货",
+        SELLER_TERMINATION: "卖家终止售后",
+        BUYER_CONFIRM: "买家确认收货",
+        BUYER_CANCEL: "买家取消售后",
+        WAIT_REFUND: "等待平台退款",
+        COMPLETE: "完成售后",
+      },
+      //
+
+      data: [], //定退单存储值
+
+      columns: [], // 定退单title
+
+      orderColumns: [ // 订单表头
+        {
+          type: "expand",
+          width: 50,
+          render: (h, params) => {
+            return h(orderRow, {
+              props: {
+                res: params.row,
+              },
+            });
+          },
+        },
+        {
+          title: "商家名称",
+          key: "storeName",
+        },
+        {
+          title: "用户名",
+          key: "memberName",
+        },
+
+        {
+          title: "订单状态",
+          key: "orderStatus",
+          render: (h, params) => {
+            return h("div", this.orderStatusList[params.row.orderStatus]);
+          },
+        },
+        {
+          title: "创建时间",
+          key: "createTime",
+        },
+
+        {
+          title: "支付时间",
+          key: "paymentTime",
+          render: (h, params) => {
+            return h("div", params.row.paymentTime || "暂无");
+          },
+        },
+        {
+          title: "价格",
+          key: "flowPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+      ],
+      refundColumns: [ // 退货单表头
+        {
+          type: "expand",
+          width: 50,
+          render: (h, params) => {
+            return h(refundRow, {
+              props: {
+                res: params.row,
+              },
+            });
+          },
+        },
+        {
+          title: "商品图片",
+          key: "goodsImage",
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.goodsImage,
+              },
+              style: {
+                width: "60px",
+                verticalAlign: "middle",
+              },
+            });
+          },
+        },
+
+        {
+          title: "商品名称",
+          key: "goodsName",
+        },
+        {
+          title: "商家名称",
+          key: "sellerName",
+        },
+        {
+          title: "售后单类型",
+          key: "serviceType",
+          render: (h, params) => {
+            return h("div", this.serviceTypeList[params.row.serviceType]);
+          },
+        },
+        {
+          title: "售后单状态",
+          key: "serviceStatus",
+          render: (h, params) => {
+            return h("div", this.serviceStatusList[params.row.serviceStatus]);
+          },
+        },
+        {
+          title: "退款时间",
+          key: "refundTime",
+          render: (h, params) => {
+            return h("div", params.row.refundTime || "暂无");
+          },
+        },
+        {
+          title: "申请退款金额",
+          key: "applyRefundPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              "￥" +
+                (params.row.applyRefundPrice ? params.row.applyRefundPrice : 0)
+            );
+          },
+        },
+        {
+          title: "申请原因",
+          key: "reason",
+        },
+        {
+          title: "实际金额",
+          key: "flowPrice",
+          render: (h, params) => {
+            return h(
+              "div",
+              this.$options.filters.unitPrice(params.row.flowPrice, "￥")
+            );
+          },
+        },
+      ],
+
+      // 交易概况
+      transactionList: [
+        {
+          label: "转换",
+          value: "",
+        },
+        {
+          label: "订单",
+          value: "",
+        },
+        {
+          label: "退单",
+          value: "",
+        },
+      ],
+
+      chartList: [], // 绘制订单图表数据
+      orderChart: "", //订单图表
+
+      overViewList: {}, // 绘制订单统计概览
+      overViewChart: "", //订单订单统计概览图标
+
+      // 时间
+      dateList: [
+        {
+          title: "今天",
+          selected: false,
+          value: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          value: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          value: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          value: "LAST_THIRTY",
+        },
+      ],
+
+      // 订单传参
+      orderParams: {
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        year: "",
+        storeId: JSON.parse(Cookies.get("userInfo")).id || '',
+        memberId: "",
+      },
+      // 订单概念
+      overViewParams: {
+        month: "",
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        storeId: JSON.parse(Cookies.get("userInfo")).id || '',
+        year: "",
+      },
+      defaultParams: {
+        month: "",
+        searchType: "LAST_SEVEN", // TODAY ,  YESTERDAY , LAST_SEVEN , LAST_THIRTY
+        storeId: JSON.parse(Cookies.get("userInfo")).id || '',
+        year: "",
+      },
+
+      refundIndex: 0, // 当前退单下标详情
+      // 退单订单
+      refundParams: {
+        pageNumber: 1,
+        pageSize: 10,
+        searchType: "LAST_SEVEN",
+        storeId:JSON.parse(Cookies.get("userInfo")).id || '',
+        year: "",
+      },
+
+      //
+      //
+    };
+  },
+  watch: {
+    refundParams: {
+      handler() {
+        console.log(this.refundIndex);
+        if (this.refundIndex == 1) {
+          this.getOrderRefundList();
+        } else {
+          this.getOrderList();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+    orderParams: {
+      handler() {
+        this.initOrderChartList();
+      },
+      deep: true,
+    },
+    overViewParams: {
+      handler() {
+        this.initOrderOverViewList();
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    clickTab(item, index) {
+      this.refundIndex = index;
+      this.orderType.forEach((res) => {
+        res.selected = false;
+      });
+      if (item.title == "退单") {
+        this.getOrderRefundList();
+      } else {
+        this.getOrderList();
+      }
+      item.selected = true;
+    },
+    // 订单图
+    initOrderChart() {
+      // 默认已经加载 legend-filter 交互
+      let data = this.chartList;
+
+      this.orderChart.data(data);
+      this.orderChart.scale({
+        finalPrice: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+      this.orderChart.axis("finalPrice", {
+        label: {
+          formatter: (val) => {
+            return val + "元";
+          },
+        },
+      });
+      this.orderChart
+        .line()
+        .position("createTime*price")
+
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("createTime*price")
+
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+      this.orderChart.render();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = JSON.parse(JSON.stringify(item));
+
+      this.orderParams = callback;
+
+      this.overViewParams = callback;
+      this.refundParams = callback;
+    },
+
+    // 实例化订单概览
+    async initOrderOverViewList() {
+      const res = await API_Goods.getOrderOverView(this.overViewParams);
+      if (res.success) {
+        this.overViewList = res.result;
+        console.log(res.result);
+      }
+    },
+    // 实例化订单图表
+    async initOrderChartList(name) {
+      const res = await API_Goods.getOrderChart(this.orderParams);
+      if (res.success) {
+        this.chartList = res.result;
+
+        if (!this.orderChart) {
+          this.orderChart = new Chart({
+            container: "orderChart",
+            autoFit: true,
+            height: 500,
+            padding: [70, 35, 70, 35],
+          });
+        }
+
+        this.initOrderChart(); //订单表
+      }
+    },
+    // 统计相关订单统计
+    async getOrderList() {
+      const res = await API_Goods.statisticsOrderList(this.refundParams);
+      if (res.success) {
+        this.data = res.result.records;
+        this.columns = this.orderColumns;
+        this.total = res.result.total;
+      }
+    },
+
+    //  统计相关退单统计
+    async getOrderRefundList() {
+      const res = await API_Goods.statisticsOrderRefundList(this.refundParams);
+      if (res.success) {
+        this.data = res.result.records;
+        this.columns = this.refundColumns;
+        this.total = res.result.total;
+      }
+    },
+
+    // 实例化初始值
+    initBaseParams() {
+      let data = new Date();
+      this.getOrderList();
+      this.orderParams.year = data.getFullYear();
+      this.overViewParams.year = data.getFullYear();
+    },
+  },
+
+  mounted() {
+    this.initBaseParams();
+  },
+};
+</script>
+<style scoped lang="scss">
+.active {
+  color: $theme_color;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: 3px;
+    bottom: -5px;
+    left: 0;
+    background: $theme_color;
+  }
+}
+.breadcrumb{
+  span{
+      cursor: pointer;
+  }
+}
+
+.page-col {
+  text-align: right;
+  margin: 10px 0;
+}
+.wrapper {
+  padding-bottom: 200px;
+}
+.page {
+  text-align: right;
+  margin: 20px 0;
+}
+#overViewChart {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  margin-left: 20px;
+  > .leftTopTips {
+    position: absolute;
+    top: 68px;
+    left: -2px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .leftBottomTips {
+    position: absolute;
+    bottom: 100px;
+    left: -2px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .rightTips {
+    position: absolute;
+    bottom: 240px;
+    right: 0px;
+    width: 85px;
+    text-align: center;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    padding: 5px 0px;
+  }
+  > .rightBorder {
+    width: 110px;
+    position: absolute;
+    top: 30px;
+    right: 40px;
+    border: 2px solid #d9d9d9;
+    border-left: 0;
+    height: 280px;
+  }
+  > .leftTopBorder {
+    border: 2px solid #d9d9d9;
+    height: 118px;
+    width: 56px;
+    position: absolute;
+    left: 40px;
+    top: 30px;
+    border-right: 0;
+  }
+  > .leftBottomBorder {
+    width: 108px;
+    border: 2px solid #d9d9d9;
+    height: 150px;
+    position: absolute;
+    bottom: 45px;
+    left: 40px;
+    border-right: 0;
+  }
+  > .block {
+    height: 0px;
+    border-left: 30px solid transparent;
+    border-right: 30px solid transparent;
+    position: relative;
+    background: rgb(255, 255, 255);
+    z-index: 1;
+    position: relative;
+  }
+  > .block:nth-of-type(1) {
+    width: 240px;
+    border-top: 90px solid #ff4646;
+    > .box {
+      left: -30px;
+      top: -90px;
+      width: 240px;
+      height: 90px;
+    }
+  }
+  > .block:nth-of-type(2) {
+    width: 172px;
+    border-top: 100px solid #ff8585;
+    margin-top: 10px;
+    > .box {
+      left: -29px;
+      top: -100px;
+      width: 172px;
+      height: 100px;
+    }
+  }
+  > .block:nth-of-type(3) {
+    width: 100px;
+    margin-top: 10px;
+    border-top: 150px solid #ffb396;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+
+    > .box {
+      left: -50px;
+      top: -150px;
+      width: 100px;
+      height: 120px;
+      z-index: 2;
+    }
+  }
+  /deep/ .box {
+    color: #fff;
+    position: absolute;
+
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    > span {
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+}
+
+.transaction-item {
+  margin: 10px 0;
+}
+h4 {
+  margin: 0 0 20px 0;
+}
+.transactionList {
+  flex: 7;
+  padding: 0 20px;
+}
+.shap {
+  width: 400px;
+  margin-left: 20px;
+  margin-top: 50px;
+}
+
+.transaction-card {
+  height: 120px;
+  border-radius: 0.4em;
+  display: flex;
+  background: #f3f5f7;
+}
+.card-item-label {
+  font-weight: bold;
+  font-size: #666;
+  font-size: 15px;
+  margin-bottom: 10px;
+}
+.card-item-value {
+  font-size: 15px;
+  font-weight: bold;
+  color: $theme_color;
+}
+.card-item {
+  height: 100%;
+
+  width: 20%;
+  align-items: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.order-col {
+  display: flex;
+  > div {
+    margin-right: 8px;
+    padding: 16px;
+    font-size: 15px;
+  }
+}
+.order-list {
+  display: flex;
+}
+.tips {
+  margin: 0 8px;
+}
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/seller/src/views/statistics/order/orderDetail.vue b/seller/src/views/statistics/order/orderDetail.vue
new file mode 100644
index 00000000..3d445e01
--- /dev/null
+++ b/seller/src/views/statistics/order/orderDetail.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="wrapper">
+
+    <div class="shop">
+      <h3>订单详情</h3>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>订单来源</span>
+          <span>{{res.clientType}}</span>
+        </div>
+        <div class="label-item">
+          <span>订单状态</span>
+          <span>{{orderStatusList[res.orderStatus]}}</span>
+        </div>
+        <div class="label-item">
+          <span>付款状态</span>
+          <span>{{res.payStatus == "UNPAID"
+                ? "未付款"
+                : res.payStatus == "PAID"
+                ? "已付款"
+                : ""}}</span>
+        </div>
+        <div class="label-item">
+          <span>支付时间</span>
+          <span>{{res.paymentTime || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>支付方式</span>
+          <span>{{res.paymentMethod == "ONLINE" ? "在线支付" : ""
+            }}{{ res.paymentMethod == "ALIPAY" ? "支付宝" : res.paymentMethod == "BANK_TRANSFER" ? "银行卡" : "" || '暂无'}}</span>
+        </div>
+
+      </div>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>用户名</span>
+          <span>{{res.memberName}}</span>
+        </div>
+        <div class="label-item">
+          <span>店铺名称</span>
+          <span>{{res.storeName}}</span>
+        </div>
+        <div class="label-item">
+          <span>创建时间</span>
+          <span>{{res.createTime}}</span>
+        </div>
+
+      </div>
+      <h3>商品详情</h3>
+      <div class="shop-item">
+
+        <div class="goods-item" v-for="(item,index) in res.orderItems" :key="index">
+          <div class="goods-img">
+            <img class="img" :src="item.image" alt="">
+          </div>
+          <div class="goods-title">
+            <div>{{item.name}}</div>
+            <div>{{'x'+item.num}}</div>
+            <div class="goods-price">{{res.flowPrice |  unitPrice('￥')}}</div>
+
+          </div>
+
+        </div>
+      </div>
+      <div class="count-price">
+        <div class="label-item">
+          <span>总价格</span>
+          <span class="flowPrice">{{res.flowPrice |  unitPrice('￥')}}</span>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+    };
+  },
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+.shop {
+  padding: 10px 0;
+  background: #fff;
+}
+.shop-item {
+  display: flex;
+
+  flex-wrap: wrap;
+}
+h3 {
+  margin: 20px 16px;
+  font-size: 18px;
+}
+.goods-price {
+  font-size: 18px;
+  color: red;
+}
+.goods-item {
+  display: flex;
+  width: 100%;
+  margin: 16px;
+}
+.count-price {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.flowPrice {
+  font-size: 24px;
+  color: red;
+}
+.goods-title {
+  margin: 0 16px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-weight: bold;
+}
+
+.img {
+  width: 100px;
+  height: 100px;
+  border-radius: 10px;
+}
+.label-item {
+  margin: 10px 0;
+  width: 20%;
+  padding: 8px;
+  align-items: center;
+  font-weight: bold;
+  display: flex;
+  > span {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue
new file mode 100644
index 00000000..884e6247
--- /dev/null
+++ b/seller/src/views/statistics/order/orderStatistics.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="search">
+    <Row>
+      <Col>
+        <Card>
+          <Form
+            label-position="left"
+            ref="searchForm"
+            :model="params"
+            inline
+            :label-width="100"
+          >
+            <Form-item label="选择时间类型" prop="sn">
+              <Select v-model="params.timeType" style="width: 200px">
+                <Option
+                  v-for="item in typeList"
+                  :value="item.value"
+                  :key="item.value"
+                >{{ item.label }}
+                </Option
+                >
+              </Select>
+            </Form-item>
+            <Form-item label="按年查询" prop="year">
+              <DatePicker
+                type="year"
+                style="width: 200px"
+                v-model="year"
+                @on-change="changeYear"
+              ></DatePicker>
+            </Form-item>
+            <Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
+              <InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
+            </Form-item>
+          </Form>
+        </Card>
+
+        <Card style="margin-top: 2px;height: 130px">
+          <h3>订单统计</h3>
+          <div class="ant-row">
+            <div class="ant-col-4">
+              <p class="static-menu">
+                <span style="font-size: 14px;">总数</span>
+              </p>
+              <p class="static-num">
+                {{priceData.totalNum}}
+              </p>
+            </div>
+            <div>
+              <p class="static-menu">
+                <span style="font-size: 14px;">总金额</span>
+              </p>
+              <p class="static-num">
+                {{ priceData.price | unitPrice }}
+              </p>
+            </div>
+          </div>
+        </Card>
+
+
+        <Card style="margin-top: 2px">
+          <Row>
+            <Table :loading="loading"
+                   border
+                   :columns="columns"
+                   :data="data" ref="table"
+                   sortable="custom"
+                   @on-sort-change="changeSort"
+                   @on-selection-change="changeSelect">
+
+            </Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page :current="searchForm.pageNumber"
+                  :total="total"
+                  :page-size="searchForm.pageSize"
+                  @on-change="changePage"
+                  @on-page-size-change="changePageSize"
+                  :page-size-opts="[10,20,50]"
+                  size="small"
+                  show-total
+                  show-elevator
+                  how-sizer></Page>
+          </Row>
+        </Card>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<script>
+  import * as API_Statistics from "@/api/statistics";
+
+  export default {
+    name: "goodsStatistics",
+    components: {},
+    data() {
+      return {
+        searchForm: [],
+        params: {
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          type: "NUM",
+          timeType: "YEAR",
+          year:'',
+        },
+        year:'',
+
+        priceData:{
+          totalNum:0,
+          price:0
+        },
+        loading: true, // 表单加载状态
+        typeList: [
+          {
+            value: "YEAR",
+            label: "年",
+          },
+          {
+            value: "MONTH",
+            label: "月",
+          },
+        ],
+        columns: [
+          {
+            title: "店铺",
+            key: "sellerName",
+          },
+          {
+            title: "订单编号",
+            key: "orderItemSn",
+          },
+          {
+            title: "购买人",
+            key: "memberName",
+          },
+          {
+            title: "订单金额",
+            key: "finalPrice",
+          },
+          {
+            title: "创建时间",
+            key: "createTime",
+          },
+        ],
+        data: [],
+        total: 0 // 表单数据总数
+      };
+    },
+    watch: {
+      params: {
+        handler(val) {
+          this.init();
+        },
+        deep: true,
+      }
+    },
+    methods: {
+      //初始化
+      init() {
+        this.getDataPage()
+      },
+      getDataPage() {
+        this.loading = true;
+        API_Statistics.getOrderStatistics(this.params).then((res) => {
+          this.loading = false;
+          this.data = res.result.records
+          this.total = res.result.total
+        });
+        API_Statistics.getOrderStatisticsPrice(this.params).then((res) => {
+          this.loading = false;
+          this.priceData.totalNum  = res.result.num
+          this.priceData.price  = res.result.price?res.result.price:0
+        });
+      },
+      changeYear(item){
+        this.params.year = item;
+      }
+    },
+    mounted() {
+      let nowDate = new Date();
+      this.params.year = this.year = nowDate.getFullYear() + ''
+      this.init();
+    },
+
+  };
+</script>
+<style lang="scss">
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+
+  .ant-row {
+    position: relative;
+    height: auto;
+    margin-right: 0;
+    margin-left: 0;
+    zoom: 1;
+    display: block;
+    box-sizing: border-box;
+    margin-left: 30px;
+    margin-top: 10px;
+  }
+
+
+  .ant-col-4 {
+    display: block;
+    box-sizing: border-box;
+    width: 11%;
+    flex: 0 0 auto;
+    float: left;
+  }
+
+  .static-num {
+    color: rgb(51, 51, 51);
+    font-size: 16px;
+    padding: 5px;
+  }
+
+  .static-menu {
+    color: rgb(51, 51, 51);
+    font-size: 16px;
+    padding: 5px;
+  }
+</style>
diff --git a/seller/src/views/statistics/order/refundOrder.vue b/seller/src/views/statistics/order/refundOrder.vue
new file mode 100644
index 00000000..1967b0b8
--- /dev/null
+++ b/seller/src/views/statistics/order/refundOrder.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="wrapper">
+
+    <div class="shop">
+      <h3>售后详情</h3>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>售后类型</span>
+          <span>{{serviceTypeList[res.serviceType]}}</span>
+        </div>
+        <div class="label-item">
+          <span>售后单状态</span>
+          <span>{{serviceStatusList[res.serviceStatus]}}</span>
+        </div>
+
+        <div class="label-item">
+          <span>退款时间</span>
+          <span>{{res.refundTime || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>申请退款金额</span>
+          <span>{{res.applyRefundPrice || '0'}}</span>
+        </div>
+        <div class="label-item">
+          <span>商家备注</span>
+          <span>{{res.auditRemark || '暂无'}}</span>
+        </div>
+        <div class="label-item">
+          <span>申请原因</span>
+          <span>{{res.reason || '暂无'}}</span>
+        </div>
+
+      </div>
+      <div class="shop-item">
+        <div class="label-item">
+          <span>用户名</span>
+          <span>{{res.memberName}}</span>
+        </div>
+        <div class="label-item">
+          <span>店铺名称</span>
+          <span>{{res.sellerName}}</span>
+        </div>
+        <div class="label-item">
+          <span>创建时间</span>
+          <span>{{res.createTime}}</span>
+        </div>
+
+      </div>
+      <h3>商品详情</h3>
+      <div class="shop-item">
+
+        <div class="goods-item">
+          <div class="goods-img">
+            <img class="img" :src="res.goodsImage" alt="">
+          </div>
+          <div class="goods-title">
+            <div>{{res.goodsName}}</div>
+            <div>{{'x'+res.num}}</div>
+            <div class="goods-price">{{res.flowPrice |  unitPrice('￥')}}</div>
+
+          </div>
+
+        </div>
+      </div>
+      <div class="count-price">
+        <div class="label-item">
+          <span>实际退款金额</span>
+          <span class="flowPrice">{{res.flowPrice | unitPrice('￥')}}</span>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      orderStatusList: {
+        UNDELIVERED: "待发货",
+        UNPAID: "未付款",
+        PAID: "已付款",
+        DELIVERED: "已发货",
+        CANCELLED: "已取消",
+        COMPLETED: "已完成",
+        TAKE: "已完成",
+      },
+      // 售后类型
+      serviceTypeList: {
+        CANCEL: "取消",
+        RETURN_GOODS: "退货",
+        EXCHANGE_GOODS: "换货",
+        RETURN_MONEY: "退款",
+      },
+      serviceStatusList: {
+        APPLY: "申请售后",
+        PASS: "通过售后",
+        REFUSE: "拒绝售后",
+        BUYER_RETURN: "买家退货，待卖家收货",
+        SELLER_RE_DELIVERY: "商家换货/补发",
+        SELLER_CONFIRM: "卖家确认收货",
+        SELLER_TERMINATION: "卖家终止售后",
+        BUYER_CONFIRM: "买家确认收货",
+        BUYER_CANCEL: "买家取消售后",
+        WAIT_REFUND: "等待平台退款",
+        COMPLETE: "完成售后",
+      },
+    };
+  },
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+.shop {
+  padding: 10px 0;
+  background: #fff;
+}
+.shop-item {
+  display: flex;
+
+  flex-wrap: wrap;
+}
+h3 {
+  margin: 20px 16px;
+  font-size: 18px;
+}
+.goods-price {
+  font-size: 18px;
+  color: red;
+}
+.goods-item {
+  display: flex;
+  width: 100%;
+  margin: 16px;
+}
+.count-price {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.flowPrice {
+  font-size: 24px;
+  color: red;
+}
+.goods-title {
+  margin: 0 16px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-weight: bold;
+}
+.img {
+  width: 100px;
+  height: 100px;
+  border-radius: 10px;
+}
+.label-item {
+  margin: 10px 0;
+  width: 20%;
+  padding: 8px;
+  align-items: center;
+  font-weight: bold;
+  display: flex;
+  > span {
+    padding: 8px;
+  }
+}
+</style>
diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue
new file mode 100644
index 00000000..4c17c2d9
--- /dev/null
+++ b/seller/src/views/statistics/traffic.vue
@@ -0,0 +1,248 @@
+<template>
+  <div class="wrapper">
+    <Affix :offset-top="100">
+      <Card class="card fixed-bottom">
+        <affixTime @selected="clickBreadcrumb" />
+
+      </Card>
+    </Affix>
+    <Card class="card">
+      <div>
+        <h4>流量概况</h4>
+
+      </div>
+      <div class="box">
+        <div class="box-item">
+          <div>
+            访客数UV
+          </div>
+          <div>
+            {{uvs||0}}
+          </div>
+        </div>
+
+        <div class="box-item">
+          <div>
+            浏览量PV
+          </div>
+          <div>
+            {{pvs||0}}
+          </div>
+        </div>
+
+      </div>
+
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>流量趋势</h4>
+        <div id="orderChart"></div>
+      </div>
+    </Card>
+
+    <Card class="card">
+      <div>
+        <h4>客户增长报表</h4>
+        <Table class="table" stripe :columns="columns" :data="data"></Table>
+
+      </div>
+    </Card>
+
+  </div>
+  </div>
+</template>
+<script>
+import affixTime from "@/views/lili-components/affix-time";
+import * as API_Member from "@/api/member";
+import { Chart } from "@antv/g2";
+import Cookies from "js-cookie";
+export default {
+  components: { affixTime },
+
+  data() {
+    return {
+      // 时间
+
+      uvs: "", // 访客数
+      pvs: "", // 浏览量
+
+      dateList: [ // 日期选择列表
+        {
+          title: "今天",
+          selected: false,
+          value: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          value: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          value: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          value: "LAST_THIRTY",
+        },
+      ],
+
+      orderChart: "", // 流量趋势数据
+      params: {
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        storeId: JSON.parse(Cookies.get("userInfo")).id || "",
+      },
+      columns: [
+        {
+          key: "date",
+          title: "日期",
+        },
+        {
+          key: "pvNum",
+          title: "浏览量",
+        },
+        {
+          key: "uvNum",
+          title: "访客数",
+        },
+      ],
+
+      data: [], // 客户增长报表数据
+    };
+  },
+  watch: {
+    params: {
+      handler(val) {
+        this.init();
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    // 订单图
+    initChart() {
+      // 默认已经加载 legend-filter 交互
+      /**
+       * 将数据分成三组来进行展示
+       */
+
+      let uv = [];
+      let pv = [];
+
+      this.data.forEach((item) => {
+        uv.push({
+          date: item.date,
+          uvNum: item.uvNum,
+          title: "访客数UV",
+          pv: item.uvNum,
+        });
+        pv.push({
+          date: item.date,
+          pvNum: item.pvNum,
+          pv: item.pvNum,
+          title: "浏览量PV",
+        });
+      });
+
+      let data = [...uv, ...pv];
+
+      this.orderChart.data(data);
+      this.orderChart.scale({
+        activeQuantity: {
+          range: [0, 1],
+          nice: true,
+        },
+      });
+      this.orderChart.tooltip({
+        showCrosshairs: true,
+        shared: true,
+      });
+
+      this.orderChart
+        .line()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("smooth");
+
+      this.orderChart
+        .point()
+        .position("date*pv")
+        .color("title")
+        .label("pv")
+        .shape("circle")
+        .style({
+          stroke: "#fff",
+          lineWidth: 1,
+        });
+
+      this.orderChart.render();
+    },
+
+    clickBreadcrumb(item, index) {
+      let callback = JSON.parse(JSON.stringify(item));
+
+      this.params = callback;
+    },
+
+    init() {
+      API_Member.getStatisticsList(this.params).then((res) => {
+        if (res.result) {
+          this.data = res.result;
+          res.result.forEach((item) => {
+            this.uvs += item.uvNum;
+            this.pvs += item.pvNum;
+          });
+
+          if (!this.orderChart) {
+            this.orderChart = new Chart({
+              container: "orderChart",
+              autoFit: true,
+              height: 500,
+              padding: [70, 35, 70, 35],
+            });
+          }
+          this.initChart();
+        }
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style scoped lang="scss">
+.table {
+  margin-top: 10px;
+}
+.wrapper {
+  padding-bottom: 200px;
+}
+.box-item {
+  display: flex;
+
+  flex-direction: column;
+  width: 25%;
+  font-weight: bold;
+  // align-items: center;
+  justify-content: center;
+  > div {
+    margin: 4px;
+  }
+}
+.box {
+  background: rgb(250, 250, 250);
+  padding: 10px;
+  margin-top: 10px;
+  display: flex;
+}
+.card {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/seller/vue.config.js b/seller/vue.config.js
new file mode 100644
index 00000000..c287a6f8
--- /dev/null
+++ b/seller/vue.config.js
@@ -0,0 +1,99 @@
+const path = require('path')
+const CompressionPlugin = require('compression-webpack-plugin');
+
+const resolve = dir => {
+    return path.join(__dirname, dir)
+}
+
+module.exports = {
+    css: {
+        loaderOptions: { // 向 CSS 相关的 loader 传递选项
+          less: {
+            lessOptions: {
+              javascriptEnabled: true
+            }
+          }
+        }
+      },
+    devServer: {
+
+        port: 9998,
+        // proxy: {
+        //     '/lili': {
+        //         target: 'http://127.0.0.1:8888',  // 请求本地 需要lili后台项目
+        //         ws: true
+        //     }
+        // }
+    },
+
+    chainWebpack: config => {
+      //  @ 对应 src目录
+        config.resolve.alias.set('@', resolve('src'))
+    },
+
+    // 打包时不生成.map文件 避免看到源码
+    productionSourceMap: false,
+
+    // 部署优化
+    configureWebpack: {
+        // 使用CDN
+        externals: {
+            vue: 'Vue',
+            'vue-i18n': 'VueI18n',
+            axios: 'axios',
+            'vue-router': 'VueRouter',
+            vuex: 'Vuex',
+            'view-design': 'iview',
+            'vue-apexcharts': 'VueApexCharts',
+            xlsx: 'XLSX',
+            dplayer: 'DPlayer',
+            'print-js': 'printJS',
+            html2canvas: 'html2canvas',
+            'vue-json-pretty': 'VueJsonPretty',
+            'vue-lazyload': 'VueLazyload',
+            gitalk: 'Gitalk',
+            'js-cookie': 'Cookies',
+            wangEditor: 'wangEditor',
+            quill: 'Quill',
+            stompjs: 'Stomp',
+            'sockjs-client': 'SockJS',
+            vuedraggable: 'vuedraggable'
+        },
+        // GZIP压缩
+        plugins: [
+            new CompressionPlugin({
+                test: /\.js$|\.html$|\.css/, // 匹配文件
+                threshold: 10240 // 对超过10k文件压缩
+            })
+        ],
+        optimization: {
+          runtimeChunk: "single",
+          splitChunks: {
+            chunks: "all",
+            maxInitialRequests: Infinity,
+            minSize: 20000,
+            cacheGroups: {
+              vendor: {
+                test: /[\\/]node_modules[\\/]/,
+                name(module) {
+                  // get the name. E.g. node_modules/packageName/not/this/part.js
+                  // or node_modules/packageName
+                  const packageName = module.context.match(
+                    /[\\/]node_modules[\\/](.*?)([\\/]|$)/
+                  )[1];
+                  // npm package names are URL-safe, but some servers don't like @ symbols
+                  return `npm.${packageName.replace("@", "")}`;
+                }
+              }
+            }
+          }
+        }
+    },
+
+    pluginOptions: {
+      'style-resources-loader': {
+        preProcessor: 'scss',
+        patterns: [path.resolve(__dirname, './src/styles/common.scss')]
+      }
+    }
+}