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

先注释掉未实际使用功能，后续优化密码修改内容
feat(manager): 调整分页组件默认页面大小为20
2025-12-19 01:15:53 +08:00 · 2025-12-09 16:44:18 +08:00 · 2025-12-01 18:55:46 +08:00 · 2025-11-24 13:09:11 +08:00 · 2025-11-24 11:33:54 +08:00 · 2025-11-23 16:30:41 +08:00
907 changed files with 285172 additions and 31294 deletions
--- a/143
+++ b/143
@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

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

                            Preamble

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

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

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

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

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

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

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

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

  0. Definitions.

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

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

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

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

  14. Revised Versions of this License.

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

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

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

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

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

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

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

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

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

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

-#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，其他问题先看文档后提问）

+#### PS： **演示站点所有环境均部署master分支。如果有演示站点问题，可以反馈，如果演示站点没问题本地运行有问题，需自行处理** 

-##### 交流 qq 1群 961316482（已满）
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BAhURE3DG2YWhQk6kRxVapbLykqMoPS8&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群" title="Lilishop交流群">点击快捷加群</a>
-
-##### 交流 qq 2群 875294241（已满）
-
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=_lrekOvr5k2p5uTn5GRidI-chKEmpCX3&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群2群" title="Lilishop交流群2群">点击快捷加群</a>
-
-
-##### 交流 qq 3群 263785057
-
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=VUogkDvaso4zLTFH8nxFPDRKq0EthUn1&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群3群" title="Lilishop交流群3群">点击快捷加群</a>
-
+-   **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)**
+-   **微信交流1群（已满）**
+-   **微信交流2群**:
+    ![微信群](https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/wechat.jpg)

 ##### 体验 公众号/小程序/APP 体验，扫描二维码

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

 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
 &nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)

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

 ### 商城介绍
 **官网**：https://pickmall.cn
@@ -60,7 +144,7 @@ PS：手机验证码为 ‘111111’

 **商城 小程序/公众号/APP**：扫描二维码

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

 ### 快速本地部署

@@ -79,24 +163,24 @@ PS：手机验证码为 ‘111111’

 #### 平台管理端功能

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



 #### 卖家功能

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


 ### 商城前端功能展示

 #### 商城移动端

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

 #### 平台管理端

-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
+![管理端功能展示](https://static.pickmall.cn/images/other/manager.gif)


 ### 技术选型
@@ -162,10 +246,9 @@ PS：手机验证码为 ‘111111’

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

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

+类似：

-### 交流群
-
-##### 官方qq 1群 961316482（已满）
-##### 官方qq 2群 875294241（已满）
-##### 官网qq 3群 263785057
+清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,6 @@
 #代码目录
 code_path=$PWD

-git checkout master
 git pull

 cd ${code_path}/manager
--- a/buyer/.npmrc
+++ b/buyer/.npmrc
@@ -1,5 +1 @@
-# 默认依赖包指定淘宝源
-registry=https://registry.npm.taobao.org/
-sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
-phantomjs_cdnurl=https://npm.taobao.org/mirrors/phantomjs/
-electron_mirror=https://npm.taobao.org/mirrors/electron/
+engine-strict=false
--- a/buyer/.yarnrc
+++ b/buyer/.yarnrc
@@ -1,5 +1 @@
-registry "https://registry.npmmirror.com"
-sass_binary_site "https://npmmirror.com/mirrors/node-sass"
-phantomjs_cdnurl "https://npmmirror.com/mirrors/phantomjs"
-electron_mirror "https://npmmirror.com/mirrors/electron"
-
+--ignore-engines true
--- a/buyer/README.md
+++ b/buyer/README.md
@@ -1,19 +0,0 @@
-# new
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
--- a/buyer/package-lock.json
+++ b/buyer/package-lock.json
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -3,21 +3,25 @@
  "version": "1.0.0",
  "private": true,
  "scripts": {
-    "dev": "vue-cli-service serve",
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
+  },
+  "engines": {
+    "node": ">=14"
  },
  "dependencies": {
    "@amap/amap-jsapi-loader": "0.0.7",
    "axios": "^0.19.2",
+    "dplayer": "^1.27.1",
    "js-cookie": "^2.2.1",
    "less": "^2.7.0",
    "less-loader": "^5.0.0",
    "mv-count-down": "^0.1.15",
-    "node-sass": "^4.14.1",
+    "sass": "^1.63.6",
+    "postcss-loader": "^4.3.0",
    "psl": "^1.8.0",
    "qs": "^6.9.4",
-    "sass-loader": "^7.3.1",
    "uuid": "^8.3.2",
    "view-design": "^4.3.2",
    "vue": "^2.6.11",
@@ -30,7 +34,7 @@
  "devDependencies": {
    "@vue/cli-service": "~4.5.0",
    "compression-webpack-plugin": "^5.0.0",
-    "sass-loader": "^7.3.1",
+    "sass-loader": "^10.4.1",
    "uglifyjs-webpack-plugin": "^2.2.0",
    "vue-template-compiler": "^2.6.11"
  },
@@ -38,5 +42,10 @@
    "> 1%",
    "last 2 versions",
    "not dead"
-  ]
+  ],
+  "resolutions": {
+    "minimatch": "^3.1.2",
+    "node-sass": "npm:sass@^1.63.6",
+    "@achrinza/node-ipc": "9.2.2"
+  }
 }
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -1,17 +1,17 @@
 var BASE = {
-    /**
-     * @description api请求基础路径
-     */
-    API_DEV: {
-      common: "http://localhost:8890",
-      buyer: "http://localhost:8888",
-      seller: "http://localhost:8889",
-      manager: "http://localhost:8887"
-    },
-    API_PROD: {
-      common: "http://192.168.2.110:8890",
-      buyer: "http://192.168.2.110:8888",
-      seller: "http://192.168.2.110:8889",
-      manager: "http://192.168.2.110:8887"
-    },
-  };
+  /**
+   * @description api请求基础路径
+   */
+  API_DEV: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+  API_PROD: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+};
--- a/buyer/public/index.html
+++ b/buyer/public/index.html
@@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name='description' content='在线购物平台'>
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>logo.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
@@ -16,7 +17,7 @@
      <% } %>
      <script src="/config.js"></script>
    <noscript>
-      
+
      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>
    <div id="app"></div>
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -26,7 +26,7 @@ export default {
          //动态获取icon
          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
            link.type = "image/x-icon";
-            link.href = storage.getItem("logoImg");
+            link.href = storage.getItem("siteIcon");
            link.rel = "shortcut icon";
            document.getElementsByTagName("head")[0].appendChild(link);
        }
@@ -45,12 +45,12 @@ export default {
          // 存放信息
          storage.setItem('siteName', data.siteName);
          storage.setItem('logoImg', data.buyerSideLogo);
-
+          storage.setItem("siteIcon",data.buyerSideIcon);
          window.document.title = data.siteName;
          //动态获取icon
          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
          link.type = "image/x-icon";
-          link.href = data.buyerSideLogo;
+          link.href = data.buyerSideIcon;
          link.rel = "shortcut icon";
          document.getElementsByTagName("head")[0].appendChild(link);
        }
--- a/buyer/src/api/cart.js
+++ b/buyer/src/api/cart.js
@@ -212,3 +212,52 @@ export function receiptSelect (params) {
    params
  });
 }
+
+/**
+ * 获取全部配送方式
+ */
+ export function shippingMethodList(params) {
+  return request({
+    url: `/buyer/trade/carts/shippingMethodList`,
+    method: Method.GET,
+    needToken: true,
+    params: params,
+  });
+}
+
+/**
+ * 获取全部配送方式
+ */
+ export function storeAddressList(params) {
+  return request({
+    url: `/buyer/store/address/shippingMethodList`,
+    method: Method.GET,
+    needToken: true,
+    params: params,
+  });
+}
+
+/**
+ * 设置自提地址ID
+ * @param addressId
+ */
+ export function setStoreAddressId(storeAddressId,way) {
+  return request({
+    url: `/buyer/trade/carts/storeAddress?storeAddressId=${storeAddressId}&way=${way}`,
+    method: Method.GET,
+    needToken: true,
+  });
+}
+
+/**
+ * 提交配送方式
+ * @param params
+ */
+ export function setShipMethod(params) {
+  return request({
+    url: "/buyer/trade/carts/shippingMethod",
+    method: Method.PUT,
+    needToken: true,
+    params,
+  });
+}
--- a/buyer/src/api/index.js
+++ b/buyer/src/api/index.js
@@ -1,5 +1,16 @@
 import request, { Method } from "@/plugins/request.js";

+/**
+ * 获取首页专题数据
+ */
+export function getTopicData(id) {
+  return request({
+    url: `/buyer/other/pageData/get/${id}`,
+    method: Method.GET,
+  });
+}
+
+
 // 获取首页楼层装修数据
 export function indexData(params) {
  return request({
@@ -10,6 +21,15 @@ export function indexData(params) {
  });
 }

+// 获取自动发券
+export function getAutoCoup(){
+  return request({
+    url: "/buyer/promotion/coupon/activity",
+    method: Method.GET,
+    needToken: true,
+  });
+}
+
 /**
 * 获取店铺楼层数据
 */
--- a/buyer/src/api/member.js
+++ b/buyer/src/api/member.js
@@ -59,7 +59,7 @@ export function withdrawalApply (params) {
  });
 }

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

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

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

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

+// 会员收藏店铺列表
+export function storeCollectList (params) {
+  return request({
+    url: `/buyer/member/storeCollection/${params.type}`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
 // 单个商品评价
 export function goodsComment (params) {
  return request({
--- a/buyer/src/api/order.js
+++ b/buyer/src/api/order.js
@@ -115,3 +115,21 @@ export function getLogisticsCompany () {
    params: { pageNumber: 1, pageSize: 200, disabled: 'OPEN' }
  });
 }
+
+//查询包裹列表
+export const getPackage = (sn) => {
+  return request({
+    url: `/buyer/order/order/getPackage/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+}
+
+//查询物流
+export const getTracesList = (sn, params) => {
+  return request({
+    url: `/buyer/order/order/getTracesList/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+};
--- a/buyer/src/api/pay.js
+++ b/buyer/src/api/pay.js
@@ -46,3 +46,17 @@ export function payCallback (params) {
    params
  });
 }
+
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function withdrawalSettingVO (params) {
+  return request({
+    url: `/buyer/wallet/wallet/withdrawalSettingVO`,
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
--- a/buyer/src/api/shopentry.js
+++ b/buyer/src/api/shopentry.js
@@ -75,3 +75,15 @@ export function applyStatus () {
    method: Method.GET
  })
 }
+
+/**
+ * 获取自提点信息
+ * @param storeId
+ */
+ export function getStoreAddress(storeId,params) {
+  return request({
+    url: `/buyer/store/address/page/${storeId}`,
+    method: Method.GET,
+    params
+  });
+}
--- a/buyer/src/assets/iconfont/back.png
+++ b/buyer/src/assets/iconfont/back.png
--- a/buyer/src/assets/iconfont/carts.png
+++ b/buyer/src/assets/iconfont/carts.png
--- a/buyer/src/assets/iconfont/collage.png
+++ b/buyer/src/assets/iconfont/collage.png
--- a/buyer/src/assets/iconfont/consumer.png
+++ b/buyer/src/assets/iconfont/consumer.png
--- a/buyer/src/assets/iconfont/feedback.png
+++ b/buyer/src/assets/iconfont/feedback.png
--- a/buyer/src/assets/iconfont/notice.png
+++ b/buyer/src/assets/iconfont/notice.png
--- a/buyer/src/assets/iconfont/notification.png
+++ b/buyer/src/assets/iconfont/notification.png
--- a/buyer/src/assets/iconfont/play.svg
+++ b/buyer/src/assets/iconfont/play.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M20 24V17.0718L26 20.5359L32 24L26 27.4641L20 30.9282V24Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>
--- a/buyer/src/assets/iconfont/shop.png
+++ b/buyer/src/assets/iconfont/shop.png
--- a/buyer/src/assets/iconfont/story.png
+++ b/buyer/src/assets/iconfont/story.png
--- a/buyer/src/assets/iconfont/support.png
+++ b/buyer/src/assets/iconfont/support.png
--- a/buyer/src/assets/iconfont/user.png
+++ b/buyer/src/assets/iconfont/user.png
--- a/buyer/src/assets/images/default.png
+++ b/buyer/src/assets/images/default.png
--- a/buyer/src/assets/styles/global.scss
+++ b/buyer/src/assets/styles/global.scss
@@ -10,20 +10,28 @@ $warning_color: #ff9900;
 $error_color: #ed3f14;
 $handle-btn-color: #438cde;

-$theme_color: #e4393c;
+$theme_color: #F31947;

 $border_color: #dddee1;
 $title_color: #8c8c8c;
 $light_title_color: #1c2438;
 $light_content_color: #495060;
 $light_sub_color: #80848f;
-$light_background_color: #f8f8f9;
+$light_background_color: #F5F5F7;
 $light_white_background_color: #fff;
 // 暗黑主题颜色
 $dark_background_color: #141414;
 $dark_sub_background_color: #1d1d1d; //稍微浅一点的
 $dark_content_color: #d5d5d5;

+
+.wes-2 {
+	/* 适用于webkit内核和移动端 */
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
 /***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/

 // 背景颜色
@@ -170,6 +178,19 @@ $dark_content_color: #d5d5d5;
    margin-right: 20px;
 }

+.mb_24 {
+    margin-bottom: 24px;
+}
+.mt_24 {
+    margin-top: 24px;
+}
+.ml_24 {
+    margin-left: 24px;
+}
+.mr_24 {
+    margin-right: 24px;
+}
+
 .mb_10 {
    margin-bottom: 10px;
 }
@@ -270,10 +291,24 @@ li {
        left: auto;
    }
 }
+.flex{
+  display: flex;
+}
+.flex-a-c{
+  align-items: center;
+}
+.flex-j-sb{
+  justify-content: space-between;
+}
+.flex-j-c{
+  justify-content: center;
+}

+.width_1200_auto {
+  width: 1184px;
+  margin: 0 auto;

-
-
+}



--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div class="container">
+  <div class="navbar" :class="{'small-search-box':useClass == 'fixed-show'}">
+    <div class="container width_1200_auto flex flex-a-c">
      <img
        :src="$store.state.logoImg"
        v-if="showLogo"
@@ -8,38 +8,45 @@
        alt=""
        @click="$router.push('/')"
      />
-      <i-input
-        v-model="searchData"
-        size="large"
-        class="search"
-        placeholder="输入你想查找的商品"
-        @keyup.enter.native="search"
-      >
-        <Button v-if="!store"  slot="append" @click="search">搜索</Button>
-      </i-input>
-      <div v-if="store" class="btn-div">
-        <Button class="store-search" type="warning" @click="searchStore">搜本店</Button>
-        <Button class="store-search" type="primary" @click="search">搜全站</Button>
+      <div :class="{'small-search-box':useClass == 'fixed-show'}" class="search-box">
+        <i-input
+          v-model="searchData"
+          size="large"
+          class="search "
+          placeholder="输入你想查找的商品"
+          @keyup.enter.native="search"
+        >
+
+          <div class="search-icon" slot="append" @click="search">
+            <Icon type="ios-search" size="21"/>
+          </div>
+        </i-input>
+        <template v-if="showTag">
+          <div class="only-store" v-if="storeId" @click="research()">
+            切换为{{!onlyStore ? '店铺内' : '平台'}}搜索
+
+          </div>
+          <div v-if="promotionTags.length === 0"></div>
+          <div v-else class="history-list flex">
+            <div
+              v-for="(item, index) in promotionTags"
+              :key="index"
+              class="mr_10"
+            >
+              <span class="history-item" @click="selectTags(item)">{{ item }}</span>
+            </div>
+          </div>
+        </template>
      </div>
-      <template v-if="showTag">
-        <div style="height:12px" v-if="promotionTags.length === 0"></div>
-        <div v-else>
-          <Tag
-            v-for="(item, index) in promotionTags"
-            :key="index"
-            class="mr_10"
-          >
-            <span class="hover-color" @click="selectTags(item)">{{ item }}</span>
-          </Tag>
-        </div>
-      </template>
    </div>
+
  </div>
 </template>

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

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

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

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

-  /deep/ .ivu-card-body {
+  ::v-deep .ivu-card-body {
    padding: 0 !important;
    display: none;
  }
--- a/buyer/src/components/drawer/Main.vue
+++ b/buyer/src/components/drawer/Main.vue
@@ -147,11 +147,11 @@ export default {
    justify-content: center;
    flex-direction: column;
  }
-  /deep/.popup .ivu-drawer-body{
+  ::v-deep.popup .ivu-drawer-body{
    padding: 0!important;
    background-color: #eee;
  }
-  /deep/.popup .ivu-drawer-wrap{
+  ::v-deep.popup .ivu-drawer-wrap{
    z-index: 3001;
  }
 </style>
--- a/buyer/src/components/empty/Main.vue
+++ b/buyer/src/components/empty/Main.vue
@@ -7,6 +7,7 @@
      alt=""
    />
    <p v-if="_Title">{{ _Title }}</p>
+    <slot></slot>
  </div>
 </template>

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

            </ul>
-            <div class="icp">
-              <li v-if="config.icpCard">
-                <a :href='"https://tsm.miit.gov.cn/dxxzsp/xkz/xkzgl/resource/qiyesearch.jsp?num="+config.icpCard+"&type=xuke"' target="_blank">
-                  {{config.icpCard}}
-                </a>
-              </li>
-              <li v-if="config.icpMessage" class="footer-bottmom">
-                <a href="https://beian.miit.gov.cn/" target="_blank">
-                  {{config.icpMessage}}
-                </a>
-              </li>
-            </div>
+
          </div>

-          <div class="information footer-bottmom">
-
-            <a class="flex " :href="config.company.href">
-              <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.name}}
-            </a>
          </div>
+        <div class="information footer-bottmom">
+          <div class="icp">
+            <li v-if="config.icpCard">
+              <a :href='"https://tsm.miit.gov.cn/dxxzsp/xkz/xkzgl/resource/qiyesearch.jsp?num="+config.icpCard+"&type=xuke"' target="_blank">
+                {{config.icpCard}}
+              </a>
+            </li>
+            <li v-if="config.icpMessage" class="footer-bottmom">
+              <a href="https://beian.miit.gov.cn/" target="_blank">
+                {{config.icpMessage}}
+              </a>
+            </li>
+          </div>
+          <a class="flex " :href="config.company.href">
+            <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.name}}
+          </a>
        </div>
+
        <div class="clearfix"></div>
        <div class="copyright">
          <p>Copyright © {{year}} {{config.title}}</p>
@@ -77,7 +78,7 @@ export default {
      guideArr: [
        // 导航链接
        ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
-        ["配送方式", "上门自提", "配送服务查询", "收取标准", "物流规则"],
+        ["配送方式", "上门自提", "配送查询", "收取标准", "物流规则"],
        ["支付方式", "在线支付", "公司转账", "余额支付", "积分支付"],
        ["售后服务", "售后政策", "退款说明", "返修/退货", "取消订单"],
      ],
@@ -101,40 +102,36 @@ export default {
 /*****************************底 部 开 始*****************************/
 .footer {
  width: 100%;
-  padding-top: 30px;
-
-  @include background_color($light_background_color);
+  height: 370px;
+  background: #FFFFFF;
 }
 .icon-row {
-  margin: 15px auto;
-  padding-top: 8px;
-  width: 1000px;
-  height: 64px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 1056px;
+  height: 71px;
+  margin: 0 auto;
 }
 .footer-icon {
-  margin-left: 17px;
-  margin-right: 17px;
  float: left;
 }
 .footer-icon-child {
-  margin-top: 10px;
  overflow: hidden;
-  position: absolute;
-  width: 36px;
-  height: 42px;
-  background-image: url("../../assets/images/footer/ico_service.png");
-  text-indent: -999px;
-}
-.footer-icon-child-2 {
-  background-position: 0 -43px;
-}
-.footer-icon-child-3 {
-  background-position: 0 -86px;
-}
-.footer-icon-child-4 {
-  background-position: 0 -129px;
+  width: 36.4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18.2px;
+  font-weight: normal;
+  color: #333;
+  height: 36.4px;
+  border: 1.4px solid #CECECE;
+  border-radius: 50%;
 }
+
 .icp {
+  margin-right: 30px !important;
  >*{
    margin: 0 4px;
  }
@@ -148,59 +145,69 @@ export default {
  }
 }
 .footer-icon-text {
-  margin-left: 45px;
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 64px;
+  margin-left: 11px;
+  font-size: 16px;
+
+  font-weight: normal;
+
+  text-align: center;
 }
 .service-intro {
  width: 100%;
  border-top: 1px solid $border_color;
 }
 .servece-type {
-  margin: 15px auto;
-  width: 800px;
+  width: 952px;
+  margin: 22px auto 10px auto;
  display: flex;
  flex-direction: row;
  justify-content: space-between;
-}

+}
+.servece-type-info{
+
+}
 .servece-type-info ul {
  list-style: none;
 }
 .servece-type-info li {
-  font-size: 14px;
+  font-size: 12px;
  cursor: pointer;
-  line-height: 26px;
-}
-.servece-type-info li:hover{
-  color:#b8b8be;
+  font-weight: normal;
+  line-height: 15px;
+  text-align: center;
+  margin-bottom: 13px;
+  color: #333;
 }
+
 .servece-type-info li:first-child {
-  font-size: 16px;
-  line-height: 28px;
-  font-weight: bold;
-}
-.servece-type-info li:first-child:hover{
-  // font-size:15px;
-  // font-weight: bold;
-  color:#b8b8be;
+  font-size: 14.82px;
+  font-weight: normal;
+  line-height: 18px;
+
+  letter-spacing: 0px;
+  margin-bottom: 17px;
+  color: #333333;
 }
+
 .friend-link {
  display: flex;
  align-items: flex-start;
-  justify-content: space-between;
+  justify-content: center;
  width: 908px;
  padding: 10px 0;
  margin: 0px auto;
  border-top: 1px solid $border_color;
 }
 .information {
+  margin-top: 23px;
+  margin-bottom: 21px;
  display: flex;
-  flex-direction: column;
-  > * {
-    margin: 2px 0;
-  }
+  justify-content: center;
+
+}
+a{
+  color: #3457FF;
 }
 .zhizhao {
  width: 20px;
@@ -213,35 +220,38 @@ export default {
 .friend-link-item li {
  padding: 5px 0px;
  float: left;
+  margin-right: 59px;
+  font-weight: normal;
+  line-height: 13px;
+  color: #333333;
 }

-.friend-link-item li:hover{
-  color:#b8b8be;
-  margin-top:-2px;
-}
-.footer-bottmom:hover{
-   margin-top:0 !important;
-}
-.footer-bottmom>a:hover{
-   color:#e4393c;
-}
+
+
 .link-item {
  padding: 0px 8px;
  cursor: pointer;
-  border-right: 1px solid $border_color;
+
 }
 .link-last-item {
  border: none;
 }
 .copyright {
  width: 100%;
-  line-height: 30px;
+  cursor: pointer;
  text-align: center;
+  height:25px;
+  opacity: 1;
+  margin-bottom: 12px;
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 13px;
+
+  letter-spacing: 0px;
+
+  color: #959595;
 }
-.copyright a {
-  color: #232323;
-  font-size: 20px;
-}
+
 .footer-icon-text {
  @include title_color($light_title_color);
 }
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -4,29 +4,21 @@
      <!-- 详情左侧展示数据、图片，收藏、举报 -->
      <div class="item-detail-left">
        <!-- 大图、放大镜 -->
-        <div class="item-detail-big-img">
-          <pic-zoom :url="imgList[imgIndex].url" :scale="2"></pic-zoom>
-        </div>
-        <div
-          v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
-          style="margin-top:10px;rgb(153, 149, 149);"
-        >
-          实物商品
-        </div>
-        <div
-          v-else-if="skuDetail.goodsType == 'VIRTUAL_GOODS'"
-          style="margin-top:10px;rgb(153, 149, 149);"
-        >
-          虚拟商品
+        <!-- <div  id="dplayer"></div> -->
+        <div class="item-detail-big-img" v-if="imgList[imgIndex]">
+          <pic-zoom :url="imgList[imgIndex].url || imgList[imgIndex]" :scale="2"></pic-zoom>
        </div>
+
+        <!-- <div  id="dplayer"></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" />
+            <img :src="item.url || item"/>
          </div>
        </div>

@@ -44,6 +36,18 @@
        <div class="item-detail-title">
          <p>
            {{ skuDetail.goodsName }}
+            <Tag
+              v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
+              style="margin-top:10px;rgb(153, 149, 149);"
+            >
+              实物商品
+            </Tag>
+            <Tag
+              v-else-if="skuDetail.goodsType == 'VIRTUAL_GOODS'"
+              style="margin-top:10px;rgb(153, 149, 149);"
+            >
+              虚拟商品
+            </Tag>
          </p>
        </div>
        <div class="sell-point">
@@ -238,6 +242,7 @@
                :disabled="skuDetail.quantity === 0"
                v-model="count"
                :precision="0.1"
+                @on-blur="changeCount"
              ></InputNumber>
              <span class="inventory"> 库存{{ skuDetail.quantity }}</span>
            </div>
@@ -271,7 +276,8 @@
            class="add-buy-car"
            v-if="$route.query.way !== 'POINT' && skuDetail.authFlag === 'PASS'"
          >
-            <Button
+
+           <Button
              type="error"
              v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'"
              :loading="loading"
@@ -286,9 +292,15 @@
              @click="buyNow"
              >立即购买</Button
            >
+            <Tooltip content="观看视频" v-if="skuDetail.goodsVideo">
+              <img class="view-video" @click="showGoodsVideo = true" :src="require('@/assets/iconfont/play.svg')" alt="">
+            </Tooltip>
          </div>
        </div>
      </div>
+      <Modal title="浏览视频" v-model="showGoodsVideo">
+        <div id="dplayer"></div>
+      </Modal>
    </div>
  </div>
 </template>
@@ -296,6 +308,7 @@
 <script>
 import Promotion from "./Promotion.vue";
 import PicZoom from "vue-piczoom"; // 图片放大
+import DPlayer from "dplayer";
 import {
  collectGoods,
  isCollection,
@@ -303,6 +316,7 @@ import {
  cancelCollect,
 } from "@/api/member.js";
 import { addCartGoods } from "@/api/cart.js";
+
 export default {
  name: "ShowGoods",
  props: {
@@ -317,19 +331,30 @@ export default {
      handler(val) {
        this.skuDetail = val.data;
        this.wholesaleList = val.wholesaleList;
+        if (this.wholesaleList && this.wholesaleList.length > 0) {
+          this.count = this.wholesaleList[0].num;
+        }
+        this.promotion();
        this.swiperGoodsImg();
      },
      deep: true,
      immediate: true,
    },
+    showGoodsVideo(val){
+      if(val){
+        this.initVideo();
+      }
+    }
  },
  data() {
    return {
+      showGoodsVideo:false,
+      goodsVideo:"",
      wholesaleList: [],
      count: 1, // 商品数量
      imgIndex: 0, // 展示图片下标
      currentSelceted: [], // 当前商品sku
-      imgList: [{ url: "" }], // 商品图片列表
+      imgList: [], // 商品图片列表
      skuDetail: {
        specList: [],
      }, // sku详情
@@ -364,6 +389,32 @@ export default {
    },
  },
  methods: {
+    // 初始化video
+    initVideo(){
+      if(!this.goodsVideo ){
+        setTimeout(()=>{
+        this.goodsVideo = new DPlayer({
+          container: document.getElementById('dplayer'),
+          video: {
+              url:this.skuDetail.goodsVideo,
+          },
+      });
+      },100)
+      }
+
+
+
+    },
+
+
+    changeCount(val) {
+      if (this.wholesaleList && this.wholesaleList.length > 0) {
+        if (this.count <= this.wholesaleList[0].num) {
+          this.$Message.warning("批发商品购买数量不能小于起批数量");
+          this.count = this.wholesaleList[0].num;
+        }
+      }
+    },
    select(index, value) {
      // 选择规格
      this.$set(this.currentSelceted, index, value);
@@ -512,6 +563,7 @@ export default {
      });
    },
    promotion() {
+      this.promotionMap = {SECKILL: null, FULL_DISCOUNT: null, COUPON: []};
      // 格式化促销活动，返回当前促销的对象
      if (!this.detail.promotionMap) return false;
      let keysArr = Object.keys(this.detail.promotionMap);
@@ -529,9 +581,13 @@ export default {
    swiperGoodsImg() {
      this.skuDetail.specList.forEach((e) => {
        if (e.specName === "images") {
-          this.imgList = e.specImage;
+          this.imgList = this.skuDetail.goodsGalleryList.filter(i => i.indexOf("\"url\":") === -1 && i.indexOf("\"status\":") === -1);
        }
      });
+      if (!this.imgList) {
+        this.imgList = [this.skuDetail.original];
+      }
+
    },
  },
  mounted() {
@@ -545,7 +601,7 @@ export default {
    }

    this.formatSku(this.goodsSpecList);
-    this.promotion();
+    // this.promotion();
    document.title = this.skuDetail.goodsName;
  },
 };
@@ -587,6 +643,7 @@ export default {

 .item-detail-left {
  width: 350px;
+
  margin-right: 30px;
 }

@@ -595,8 +652,14 @@ export default {
  height: 350px;
  box-shadow: 0px 0px 8px $border_color;
  cursor: pointer;
-}

+
+
+}
+#dplayer{
+    width: 100%;
+    height: 100%;
+  }
 .item-detail-big-img img {
  width: 100%;
 }
@@ -830,11 +893,14 @@ export default {

 .add-buy-car-box {
  width: 100%;
+
  margin-top: 15px;
  border-top: 1px dotted $border_color;
 }

 .add-buy-car {
+  display: flex;
+  align-items: center;
  margin-top: 15px;
  > * {
    margin: 0 4px;
@@ -857,5 +923,8 @@ export default {
  color: red;
  margin-bottom: 5px;
 }
+.view-video{
+  cursor: pointer;
+}
 /******************商品图片及购买详情结束******************/
 </style>
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -47,6 +47,7 @@
                        <img :src="img" alt="">
                      </div>
                    </div>
+
                    <div class="preview-img"  v-if="item.previewImg"  @click.prevent="hidePreviewImg(item)">
                      <div>
                        <span @click.stop="rotatePreviewImg(0, item)"><Icon type="md-refresh" />左转</span>
@@ -58,6 +59,22 @@
                      <span class="remarks-item">{{item.goodsName}}</span>
                      <span class="remarks-time">{{item.createTime}}</span>
                    </p>
+
+                    <!-- 商家回复 -->
+                    <div class="reply" v-if="item.reply">
+                      <p>商家回复</p>
+                      <div>
+                        <p class="remarks-content">{{ item.reply }}</p>
+                        <div>
+                          <div class="comment-img" v-if="item.replyImage">
+                            <div v-for="(img, imgIndex) in item.replyImage.split(',')"  @click="$previewImage(img)" :key="imgIndex">
+                              <img :src="img" alt="">
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
                  </div>
                </div>
                <div class="remarks-page">
@@ -309,7 +326,7 @@ export default {
 .item-intro-img {
  width: 100%;
  min-height: 300px;
-  /deep/ img{
+  ::v-deep img{
    margin:0 auto;
  }
 }
@@ -455,7 +472,7 @@ export default {
 .ivu-tabs-ink-bar {
  background-color: $theme_color !important;
 }
-/deep/.ivu-tabs-bar{
+::v-deep.ivu-tabs-bar{
  border: none;
 }
 .item-tabs > .ivu-tabs > .ivu-tabs-bar .ivu-tabs-tab{
@@ -506,4 +523,10 @@ table{
  margin-left: 30px;
  span{color:#999}
 }
+.reply{
+  >*{
+    margin: 4px;
+  }
+
+}
 </style>
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -1,25 +1,32 @@
 <template>
  <div class="box">
-    <div class="nav">
-      <ul class="location">
-        <li v-if="$route.path.includes('home')" style="margin-left:10px"><router-link to="/">首页</router-link></li>
+    <div class="nav width_1200_auto">
+      <ul class="location flex">
+        <li v-if="$route.path.includes('home')" style="margin-left:10px">
+          <router-link to="/">首页</router-link>
+        </li>
+        <ul class="flex">
+          <li>Hi，欢迎来到{{ config.title }}</li>
+          <li class="first" v-show="!userInfo.username">
+            <router-link :to="`/signUp`" class="nav-item">
+              <span>立即注册</span>
+            </router-link>
+          </li>
+          <li v-show="!userInfo.username">
+            <router-link class="nav-item" :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
+              <span>请登录</span>
+            </router-link>
+          </li>
+        </ul>
      </ul>
-      <ul class="detail">
-        <li class="first" v-show="!userInfo.username">
-          <router-link :to="`/signUp`">
-            <span style="border:none">立即注册</span>
-          </router-link>
-        </li>
-        <li v-show="!userInfo.username">
-          <router-link :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
-            <span style="border:none">请登录</span>
-          </router-link>
-        </li>
+      <ul class="detail flex">
        <li v-show="!!userInfo.username">
          <div class="username-p">
            <div>
-              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small" />
-              <span class="username">{{ userInfo.nickName? userInfo.nickName : userInfo.username | secrecyMobile }}</span>
+              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small"/>
+              <span class="username">{{
+                  userInfo.nickName ? userInfo.nickName : userInfo.username | secrecyMobile
+                }}</span>
            </div>
            <transition name='fade'>
              <ul class="drop-items">
@@ -31,16 +38,15 @@
            </transition>
          </div>
        </li>
-        <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
-        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
-        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
+        <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
+        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item">我的消息</span></li>
        <li v-if="$route.name !== 'Cart'" style="position:relative;">
-          <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
          <Dropdown placement="bottom-start">
            <router-link to="/cart" target="_blank">
-              <span @mouseenter="getCartList">
+              <span class="nav-item" @mouseenter="getCartList">
                <Icon size="18" type="ios-cart-outline"></Icon>
-                购物车
+                购物车（{{ cartNum < 100 ? cartNum : '99' }}）
              </span>
            </router-link>
            <DropdownMenu slot="list">
@@ -52,25 +58,25 @@
              <div class="shopping-cart-list" v-show="shoppingCart.length > 0">
                <div class="shopping-cart-box" v-for="(item, index) in shoppingCart" @click="goToPay" :key="index">
                  <div class="shopping-cart-img">
-                    <img :src="item.goodsSku.thumbnail" class="hover-pointer" />
+                    <img :src="item.goodsSku.thumbnail" class="hover-pointer"/>
                  </div>
                  <div class="shopping-cart-info">
                    <div class="shopping-cart-title ">
                      <p class="hover-pointer goods-title ellipsis">{{ item.goodsSku.goodsName }}</p>
                    </div>
                    <div class="shopping-cart-detail">
-                      <p>
+                      <div>
                        数量:
                        <span class="shopping-cart-text">{{ item.num }}</span>
-                        价钱:
-                        <span class="shopping-cart-text">{{ item.purchasePrice | unitPrice('￥') }}</span>
-                      </p>
+
+                      </div>
+                      <div class="shopping-price">
+                        {{ item.purchasePrice | unitPrice('￥') }}
+                      </div>
                    </div>
                  </div>
                </div>
-                <div class="go-to-buy">
-                  <Button type="error" size="small" @click="goToPay">去结账</Button>
-                </div>
+
              </div>
            </DropdownMenu>
          </Dropdown>
@@ -78,6 +84,7 @@
        <li>
          <span class="nav-item" @click="shopEntry">店铺入驻</span>
        </li>
+
      </ul>
    </div>
  </div>
@@ -85,42 +92,45 @@

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

-  data () {
+  data() {
    return {
+      config: require('@/config'),
      userInfo: {}, // 用户信息
      shoppingCart: [] // 购物车
    };
  },
  computed: {
    // 购物车商品数量
-    cartNum () {
+    cartNum() {
      return this.$store.state.cartNum;
    }
  },
  methods: {
-    goToPay () { // 跳转购物车
+    goToPay() { // 跳转购物车
      let url = this.$router.resolve({
        path: '/cart'
      });
      window.open(url.href, '_blank');
    },
-    myInfo () { // 跳转会员中心
+    myInfo() { // 跳转会员中心
      let url = this.$router.resolve({
        path: '/home'
      });
      window.open(url.href, '_blank');
    },
-    signOutFun () { // 退出登录
+    signOutFun() { // 退出登录
      logout().then(res => {
        storage.removeItem('accessToken');
        storage.removeItem('refreshToken');
@@ -130,10 +140,10 @@ export default {
        this.$router.push('/login');
      });
    },
-    goUserCenter (path) {
+    goUserCenter(path) {
      // 跳转我的订单，我的足迹、收藏等
      if (this.userInfo.username) {
-        this.$router.push({ path: path });
+        this.$router.push({path: path});
      } else {
        this.$Modal.confirm({
          title: '请登录',
@@ -152,19 +162,19 @@ export default {
        });
      }
    },
-    shopEntry () {
+    shopEntry() {
      // 店铺入驻
      if (storage.getItem('accessToken')) {
        let routeUrl = this.$router.resolve({
          path: '/shopEntry',
-          query: { id: 1 }
+          query: {id: 1}
        });
        window.open(routeUrl.href, '_blank');
      } else {
        this.$router.push('login');
      }
    },
-    getCartList () {
+    getCartList() {
      // 获取购物车列表
      if (this.userInfo.username) {
        cartGoodsAll().then((res) => {
@@ -179,106 +189,88 @@ export default {
 </script>

 <style scoped lang="scss">
-.shopping-cart-detail,
-.shopping-cart-text,
-.shopping-cart-info,
-.nav a,
-.location,
-.first,
-.username,
-.shopping-cart-null span {
- 
-}

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

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

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

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

-.go-to-buy {
-  display: flex;
-  justify-content: flex-end;
-}
+
 .shopping-cart-null {
  padding: 15px;
  display: flex;
@@ -301,22 +290,28 @@ export default {
  align-items: center;
  justify-content: center;
 }
+
 .cart-null-icon {
  font-size: 38px;
  margin-bottom: 15px;
 }
+
 .shopping-cart-null span {
  font-size: 12px;
  line-height: 16px;
 }
+
 .username-p {
  position: relative;
-  div{
+
+  div {
    cursor: pointer;
-    >span{
+
+    > span {
      margin-left: 5px;
    }
  }
+
  .drop-items {
    position: absolute;
    display: none;
@@ -335,19 +330,21 @@ export default {
    li {
      color: rgb(107, 106, 106);
      width: 100%;
-      border-bottom:1px solid rgb(207, 206, 206);
+      border-bottom: 1px solid rgb(207, 206, 206);
      font-weight: normal;
      text-align: center;
-      &:last-child{
+
+      &:last-child {
        border: none;
      }
-      &:hover{
+
+      &:hover {
        cursor: pointer;
        color: $theme_color;
      }
    }

-    &::before{
+    &::before {
      position: absolute;
      top: -20px;
      left: 30px;
@@ -355,10 +352,10 @@ export default {
      width: 0;
      height: 0;
      border: 10px solid #999;
-      border-color:  transparent transparent #fff transparent ;
+      border-color: transparent transparent #fff transparent;
    }

-    &::after{
+    &::after {
      content: '';
      position: absolute;
      width: 80px;
@@ -367,8 +364,9 @@ export default {
      left: 0;
    }
  }
-  &:hover{
-    .drop-items{
+
+  &:hover {
+    .drop-items {
      display: block;
    }
  }
@@ -382,11 +380,13 @@ export default {
  justify-content: center;
  align-items: center;
 }
+
 .my-page a {
  margin: 0px;
  padding: 0px;
  border: none;
 }
+
 .my-info {
  padding: 5px;
  width: 50%;
@@ -394,15 +394,19 @@ export default {
  text-align: center;
  cursor: pointer;
 }
+
 .my-info:hover {
  box-shadow: 0px 0px 5px #ccc;
 }
+
 .my-info i {
  font-size: 28px;
 }
+
 .my-info p {
  font-size: 12px;
 }
+
 .sign-out {
  padding: 5px;
  width: 50%;
@@ -410,18 +414,23 @@ export default {
  text-align: center;
  cursor: pointer;
 }
+
 .sign-out:hover {
  box-shadow: 0px 0px 5px $border_color;
 }
+
 .sign-out i {
  font-size: 28px;
 }
+
 .sign-out p {
  font-size: 12px;
 }
+
 .goods-title:hover {
  color: $theme_color;
 }
+
 .cart-badge {
  position: absolute;
  right: -8px;
@@ -437,4 +446,34 @@ export default {
  z-index: 3;
  top: 3px;
 }
+
+.shopping-cart-box {
+  padding: 8px 0;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px #ccc dotted;
+}
+
+.shopping-cart-list {
+  padding: 10px 10px;
+  box-sizing: border-box;
+  max-height: 300px;
+  overflow-y: scroll;
+  color: #333;
+
+}
+
+.shopping-cart-detail {
+  color: #999;
+  font-size: 12px;
+
+}
+
+.shopping-price {
+  color: $theme_color;
+  font-size: 14px;
+  font-weight: bold;
+}
+
 </style>
--- a/buyer/src/components/header/ShopHeader.vue
+++ b/buyer/src/components/header/ShopHeader.vue
@@ -1,62 +0,0 @@
-<template>
-  <div class="shop-box">
-    <div class="shop-container">
-      <div class="shop-title-content">
-        <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
-        <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
-        <div class="ml_20" v-html="storeDetail.storeDesc"></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ShopHeader',
-  props: {
-    detail: {
-      type: Object,
-      default: null
-    }
-  },
-  computed: {
-    storeDetail () { // 店铺详情
-      return this.detail;
-    }
-  }
-};
-</script>
-
-<style scoped>
-/* 店铺介绍 */
-.shop-box {
-  width: 100%;
-  height: 50px;
-  background-color: #484848;
-}
-
-.shop-container {
-  width: 1200px;
-  height: 100%;
-  margin: 0px auto;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  color: #fff;
-}
-
-.shop-title-content {
-  display: flex;
-  align-items: center;
-}
-
-.shop-title-content p {
-  font-size: 20px;
-  margin-left: 20px;
-}
-.shop-title-content a {
-  color: #fff;
-}
-
-</style>
--- a/buyer/src/components/header/hoverSearch.vue
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -1,22 +1,27 @@
 <template>
  <div class="scroll-show">
    <div class="content clearfix">
-      <cateNav class="cate" :hover="true" :showNavBar="false"></cateNav>
+      <cateNav class="cate" :hover="true" :showNavBar="false"
+               useClass="fixed-show"></cateNav>
      <Search
        class="search-con"
        :hover="true"
+        ref="search"
        :showLogo="false"
        :showTag="false"
+        useClass="fixed-show"
      ></Search>
-      <Icon
-        type="ios-cart-outline"
-        @click="goCartList"
-        class="cart-icon"
-        @mouseenter.native="getCartList"
-      />
-      <i class="cart-badge">{{ cartNum < 100 ? cartNum : "99" }}</i>
+      <div class="flex flex-a-c cart">
+        <Icon
+          type="ios-cart-outline"
+          @click="goCartList"
+          class="cart-icon"
+          @mouseenter.native="getCartList"
+        />
+        <i class="cart-badge">{{ cartNum < 100 ? cartNum : "99" }}</i>
+      </div>
    </div>
-    <hr class="hr"/>
+
  </div>
 </template>
 <script>
@@ -53,6 +58,7 @@ export default {
    },
  },
  mounted() {
+
    if (storage.getItem("userInfo")) {
      this.userInfo = JSON.parse(storage.getItem("userInfo"));
    }
@@ -60,14 +66,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.hr{
-  height:1px;
-  background:$theme_color;
-}
+
 .content {
  width: 1200px;
  height: 40px;
-  margin: 10px auto;
+  margin: 0 auto;
  position: relative;
 }
 .cate {
@@ -80,11 +83,14 @@ export default {
  overflow: hidden;
  margin-top: -27px;
 }
+.cart{
+  height: 60px;
+}
 .cart-icon {
  width: 30px;
  float: left;
  font-size: 25px;
-  margin-top: 8px;
+
  color: $theme_color;
  z-index: 1;
  position: relative;
@@ -106,6 +112,6 @@ export default {
  line-height: 17px;
  text-align: center;
  z-index: 5;
-  top: 3px;
+  top: 10px;
 }
 </style>
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -81,6 +81,27 @@
    <template v-if="element.type == 'recommend'">
      <recommend :data="element" class="mb_20 width_1200_auto"></recommend>
    </template>
+
+    <!-- 一行三列 -->
+    <template v-if="element.type == 'oneRowThreeColumns'">
+      <oneRowThreeColumns :data="element" class="mb_20 width_1200_auto"></oneRowThreeColumns>
+    </template>
+    <!-- 商品模块 -->
+    <template v-if="element.type == 'goodsType'">
+      <goodsAndType :paramData="element" class="mb_20 width_1200_auto"></goodsAndType>
+    </template>
+    <!-- 商品模块 -->
+    <template v-if="element.type == 'onlyGoodsModel'">
+      <onlyGoodsModel :data="element" class="mb_20 width_1200_auto"></onlyGoodsModel>
+    </template>
+    <!-- 混合模块 -->
+    <template v-if="element.type == 'mixModel'">
+      <mixModel :data="element" class="mb_20 width_1200_auto"></mixModel>
+    </template>
+    <!-- 混合模块 -->
+    <template v-if="element.type == 'forYour'">
+      <forYour :data="element" class="mb_20 width_1200_auto"></forYour>
+    </template>
    <!-- 新品排行 -->
    <template v-if="element.type == 'newGoodsSort'">
      <new-goods-sort
@@ -100,7 +121,7 @@
      <div style="width: 100%; text-align: center">
        <img
          width="1200"
-          class="hover-pointer mb_20"
+          class="hover-pointer mb_20 bannerAd"
          @click="linkTo(element.options.url)"
          :src="element.options.img"
          alt=""
@@ -126,6 +147,12 @@ import NewGoodsSort from "./modelList/NewGoodsSort.vue";
 import Recommend from "./modelList/Recommend.vue";
 import NotEnough from "./modelList/NotEnough.vue";
 import Seckill from "./modelList/Seckill.vue";
+import oneRowThreeColumns from "./modelList/oneRowThreeColumns.vue";
+import goodsAndType from "./modelList/goodsAndType.vue";
+import onlyGoodsModel from "./modelList/onlyGoodsModel.vue";
+import mixModel from "./modelList/mixModel.vue";
+import forYour from "./modelList/forYour.vue";
+

 export default {
  name: "modelFormItem",
@@ -139,6 +166,11 @@ export default {
    FirstPageAdvert,
    NotEnough,
    Seckill,
+    oneRowThreeColumns,
+    goodsAndType,
+    onlyGoodsModel,
+    mixModel,
+    forYour
  },
  data() {
    return {
@@ -153,7 +185,11 @@ export default {
  position: relative;
  margin-bottom: 10px;
 }
-
+.bannerAd{
+  width: 1183px;
+  height: 166.6px;
+  border-radius: 10px;
+}
 /** 热门广告 */
 .advert-list {
  background: $theme_color;
@@ -198,9 +234,4 @@ export default {
  }
 }

-.width_1200_auto {
-  width: 1200px;
-  margin: 0 auto;
-  background-color: #fff;
-}
 </style>
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -5,14 +5,13 @@
      <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">
+<!--        autoplay autoplay-speed="10000"-->
+        <Carousel :height="333.9" autoplay :autoplay-speed="5000">
+          <CarouselItem  v-for="(item, index) in data.options.list" :key="index">
+            <div class="swiper-img" >
              <img
                :src="item.img"
-                width="790"
                @click="linkTo(item.url)"
-                height="340"
                class="hover-pointer"
              />
            </div>
@@ -21,47 +20,66 @@
      </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 || `欢迎来到${config.title}` | secrecyMobile
-            }}
+          <div class="user-box" @click="entryControl({ path: 'home' })">
+            <img class="user-face" :src="userInfo.face || defaultAvatar"  alt />
+            <div class="welcome">
+              Hi, {{
+                userInfo.nickName || `欢迎来到${config.title}` | secrecyMobile
+              }}
+            </div>
          </div>
          <div v-if="userInfo.id">
-            <Button class="btns" shape="circle" @click="$router.push('home')"
-              >会员中心</Button
+            <div class="icon-list"></div>
+            <!-- #TODO 后续增加 -->
+            <!-- <div class="icon-list flex flex-j-sb" >
+              <div class="icon-item" :key="index"  @click="entryControl(item)" v-for="(item,index) in recentList">
+                <div class="value">
+                  {{ item.value}}
+                </div>
+                <div class="label">
+                  {{ item.label}}
+                </div>
+              </div>
+            </div> -->
+          </div>
+          <div v-else class="flex flex-a-c ">
+            <div class="btns" @click="$router.push('login')" shape="circle"
+            >登录</div
+            >
+            <div class="btns sign-up" @click="$router.push('signUp')" shape="circle"
+            >注册</div
            >
          </div>
-          <div v-else>
-            <Button class="btns" @click="$router.push('login')" shape="circle"
-              >请登录</Button
-            >
+
+          <div class="gray-line"></div>
+          <div class="icon-list flex flex-j-sb" >
+            <div class="icon-item" @click="entryControl(item)" :key="index" v-for="(item, index) in entranceList">
+              <img class="icon" :src="require(`@/assets/iconfont/${item.icon}.png`)">
+              <div>
+                {{ item.label }}
+              </div>
+            </div>
          </div>
-        </div>
-        <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 class="icon-list flex flex-j-sb" >
+            <div class="icon-item" :key="index"  @click="entryControl(item)" v-for="(item, index) in appendList">
+              <img class="icon" :src="require(`@/assets/iconfont/${item.icon}.png`)">
+              <div>
+                {{ item.label }}
+              </div>
+            </div>
          </div>
+
+
+
        </div>
+
      </div>
    </div>
  </div>
 </template>

 <script>
-import { articleList } from "@/api/common.js";
+
 import storage from "@/plugins/storage";
 export default {
  name: "modelCarousel",
@@ -69,60 +87,253 @@ export default {
  data() {
    return {
      config: require("@/config"),
+      defaultAvatar: require("@/assets/images/default.png"),
      userInfo: {}, // 用户信息
-      articleList: [], // 常见问题
-      params: {
-        // 请求常见问题参数
-        pageNumber: 1,
-        pageSize: 5,
-        type: "ANNOUNCEMENT",
-        sort: "sort",
-      },
+      entranceList: [
+        {
+          icon: "collage",
+          label: "宝贝收藏",
+          path: "/home/Favorites"
+        },
+        {
+          icon: "shop",
+          label: "收藏店铺",
+          path: "/home/Favorites?type=STORE"
+        },
+        {
+          icon: "carts",
+          label: "购物车",
+          path: "/cart"
+        },
+        {
+          icon: "story",
+          label: "我的足迹",
+          path: "/home/MyTracks"
+        },
+      ],
+      appendList: [
+        {
+          icon: "support",
+          label: "帮助中心",
+          path: "/article"
+        },
+        {
+          icon: "feedback",
+          label: "我的评论",
+          path: "/home/CommentList"
+        },
+        {
+          icon: "notice",
+          label: "收货地址",
+          path: "/home/MyAddress"
+        },
+        {
+          icon: "notification",
+          label: "我的消息",
+          path: "/home/MsgList"
+        },
+      ],
+      recentList: [
+        {
+          value: "0",
+          label: "购物车"
+        },
+        {
+          value: "0",
+          label: "待收货"
+        },
+        {
+          value: "0",
+          label: "待发货"
+        },
+        {
+          value: "0",
+          label: "代付款"
+        },
+      ],
    };
  },
  methods: {
-    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");
+    // 快捷跳转中心
+    entryControl(val) {
+      console.log("val",val)
+      let url = this.$router.resolve(val.path);
+      window.open(url.href, '_blank');
    },
  },
  mounted() {
    if (storage.getItem("userInfo"))
      this.userInfo = JSON.parse(storage.getItem("userInfo"));
-    this.getArticleList();
+
  },
 };
 </script>

 <style scoped lang="scss">
+.label {
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 14px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #666666;
+}
+
+.swiper-img {
+  overflow: hidden;
+  width: 637px;
+  height: 329.9px;
+}
+
+.icon-list {
+  width: 216px
+}
+
+.icon-list:nth-last-of-type(1) {
+  margin-top: 20px;
+}
+
+.hot-box {
+  margin-top: 35px;
+  width: 216px;
+
+}
+
+.hot-tag {
+  margin-right: 6px;
+  width: 36px;
+  height: 18px;
+  border-radius: 4px;
+  opacity: 1;
+  font-size: 12px;
+  border: 1px solid $theme_color;
+  color: $theme_color;
+  text-align: center;
+  line-height: 18px;
+}
+
+.gray-line {
+  width: 216px;
+  height: 1px;
+  border: 1px solid #E5E5E5;
+  margin-bottom: 13px;
+}
+
+.icon {
+  width: 20px !important;
+  height: 20px !important;
+  margin-bottom: 7px;
+}
+
+.icon-item {
+
+  cursor: pointer;
+  text-align: center;
+
+  >div {
+    font-size: 11px;
+    font-weight: normal;
+    line-height: 13px;
+    text-align: center;
+    letter-spacing: 0px;
+
+    color: #666666;
+  }
+
+  >.value {
+    font-size: 14px;
+
+    line-height: 17px;
+    text-align: center;
+    font-weight: 400;
+    letter-spacing: 0px;
+    margin-bottom: 3px;
+    color: $theme_color;
+  }
+
+  >.label {
+    font-weight: 400;
+    font-size: 12px;
+
+    line-height: 14px;
+    text-align: center;
+    letter-spacing: 0px;
+    color: #666666;
+    margin-bottom: 13px;
+  }
+}
+
 .model-carousel {
  width: 1200px;
  height: 340px;
  overflow: hidden;
 }

+.hover-pointer {
+  //display: block;
+  //width: 100%;
+  //height: 100%;
+  width: 637px;
+  height: 329.9px;
+  object-fit: cover;
+  border-radius: 10px;
+
+
+}
+
+.welcome {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+
+.hr {
+  width: 216px;
+  height: 1px;
+  border: 1px solid #E5E5E5;
+}
+
 .btns {
-  background-color:#363634 ;
-  line-height:30px;
-  color: white !important;
+  margin-top: 21px;
+  margin-bottom: 13px;
+  width: 77px;
+  height: 28px;
+  border-radius: 14px;
+  opacity: 1;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 28px;
+  text-align: center;
+  cursor: pointer;
+  letter-spacing: 0px;
+
+  color: #FFFFFF;
+  background: $theme_color;
 }
-.btns:hover {
-  background-color: #363634;
-  line-height:32px !important;
-  color: #e5d790 !important;
+
+.sign-up {
+  background: #F39519;
+  margin-left: 10px;
 }
+
+.avatar {
+  margin-bottom: 13px;
+}
+
+.user-face {
+
+  margin-bottom: 12px;
+  width: 70px;
+  height: 70px;
+  border-radius: 50%;
+
+}
+
 /* 导航主体 */
 .nav-body {
  width: 1200px;
@@ -131,67 +342,80 @@ export default {
 }

 .nav-side {
-  height: 100%;
-  width: 200px;
+  height: 334px;
+  width: 263.2px;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
  float: left;
  padding: 0px;
  color: #fff;
-  background-color: #6e6568;
+  // background-color: #6e6568;
+
+
 }

+
 /*导航内容*/
 .nav-content {
-  width: 790px;
-  overflow: hidden;
+  width: 637px;
+  margin-left: 10.8px;
+
+  margin-top: 10px;
+  height: 333.9px;
+
  float: left;
  position: relative;
 }
+
 .nav-right {
  float: left;
-  width: 210px;
+  margin-top: 10px;
+  width: 263.2px;
+  margin-left: 10px;
+
+  border-radius: 10px;
+  background: #FFFFFF;
+
  .person-msg {
+    cursor: pointer;
+    height: 333px;
    display: flex;
    align-items: center;
    flex-direction: column;
-    margin: 20px auto;
-    button {
-      height: 30px !important;
-      margin-top: 10px;
-      line-height: 30px;
-      border: none;
-    }
-    .ivu-btn-default {
-      // color: $theme_color;
-      // border-color: $theme_color;
-    }
-    img {
-      margin-bottom: 10px;
-      width: 80px;
-      height: 80px;
-      border-radius: 50%;
+    padding-top: 28px;
+    padding-bottom: 25px;
+
+    >.user-box{
+      text-align: center;
    }
  }
+
  .shop-msg {
    div {
      width: 100%;
      margin: 10px 27px;
+
      span {
        cursor: pointer;
        text-align: center;
        font-weight: bold;
        margin-left: 5px;
      }
+
      span:nth-child(1) {
        @include content_color($theme_color);
        margin-left: 0;
      }
+
      span:nth-child(2) {
        font-weight: normal;
      }
+
      span:nth-child(3):hover {
        color: $theme_color;
      }
    }
+
    ul {
      li {
        cursor: pointer;
@@ -199,6 +423,7 @@ export default {
        color: #999395;
        width: 150px;
        font-size: 12px;
+
        &:hover {
          color: $theme_color;
        }
--- a/buyer/src/components/indexDecorate/modelList/NotEnough.vue
+++ b/buyer/src/components/indexDecorate/modelList/NotEnough.vue
@@ -65,12 +65,12 @@ export default {
    handleScrollx(){
      // console.log('滚动高度',window.pageYOffset) // 获取滚动条的高度
      // console.log(this.$refs.obtain.getBoundingClientRect().top) //获取到距离顶部的距离
-      this.scrollHieght = Number(window.pageYOffset);//获取到距离顶部的距离
-      this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); // 获取到距离顶部的距离
-         this.topSearchShow = true; // 展示图钉
-          if(this.scrollTops < -660){ // 超过隐藏
-            this.topSearchShow = false;
-      }
+      // this.scrollHieght = Number(window.pageYOffset);//获取到距离顶部的距离
+      // this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); // 获取到距离顶部的距离
+      //    this.topSearchShow = true; // 展示图钉
+      //     if(this.scrollTops < -660){ // 超过隐藏
+      //       this.topSearchShow = false;
+      // }
    },
     toguid(path,id){
      var path =path;
@@ -81,7 +81,7 @@ export default {
    change(status){ //获取是否获取到图钉
      this.open = status
    },
-    gotoDemo(){ // 跳转到demo的位置 
+    gotoDemo(){ // 跳转到demo的位置
    if(this.open){ // 获取到图钉之后在跳转当前位置
       document.querySelector("#demo").scrollIntoView(true);
    }
--- a/buyer/src/components/indexDecorate/modelList/forYour.vue
+++ b/buyer/src/components/indexDecorate/modelList/forYour.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="model" v-if="data">
+    <div class="for-your">{{ data.options.title }}</div>
+    <div class="flex card">
+      <div class="left">
+        <img :src="data.options.data.image.src" alt="" />
+      </div>
+      <div class="right flex">
+        <!-- 商品区 -->
+        <div class="goods-list">
+          <div
+            class="goods-item"
+            :key="index"
+            v-for="(item, index) in data.options.data.list"
+            @click="linkTo(item.url)"
+          >
+            <div>
+              <div class="goods-name">{{ item.title }}</div>
+              <div class="goods-desc">{{ item.desc }}</div>
+            </div>
+            <img class="goods-img" :src="item.img" alt="" />
+          </div>
+        </div>
+        <!-- 热卖区 -->
+        <div class="hot-list">
+          <div class="hot-title">{{ data.options.data.hot.title }}</div>
+          <div
+            class="hot-item flex flex-a-c"
+            v-for="(item, index) in data.options.data.hot.list"
+            :key="index"
+            @click="linkTo(item.url)"
+          >
+            <img :src="item.img" alt="" />
+            <div class="hot-goods">
+              <div class="hot-goods-title">{{ item.title }}</div>
+              <div>
+                <div class="hot-price">￥{{ item.price | unitPrice }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "forYour",
+  data() {
+    return {
+      current: "",
+    };
+  },
+  props: {
+    data: {
+      type: Object,
+      default: {},
+    },
+  },
+
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.goods-list {
+  display: flex;
+  width: 558px;
+  flex-wrap: wrap;
+}
+.goods-item {
+  width: 278px;
+  height: 277px;
+  text-align: center;
+  box-sizing: border-box;
+  cursor: pointer;
+  border-right: 1.4px solid #e2e2e2;
+  &:nth-of-type(3) {
+    border-top: 1.4px solid #e2e2e2;
+  }
+  &:nth-of-type(4) {
+    border-top: 1.4px solid #e2e2e2;
+  }
+  &:hover {
+    ::v-deep .goods-name {
+      color: $theme_color;
+    }
+    ::v-deep .goods-desc {
+      color: $theme_color;
+    }
+  }
+}
+
+
+.goods-name {
+  margin-top: 23px;
+  font-size: 25px;
+  font-weight: normal;
+  line-height: 30px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+.goods-img {
+  width: 190px;
+  height: 156px;
+  margin-top: 19px;
+  border-radius: 10px;
+}
+.goods-desc {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  text-align: center;
+  margin-top: 11px;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+.for-your {
+  font-size: 35px;
+  font-weight: normal;
+  line-height: 42px;
+  text-align: center;
+  letter-spacing: 0px;
+  margin-bottom: 32px;
+
+  color: #333333;
+}
+
+.card,
+.right-card {
+  opacity: 1;
+  background: #ffffff;
+  border-radius: 10px;
+  position: relative;
+  box-shadow: 0px 1px 13px 0px #E5E5E5;
+
+  &:hover {
+    .setup-box {
+      display: block;
+    }
+  }
+}
+
+.modal-tab-bar {
+  > .flex {
+    align-items: center;
+    margin: 10px 0;
+  }
+}
+
+.draggable {
+  > .flex {
+    align-items: center;
+  }
+}
+.left {
+  width: 346px;
+  height: 554px;
+  border-radius: 9.8px 0px 0px 9.8px;
+  > img {
+    max-width: 100%;
+    height: 100%;
+  }
+}
+.right {
+  width: 839px;
+  height: 554px;
+  border-radius: 0px 9.8px 9.8px 0px;
+}
+.hot-list {
+  width: 279px;
+}
+.hot-title {
+  margin-left: 25px;
+  line-height: 63px;
+  font-size: 17px;
+  font-weight: normal;
+
+  letter-spacing: 0px;
+  color: #333333;
+  height: 63px;
+}
+.hot-item {
+  cursor: pointer;
+  box-sizing: border-box;
+  border-top: 1.4px solid #e2e2e2;
+  height: 122px;
+  padding:0 14px;
+  align-items: center;
+  &:hover {
+    > .hot-goods {
+      > .hot-goods-title {
+        color: $theme_color;
+      }
+    }
+  }
+
+  > img {
+    width: 76.3px;
+    height: 77.7px;
+  }
+}
+.hot-goods {
+  margin-left: 14px;
+}
+.hot-goods-title {
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 16px;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+.hot-price {
+  margin-top: 10.3px;
+  font-size: 24px;
+  font-weight: normal;
+  line-height: 29px;
+  letter-spacing: 0px;
+
+  color: $theme_color;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/goodsAndType.vue
+++ b/buyer/src/components/indexDecorate/modelList/goodsAndType.vue
@@ -0,0 +1,205 @@
+<template>
+  <div class="goods-type-wrapper">
+    <div class="flex goods-type-line">
+      <div class="goods-type-title">{{ paramData.options.title }}</div>
+      <div class="flex goods-type-labels">
+        <div
+          :class="{ active: current === item.___index }"
+          class="goods-type-item"
+          v-for="(item, index) in paramData.options.labels"
+          :key="index"
+          @click="handleClickLabel(item, index)"
+        >
+          {{ item.label }}
+        </div>
+      </div>
+    </div>
+    <!-- 商品部分 -->
+    <div class="only-goods-list flex-j-sb">
+      <div
+        v-if="paramData.options"
+        class="only-goods-list-item "
+        v-for="(item, index) in paramData.options.list.filter((client) => {
+          return client.___index == current;
+        })"
+        :key="index"
+        @click="linkTo(item.url)"
+      >
+        <div class="goods-img">
+          <img :src="item.img" />
+        </div>
+        <div>
+          <div class="goods-name wes-2">{{ item.title }}</div>
+          <div class="goods-desc">{{ item.desc }}</div>
+        </div>
+        <div class="goods-price">
+          {{ item.price | unitPrice("￥") }}
+        </div>
+        <!-- 查看 -->
+        <div class="white-shadow">
+          <div class="search">去查看</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "goods",
+  props: {
+    paramData: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      current: "",
+    };
+  },
+  watch: {},
+  mounted() {
+    this.current = this.paramData.options.labels[0].___index;
+  },
+  methods: {
+    // 筛选出当前分类下的商品
+    handleClickLabel(val, index) {
+      this.current = index;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.white-shadow {
+  width: 287px;
+  height: 122px;
+  border-radius: 0px 0px 10px 10px;
+  opacity: 1;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  opacity: 0;
+  display: flex;
+  justify-content: center;
+  transition: 0.35s;
+  align-items: center;
+  background: linear-gradient(
+    180deg,
+    rgba(252, 252, 252, 0.58) -50%,
+    #ffffff 99%
+  );
+}
+.search {
+  width: 143px;
+  height: 45px;
+  border-radius: 22.5px;
+  opacity: 1;
+  font-size: 20px;
+  font-weight: normal;
+  text-align: center;
+  letter-spacing: 0px;
+  line-height: 45px;
+  color: #ffffff;
+  background: $theme_color;
+}
+.only-goods-list{
+  display: flex;
+  flex-wrap: wrap;
+
+}
+.only-goods-list-item {
+  padding-top: 30px;
+  width: 287px;
+  height: 343.7px;
+  border-radius: 9.8px;
+  opacity: 1;
+  margin-bottom: 14.3px;
+  cursor: pointer;
+  background: #ffffff;
+  transition: all 0.4s ease;
+  box-shadow: 0px 1px 13px 0px #e5e5e5;
+  position: relative;
+  &:hover {
+    transform: translateY(-5px);
+    box-shadow: 0px 1px 14px 0px #c5c5c5;
+    > .white-shadow {
+      opacity: 1;
+    }
+    > .goods-img {
+      > img {
+        opacity: 0.8 !important;
+      }
+    }
+  }
+}
+.goods-img {
+  margin-bottom: 9.8px;
+  text-align: center;
+  > img {
+    transition: all 0.4s ease;
+    width: auto;
+    max-height: 183px;
+  }
+}
+.goods-name {
+  font-size: 18px;
+
+  font-weight: normal;
+  line-height: 22px;
+  text-align: center;
+  letter-spacing: 0px;
+  width: 200px;
+  margin: 0 auto 12.4px auto;
+  color: #333333;
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-desc {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  text-align: center;
+  letter-spacing: 0px;
+  margin-bottom: 12.4px;
+  color: #666666;
+
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-price {
+  font-size: 25.2px;
+  font-weight: normal;
+  line-height: 30px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #f31947;
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-type-line {
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25px;
+}
+.goods-type-title {
+  font-size: 31px;
+  font-weight: normal;
+  line-height: 37px;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+.active {
+  color: #f31947;
+}
+.goods-type-labels {
+  cursor: pointer;
+  font-size: 21px;
+  font-weight: normal;
+  line-height: 25px;
+  letter-spacing: 0px;
+}
+.goods-type-item {
+  margin-left: 28px;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/mixModel.vue
+++ b/buyer/src/components/indexDecorate/modelList/mixModel.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="mix-model">
+    <!-- 左侧 -->
+    <div class="left-card">
+      <left :data="data" />
+    </div>
+    <!-- 右侧 -->
+    <div class="right-card">
+      <right :data="data" />
+    </div>
+  </div>
+</template>
+
+<script>
+import left from './mixs/mix-goods'
+import right from './mixs/mix-brand'
+export default {
+  name: "mixModel",
+  data() {
+    return {}
+  },
+  props: {
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  components: {
+    left,
+    right
+  },
+  mounted() {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+.mix-model{
+  display: flex;
+  justify-content:space-between;
+}
+.left-card,.right-card{
+  width: 584px;
+  height: 344px;
+  border-radius: 10px;
+  opacity: 1;
+  background: #FFFFFF;
+  box-shadow: 0px 1px 13px 0px #E5E5E5;
+  position: relative;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/mixs/mix-brand.vue
+++ b/buyer/src/components/indexDecorate/modelList/mixs/mix-brand.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="flex" v-if="data.options.right.model == 'brand'">
+    <div class="left-side" @click="linkTo(data.options.right.data.image.url)">
+      <img :src="data.options.right.data.image.src" alt="">
+    </div>
+    <div class="right-side">
+      <div class="badge-box flex">
+        <div class="round">
+          <Icon type="ios-arrow-forward" />
+        </div>
+
+
+      </div>
+      <div class="flex goods-list">
+        <div class="goods-item flex" @click="linkTo(item.url)" :key="index" v-for="(item,index) in data.options.right.data.list">
+          <div class="goods-thumbnail">
+            <img :src="item.img" alt="">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "mix-goods",
+  data() {
+    return {}
+  },
+  props: {
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  components: {},
+  mounted() {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+.right-side{
+  width: 330px;
+}
+.goods-detail-title{
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 16px;
+  text-align: center;
+  letter-spacing: 0px;
+  color: #333333;
+}
+.goods-detail-price{
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  letter-spacing: 0px;
+  color: $theme_color;
+  margin-top: 8px;
+  margin-bottom:10px;
+}
+.goods-thumbnail{
+  margin-left: 7px;
+  display: flex;
+  align-items: center;
+  >img{
+    width:90px;
+    height: 90px;
+  }
+}
+.badge-box{
+  margin-top: 33px;
+  justify-content:right;
+  >.round{
+    width: 17.5px;
+    height: 17.5px;
+    opacity: 1;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 17.5px;
+    border: 0.7px solid #333333;
+    margin-right: 17.5px;
+  }
+}
+.goods-list{
+   width: 330px;
+  flex-wrap: wrap;
+  justify-content:space-between;
+  padding: 0 16px;
+}
+.goods-item{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width:50%;
+  height: 85px;
+  border-radius: 9.8px;
+  opacity: 1;
+  transition: .35s;
+  background: #FFFFFF;
+  margin-bottom:9px;
+
+
+}
+.left-side {
+  >img{
+    width: 254px;
+    height: 344px;
+    border-radius: 9.8px 0px 0px 9.8px;
+    opacity: 1;
+  }
+}
+.badge {
+  width: 50px;
+  height: 27px;
+  line-height:27px;
+  border-radius: 13.3px 0px 0px 13.3px;
+  opacity: 1;
+  background: #F31947;
+  font-size: 12.6px;
+  font-weight: normal;
+  text-align: center;
+  letter-spacing: 0px;
+  color: #FFFFFF;
+  margin-top: 26px;
+  margin-bottom:17px;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/mixs/mix-goods.vue
+++ b/buyer/src/components/indexDecorate/modelList/mixs/mix-goods.vue
@@ -0,0 +1,127 @@
+<template>
+    <div class="flex" v-if="data.options.left.model == 'goods'">
+      <div class="left-side"  @click="linkTo(data.options.right.data.image.url)">
+        <img :src="data.options.left.data.image.src" alt="">
+      </div>
+      <div class="right-side">
+          <div class="badge-box flex">
+            <div class="badge"  @click="linkTo(data.options.right.data.image.url)">
+              {{data.options.left.data.badge.label}}
+            </div>
+          </div>
+          <div class="flex goods-list">
+
+            <div class="goods-item flex"  @click="linkTo(item.url)" :key="index" v-for="(item,index) in data.options.left.data.list">
+              <div class="goods-thumbnail">
+                <img :src="item.img" alt="">
+              </div>
+              <div class="goods-detail">
+                <div class="goods-detail-title">{{item.title}}</div>
+                <div class="goods-detail-price">{{item.price | unitPrice('¥')}}</div>
+              </div>
+            </div>
+          </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "mix-goods",
+  data() {
+    return {}
+  },
+  props: {
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  components: {},
+  mounted() {
+
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+.right-side{
+  width: 387px;
+}
+.goods-detail-title{
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 16px;
+  text-align: center;
+  letter-spacing: 0px;
+  color: #333333;
+}
+.goods-detail-price{
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  letter-spacing: 0px;
+  color: #F31947;
+  margin-top: 8px;
+  margin-bottom:10px;
+}
+.goods-thumbnail{
+  margin-left: 7px;
+  display: flex;
+  align-items: center;
+  >img{
+    width:90px;
+    height: 90px;
+  }
+}
+.badge-box{
+
+  justify-content:right;
+}
+.goods-list{
+  width: 387px;
+  flex-wrap: wrap;
+  justify-content:space-between;
+  padding: 0 16px;
+}
+.goods-item{
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  width: 173.6px;
+  height: 119px;
+  border-radius: 9.8px;
+  opacity: 1;
+  transition: .35s;
+  background: #FFFFFF;
+  margin-bottom:9px;
+  &:hover{
+    box-shadow: 0px 1px 6px 0px #E5E5E5;
+  }
+
+}
+.left-side {
+  >img{
+    border-radius: 10px 0px 0px 10px;
+    display: block;
+    width: 196.7px;
+    height: 343.7px;
+  }
+}
+.badge {
+  width: 50px;
+  height: 27px;
+  line-height:27px;
+  border-radius: 13.3px 0px 0px 13.3px;
+  opacity: 1;
+  background: #F31947;
+  font-size: 12.6px;
+  font-weight: normal;
+  text-align: center;
+  letter-spacing: 0px;
+  color: #FFFFFF;
+  margin-top: 26px;
+  margin-bottom:17px;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/oneRowThreeColumns.vue
+++ b/buyer/src/components/indexDecorate/modelList/oneRowThreeColumns.vue
@@ -0,0 +1,36 @@
+<template>
+    <div class="line flex flex-a-c flex-j-sb">
+        <div class="column" v-for="(item,index) in data.options.list" :key="index">
+          <img  :src="item.img" class="three-column-img">
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "oneRowThreeColumns",
+  props: {
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  data () {
+    return {
+
+    };
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+.column{
+  width: 385px;
+  height: 165px;
+  >img{
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/onlyGoodsModel.vue
+++ b/buyer/src/components/indexDecorate/modelList/onlyGoodsModel.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class="goods-type-wrapper">
+    <!-- 商品部分 -->
+    <div class="only-goods-list flex" >
+      <div
+        class="only-goods-list-item"
+        v-for="(item, index) in data.options.list"
+        :key="index"
+        @click="handleClick(item)"
+      >
+        <div>
+          <div class="goods-name wes-2">{{ item.title }}</div>
+          <div class="goods-desc">{{ item.desc }}</div>
+        </div>
+        <div class="goods-img">
+          <img :src="item.img" />
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "onlyGoodsList",
+  props: {
+    data: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      flag:false,
+      tabIndex:0,
+      current: 0,
+      showModal: false,
+      selected: {}, // 已选数据
+      picModelFlag: false,
+    };
+  },
+  mounted(){
+
+  },
+  methods: {
+    handleClick(val){
+      this.linkTo(val.url)
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+
+.goods-type-wrapper {
+  position: relative;
+}
+.del-btn{
+  margin-left:10px;
+}
+.tab-bar {
+  margin-bottom: 20px;
+}
+.draggable {
+  padding: 10px;
+  border-bottom: 1px solid #ededed;
+  transition: 0.35s;
+
+  &:hover {
+    background-color: #ededed;
+  }
+}
+.column-config {
+  margin-left: 10px;
+  > * {
+    margin: 4px;
+  }
+}
+.column-img {
+  width: 100px;
+  height: 100px;
+}
+.add-goods {
+  margin-left: 20px;
+  margin-bottom: 10px;
+}
+.only-goods-list {
+  position: relative;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  &:hover {
+    > .setup-box {
+      display: block;
+    }
+  }
+}
+.column-goods-config {
+  flex: 2;
+  align-items: center;
+  justify-content: space-between;
+}
+.only-goods-list-item {
+  padding-top: 34.8px;
+  margin-bottom: 14.3px;
+  width: 287px;
+  height: 343.7px;
+  border-radius: 9.8px;
+  opacity: 1;
+  cursor: pointer;
+  background: #ffffff;
+  transition: 0.35s;
+  box-shadow: 0px 1px 13px 0px #e5e5e5;
+  &:hover {
+    box-shadow: 0px 1px 14px 0px #c5c5c5;
+    transform: translateY(-2px);
+  }
+}
+.goods-img {
+  text-align: center;
+  > img {
+    width: auto;
+    max-height: 183px;
+  }
+}
+.goods-name {
+  margin-bottom: 11.9px;
+  font-size: 25px;
+  font-weight: normal;
+  line-height: 30px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #333333;
+
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-desc {
+  margin-bottom: 30px;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: 19px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #666666;
+
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-price {
+  font-size: 25.2px;
+  font-weight: normal;
+  line-height: 30px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: $theme_color;
+  -webkit-text-stroke: #979797 0.7px; /* 浏览器可能不支持 */
+}
+.goods-type-line {
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25px;
+}
+.goods-type-title {
+  font-size: 31px;
+  font-weight: normal;
+  line-height: 37px;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+.active {
+  color: $theme_color;
+}
+.goods-type-labels {
+  font-size: 21px;
+  font-weight: normal;
+  line-height: 25px;
+  letter-spacing: 0px;
+}
+.goods-type-item {
+  margin-left: 28px;
+}
+</style>
--- a/buyer/src/components/map/index.vue
+++ b/buyer/src/components/map/index.vue
@@ -1,114 +1,94 @@
 <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="map">
+
+    <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" class="footer">
+
+      <Button type="primary" :loading="loading" @click="ok">确定</Button>
+    </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';
+import AMapLoader from "@amap/amap-jsapi-loader";
+import { handleRegion } from "@/api/address.js";

+const config = require('@/config/index')
 export default {
-  name: 'map',
-  props: {
-    useApi: {
-      default: true,
-      type: Boolean
-    }
-  },
-  data () {
+  name: "map",
+  data() {
    return {
-      config:require('@/config'),
-      showMap: false, // 展示地图
-      mapSearch: '', // 地图搜索
+      config,
+      showMap: false, // 地图显隐
+      mapSearch: "", // 地图搜索
      map: null, // 初始化地图
      autoComplete: null, // 初始化搜索方法
      geocoder: null, // 初始化地理、坐标转化
      positionPicker: null, // 地图拖拽选点
-      tips: [], // 搜索关键字列表
+      tips: [], //搜索关键字列表
      addrContent: {}, // 回显地址信息
-      loading: false // 加载状态
+      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) {
+    ok() {
+
+      if (this.addrContent && this.addrContent.regeocode) {
+        const params = {
+          cityCode: this.addrContent.regeocode.addressComponent.citycode,
+          townName: this.addrContent.regeocode.addressComponent.township,
+        };
        handleRegion(params).then((res) => {
-          this.loading = false;
          if (res.success) {
-            this.showMap = false;
-            this.addrContent.addr = res.result.name.replace(/,/g, ' ');
+            this.addrContent.addr = res.result.name.replace(/,/g, " ");
            this.addrContent.addrId = res.result.id;
-            this.$emit('getAddress', this.addrContent);
+            this.loading = false;
+
+            this.$emit("getAddress", this.addrContent);
          }
        });
      } else {
-        this.loading = false;
-        this.showMap = false;
-        this.$emit('getAddress', this.addrContent);
+        this.$Message.error('未获取到坐标信息！请查看高德API配置是否正确')
      }
+
    },
-    init () { // 初始化地图
+    init() {
      AMapLoader.load({
        key: this.config.aMapKey, // 申请好的Web端开发者Key，首次调用 load 时必填
-        version: '', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
        plugins: [
-          'AMap.ToolBar',
-          'AMap.Autocomplete',
-          'AMap.PlaceSearch',
-          'AMap.Geolocation',
-          'AMap.Geocoder'
+          "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插件
-        }
+          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
+          this.map = new AMap.Map("map-container", {
+            zoom: 12,
          });
          that.map.addControl(new AMap.ToolBar());
          that.map.addControl(new AMap.Autocomplete());
@@ -117,15 +97,15 @@ export default {

          // 实例化Autocomplete
          let autoOptions = {
-            city: '全国'
+            city: "全国",
          };
          that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
          that.geocoder = new AMap.Geocoder(autoOptions);

          that.positionPicker = new AMapUI.PositionPicker({
            // 拖拽选点
-            mode: 'dragMap',
-            map: that.map
+            mode: "dragMap",
+            map: that.map,
          });
          that.positionPicker.start();
          /**
@@ -134,38 +114,37 @@ export default {
           * 需要字段可以查找
           *
           */
-          that.positionPicker.on('success', function (positionResult) {
-            // console.log(positionResult);
+          that.positionPicker.on("success", function (positionResult) {
            that.addrContent = positionResult;
          });
        })
-        .catch((e) => {});
+        .catch((e) => { });
    },
-    searchOfMap (val) {
+    searchOfMap(val) {
      // 地图搜索
      let that = this;
      this.autoComplete.search(val, function (status, result) {
        // 搜索成功时，result即是对应的匹配数据
-        if (status === 'complete' && result.info === 'OK') {
+        if (status == "complete" && result.info == "OK") {
          that.tips = result.tips;
        } else {
          that.tips = [];
        }
      });
    },
-    selectAddr (location) {
+    selectAddr(location) {
      // 选择坐标
      if (!location) {
-        this.$Message.warning('请选择正确点位');
+        this.$Message.warning("请选择正确点位");
        return false;
      }
      const lnglat = [location.lng, location.lat];
      this.positionPicker.start(lnglat);
-    }
+    },
  },
-  mounted () {
+  mounted() {
    this.init();
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -179,16 +158,20 @@ export default {
  right: 20px;
  top: 64px;
  width: 260px;
+
  ul {
    width: 260px;
-    height: 400px;
+    height: 360px;
    overflow: scroll;
+
    li {
      padding: 5px;
+
      p:nth-child(2) {
        color: #999;
        font-size: 12px;
      }
+
      &:hover {
        background-color: #eee;
        cursor: pointer;
@@ -199,6 +182,12 @@ export default {

 .address {
  margin-bottom: 10px;
+  // color: $theme_color;
  font-weight: bold;
 }
+
+.footer {
+  text-align: right;
+  margin: 10px 0;
+}
 </style>
--- a/buyer/src/components/map/multiple-map.vue
+++ b/buyer/src/components/map/multiple-map.vue
@@ -0,0 +1,155 @@
+<template>
+  <Modal width="800" footer-hide v-model="enableMap">
+    <RadioGroup @on-change="changeMap" v-model="mapDefault" type="button">
+      <Radio label="select">级联选择</Radio>
+      <Radio label="map" v-if="aMapSwitch">高德地图</Radio>
+    </RadioGroup>
+    <div>
+      <div v-if="mapDefault === 'select'">
+        <div class="selector">
+          <div class="selector-item" v-for="(plant, plantIndex) in Object.keys(data)" :key="plantIndex">
+            <div :class="{ 'active': chiosend[plantIndex].id == item.id }" v-for="(item, index) in data[plant]"
+              :key="index"
+              @click="init(item, plantIndex != Object.keys(data).length - 1 ? Object.keys(data)[plantIndex + 1] : 0, plantIndex)"
+              class="map-item">
+              {{ item.name }}
+            </div>
+          </div>
+
+        </div>
+        <div class="footer">
+          <Button type="primary" @click="finished">确定</Button>
+        </div>
+      </div>
+      <mapping v-if="mapDefault === 'map'" ref="map" @getAddress="getAddress" />
+
+    </div>
+
+
+  </Modal>
+</template>
+
+<script>
+import { aMapSwitch } from '@/config/index'
+import mapping from "@/components/map/index.vue";
+import * as API_Setup from "@/api/common.js";
+export default {
+  components: { mapping },
+  data() {
+    return {
+      aMapSwitch,
+      enableMap: false,
+      mapDefault: "select",
+      data: {
+        province: [], //省
+        city: [], //市
+        area: [], //区
+        street: [], //街道
+      },
+      chiosend: [],
+
+    };
+  },
+  mounted() {
+
+    this.chiosend = new Array(4).fill("");
+
+  },
+  methods: {
+    open() {
+      this.enableMap = true
+      this.init({ id: 0 }, 'province');
+    },
+    changeMap(val) {
+      this.mapDefault = val
+
+
+    },
+    init(val, level = 'province', index) {
+      if (level == 0) {
+        // 说明选择到了街道，将街道id存入数组
+        this.chiosend.splice(3, 1, val);
+      }
+      else {
+        API_Setup.getRegion(val.id).then((res) => {
+          if (res.result.length && val.id !== 0) {
+            this.chiosend[index] = val
+          }
+          else if(!res.result.length){
+            this.chiosend[index] = val
+          }
+          this.data[level] = res.result;
+          if (level == 'city') {
+            this.data.area = []
+            this.data.street = []
+            this.chiosend.splice(1, 3, "","","");
+          }
+          if (level == 'area') {
+            this.data.street = []
+            this.chiosend.splice(2, 2, "","");
+          }
+          if (level == 'street') {
+            this.chiosend.splice(3, 1, "");
+          }
+        });
+      }
+    },
+    getAddress(center) {
+      this.$emit('callback', {
+        type: this.mapDefault,
+        data: center
+      })
+      this.enableMap = false;
+    },
+    // 选择完成
+    finished() {
+      if(!this.chiosend[0]){
+        this.$Message.error("请选择地址")
+        return
+      }
+      const params = this.chiosend.filter((item) => item!=="" && item.value !== "");
+      this.enableMap = false;
+      this.$emit('callback', {
+        type: this.mapDefault,
+        data: params
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.selector {
+
+
+  height: 400px;
+  padding: 10px 0;
+  display: flex;
+}
+
+.selector-item {
+  width: 100%;
+  flex: 1;
+  overflow: auto;
+}
+
+.map-item {
+  width: 100%;
+  padding: 10px;
+  border-bottom: 1px solid #eee;
+  cursor: pointer;
+
+  &:hover {
+    background: #eee;
+  }
+}
+
+.active {
+  background: #eee;
+}
+
+.footer {
+  text-align: right;
+  margin: 10px 0;
+}
+</style>
--- a/buyer/src/components/mixes/talkIm.vue
+++ b/buyer/src/components/mixes/talkIm.vue
@@ -0,0 +1,52 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+import { getIMDetail } from "@/api/common";
+import Storage from "@/plugins/storage";
+import { getMemberMsg } from "@/api/login";
+export default {
+  data() {
+    return {
+      Storage,
+      IMLink: "",
+    };
+  },
+  methods: {
+    // 跳转im客服
+    async IMService(id, goodsId, skuId) {
+
+      // 获取访问Token
+      let accessToken = Storage.getItem("accessToken");
+      await this.getIMDetailMethods();
+      const userInfo = await getMemberMsg();
+      if (userInfo.success) {
+        //携带商品Id,在IM可以发送商品信息
+        if(goodsId && skuId){
+          window.open(
+            this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId + "&goodsId=" + goodsId + "&skuId=" + skuId
+          );
+        }else{
+          window.open(
+            this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId
+          );
+        }
+
+      } else {
+        this.$Message.error("请登录后再联系客服");
+        return;
+      }
+    },
+    // 获取im信息
+    async getIMDetailMethods() {
+      let res = await getIMDetail();
+      if (res.success) {
+        this.IMLink = res.result;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
--- a/buyer/src/components/nav/CateNav.vue
+++ b/buyer/src/components/nav/CateNav.vue
@@ -1,28 +1,29 @@
 <template>
-  <div class="cate-nav">
-    <div class="nav-con">
+  <div class="cate-nav width_1200_auto" :class="{'fixed-show':useClass == 'fixed-show'}">
+    <div class="nav-con" :class="{'background-white':useClass == 'background-white'}">
      <div
        class="all-categories hover-pointer"
        @mouseenter="showFirstLists"
        @mouseleave="showFirstList = false"
      >
-        全部商品分类
+        商品分类
      </div>
-      <ul class="nav-item" v-if="showNavBar">
+      <ul class="nav-item " v-if="showNavBar">
        <li
-          class="nav-lis"
+          class="nav-lis flex flex-a-c flex-j-c"
          v-for="(item, index) in navList.list"
          :key="index"
          @click="linkTo(item.url)"
        >
          {{ item.name }}
-          <!-- {{item}} -->
+          <div class="colum" v-if="index !== navList.list.length - 1"></div>
        </li>
      </ul>
    </div>
    <!-- 全部商品分类 -->
    <div
      class="cate-list"
+      :style="{'top':!showNavBar ?'60px':'46px'}"
      v-show="showAlways || showFirstList"
      @mouseenter="showFirstList = true"
      @mouseleave="showFirstList = false"
@@ -131,6 +132,10 @@ export default {
      default: false,
      type: Boolean,
    },
+    useClass:{
+      type:null,
+      default:''
+    }
  },
  data() {
    return {
@@ -223,46 +228,81 @@ export default {
 </script>

 <style scoped lang="scss">
+.background-white{
+  background: #fff;
+}
 .nav-lis:hover {
  color: $theme_color !important;
  cursor: pointer;
+
+}
+.nav-lis{
+  width: 103px;
+  text-align: center;
+  position: relative;
+}
+.fixed-show{
+  margin-top: 0 !important;
+  >.nav-con{
+  >.all-categories{
+    align-items: center !important;
+    height: 60px;
+    display: inherit;
+    justify-content: center;
+    padding: 0 !important;
+  }
+  }
+}
+.colum{
+  height: 14.7px;
+  opacity: 1;
+  border: 0.7px solid #CBC8C8;
+  position: absolute;
+  right: 0;
 }
 .cate-nav {
-  width: 1200px;
  position: relative;
-  margin: 0 auto;
+  margin: 14px auto 0 auto;
 }
 /** 商品分类 */
 .nav-con {
-  width: 1200px;
-  height: 40px;
+  height: 46px;
  margin: 0 auto;
  display: flex;
  .all-categories {
-    width: 200px;
-    line-height: 40px;
-    color: #fff;
-    background-color: $theme_color;
-    text-align: center;
-    font-size: 16px;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    padding-left: 37.4px;
+    background: #FFFFFF;
+    width: 263.2px;
+    padding-top: 15.4px;
+    line-height: 20px;
    border-bottom: none;
+    font-size: 16.8px;
+    font-weight: normal;
+    color: #333333;
+    letter-spacing: 0px;
  }
  .nav-item {
-    width: 1000px;
-    height: 40px;
-    line-height: 40px;
+    width: 914px;
+    height: 46px;
+    border-radius: 10px;
+    background: #FFFFFF;
+    margin-left: 10px;
+    line-height: 46px;
    overflow: hidden;
    list-style: none;
    // background-color: #eee;
    display: flex;
    li {
      float: left;
-      font-weight: bold;
-      margin-left: 20px;
-      color: rgb(129, 127, 127);
-      font-size: 15px;
+      font-size: 17px;
+      font-weight: normal;
+      color: #333333;
+
+
      &:hover {
-        color: #e1251b;
+        color: $theme_color;
      }
    }
  }
@@ -271,17 +311,33 @@ export default {
 .cate-list {
  margin: 0 auto;
  position: absolute;
+
  z-index: 1000;
 }

 .nav-side {
-  width: 200px;
+  width: 263.2px;
+  color: #666;
  float: left;
-  padding: 0px;
-  color: #fff;
-  background-color: #6e6568;
-  height: 335px;
-  overflow: hidden;
+  overflow:hidden;
+
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  background-color: #fff;
+  height: 340px;
+  ////自动移滚动条样式
+  //&::-webkit-scrollbar {
+  //  width: 1px;
+  //  height: 5px;
+  //}
+  //&::-webkit-scrollbar-thumb {
+  //  border-radius: 1em;
+  //  background-color: rgba(50, 50, 50, 0.3);
+  //}
+  //&::-webkit-scrollbar-track {
+  //  border-radius: 1em;
+  //  background-color: rgba(50, 50, 50, 0.1);
+  //}
 }
 .large-nav {
  height: 470px;
@@ -294,22 +350,16 @@ export default {
 }
 .nav-side ul {
  width: 100%;
-  padding: 0px;
-  padding-top: 5px;
  list-style: none;
 }
 .nav-side li {
-  padding: 7.5px 0;
-  padding-left: 12px;
+  padding: 0 0 16.2px 37.4px;
  font-size: 13px;
  line-height: 18px;
-  &:hover {
-    background: #999395;
-  }
 }
 .nav-side-item:hover {
  cursor: pointer;
-  color: #e1251b;
+  color: $theme_color;
 }

 /*显示商品详细信息*/
@@ -335,10 +385,11 @@ export default {
  padding-left: 12px;
  margin-right: 15px;
  font-size: 12px;
-  background-color: #6e6568;
+  color: #333;
 }
 .nav-detail-item span:hover {
-  background-color: #e1251b;
+  background-color: $theme_color;
+  color: #fff;
 }
 .detail-item-panel li {
  line-height: 30px;
@@ -353,7 +404,7 @@ export default {
  text-align: right;
 }
 .detail-item-title:hover {
-  color: #e1251b;
+  color: $theme_color;
 }
 .detail-item-row {
  display: flex;
@@ -373,6 +424,6 @@ export default {
  }
 }
 .detail-item:hover {
-  color: #e1251b;
+  color: $theme_color;
 }
 </style>
--- a/buyer/src/components/nav/GoodsClassNav.vue
+++ b/buyer/src/components/nav/GoodsClassNav.vue
@@ -153,7 +153,9 @@
          </div>
        </div>
      </template>
-      <div @click="moreOptions" v-if="tagsContent.length>4" class="more-options">{{showTagCount===5?'更多筛选项':'收起筛选项'}}<Icon :type="showTagCount===5?'ios-arrow-down':'ios-arrow-up'" /></div>
+      <div @click="moreOptions" v-if="tagsContent.length>4" class="more-options">
+      {{showTagCount===5?'更多筛选项':'收起筛选项'}}
+      </div>
    </div>
  </div>
 </template>
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -16,6 +16,12 @@ module.exports = {
  //FIXME 请检查当前高德key创建的日期，如果2021年12月02日之前申请的 无需填写安全密钥
  aMapSecurityJsCode:"2bd0fbf621881f4c77be74f0e76495f3", // 高德web端js申请的安全密钥
  aMapKey: "7f11113750315d8543daaf5c3ba353ca", //高德web端js申请的api key
+  aMapSwitch:false, //是否开启高德定位
  enableCDN: true, //生产环境 是否启用cdn加载 vue等js
  port: 10000, //端口
+  inputMaxLength:'140', //全局输入框默认最大输入长度字
+
+
+  PC_DOMAIN: "https://pc-b2b2c.pickmall.cn", // PC端域名
+  WAP_DOMAIN: "https://m-b2b2c.pickmall.cn", // WAP端域名
 };
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -8,10 +8,15 @@ import * as filters from "./plugins/filters";
 import store from "@/vuex/store";
 import storage from "@/plugins/storage";
 // 全局引入封装组件
-import { InstallAll } from "@/components/global.js";
+import {InstallAll} from "@/components/global.js";
+
+const {aMapSecurityJsCode, title, inputMaxLength} = require("@/config");
+
+const copyViewUi = {...ViewUI}
+copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值
+Vue.use(copyViewUi);
+

-const { aMapSecurityJsCode, title } = require("@/config");
-Vue.use(ViewUI);
 Vue.use(InstallAll);
 Vue.config.productionTip = false;

--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -10,7 +10,7 @@
          >)
        </div>
      </div>
-      <Search :showTag="false" :showLogo="false"></Search>
+
    </div>
    <Divider />
    <!-- 购物车主体 -->
@@ -245,7 +245,7 @@
      </div>
      <Spin size="large" fix v-if="loading"></Spin>
    </div>
-    <BaseFooter></BaseFooter>
+    <BaseFooter class="footer"></BaseFooter>
  </div>
 </template>

@@ -449,6 +449,9 @@ export default {
 </script>

 <style scoped lang="scss">
+.footer{
+  margin-top: 10px;
+}
 /** logo 搜索 start **/
 .logo {
  height: 40px;
@@ -781,4 +784,5 @@ export default {
 .ivu-input-number-input {
  text-align: center;
 }
+
 </style>
--- a/buyer/src/pages/CouponCenter.vue
+++ b/buyer/src/pages/CouponCenter.vue
@@ -5,25 +5,44 @@
      <div>
        <div class="coupon-title">
          <router-link to="/">
-            <img src="../assets/images/logo.png" width="120" alt="">
+            <img src="../assets/images/logo.png" width="120" alt="" />
          </router-link>
          <p>领券中心</p>
-          <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />
+          <Input
+            search
+            style="width: 400px"
+            @on-search="search"
+            enter-button="搜索"
+            placeholder="搜索优惠券"
+          />
        </div>

        <div class="fontsize_18 recommend">推荐好券</div>

-        <empty v-if="list.length===0" />
+        <empty v-if="list.length === 0" />
        <ul class="coupon-list" v-else>
          <li v-for="(item, index) in list" class="coupon-item" :key="index">
            <div class="c-left">
              <div>
-                <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
-                <span class="describe">满{{item.consumeThreshold}}元可用</span>
+                <span
+                  v-if="item.couponType === 'PRICE'"
+                  class="fontsize_12 global_color"
+                  >￥<span class="price">{{
+                    item.price | unitPrice
+                  }}</span></span
+                >
+                <span
+                  v-if="item.couponType === 'DISCOUNT'"
+                  class="fontsize_12 global_color"
+                  ><span class="price">{{ item.couponDiscount }}</span
+                  >折</span
+                >
+                <span class="describe"
+                  >满{{ item.consumeThreshold }}元可用</span
+                >
              </div>
-              <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
-              <p>有效期：{{item.endTime}}</p>
+              <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
+              <p>有效期：{{ item.endTime }}</p>
            </div>
            <b></b>
            <a class="c-right" @click="receive(item)">立即领取</a>
@@ -31,12 +50,15 @@
            <i class="circle-bottom"></i>
          </li>
        </ul>
-        <Page :total="total" @on-change="changePageNum"
+        <Page
+          :total="total"
+          @on-change="changePageNum"
          class="pageration"
          @on-page-size-change="changePageSize"
          :page-size="params.pageSize"
          show-total
-          show-sizer>
+          show-sizer
+        >
        </Page>
      </div>
    </div>
@@ -44,135 +66,136 @@
  </div>
 </template>
 <script>
-import {couponList, receiveCoupon} from '@/api/member.js'
+import { couponList, receiveCoupon } from "@/api/member.js";
 export default {
-  data () {
+  data() {
    return {
      list: [], // 优惠券列表
      total: 0, // 优惠券总数
-      params: { // 请求参数
-        getType: 'FREE',
+      params: {
+        // 请求参数
+        getType: "FREE",
        pageNumber: 1,
-        pageSize: 20
-      }
-    }
+        pageSize: 20,
+      },
+    };
  },
  methods: {
    // 搜索优惠券
-    search (item) {
-      this.params.couponName = item
-      this.params.pageNumber = 1
-      this.getList()
+    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() })
+    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) {
+    changePageNum(val) {
      this.params.pageNumber = val;
-      this.getList()
+      this.getList();
    },
    // 分页 改变每页数
-    changePageSize (val) {
+    changePageSize(val) {
      this.params.pageNumber = 1;
      this.params.pageSize = val;
-      this.getList()
+      this.getList();
    },
    // 领取优惠券
-    receive (item) {
-      receiveCoupon(item.id).then(res => {
+    receive(item) {
+      receiveCoupon(item.id).then((res) => {
        if (res.success) {
+          console.log(item);
          this.$Modal.confirm({
-            title: '领取优惠券',
-            content: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
-            okText: '我的优惠券',
-            cancelText: '立即使用',
+            title: "领取优惠券",
+            content: "<p>优惠券领取成功，可到我的优惠券页面查看</p>",
+            okText: "我的优惠券",
+            cancelText: "立即使用",
            closable: true,
            onOk: () => {
-              this.$router.push('/home/Coupons')
+              this.$router.push("/home/Coupons");
            },
            onCancel: () => {
-              if (item.storeId !== '0') {
-                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'})
-                }
-              }
-            }
+              this.$router.push({
+                path: "/goodsList",
+                query: { promotionsId: item.id, promotionType: "COUPON" },
+              });
+            },
          });
        }
-      })
+      });
    },
    // 优惠券可用范围
-    useScope (type, storeName) {
-      let shop = '平台';
-      let goods = '全部商品'
-      if (storeName !== 'platform') shop = storeName
+    useScope(type, storeName) {
+      let shop = "平台";
+      let goods = "全部商品";
+      if (storeName !== "platform") shop = storeName;
      switch (type) {
-        case 'ALL':
-          goods = '全部商品'
+        case "ALL":
+          goods = "全部商品";
          break;
-        case 'PORTION_GOODS':
-          goods = '部分商品'
+        case "PORTION_GOODS":
+          goods = "部分商品";
          break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品'
+        case "PORTION_GOODS_CATEGORY":
+          goods = "部分分类商品";
          break;
      }
-      return `${shop}${goods}可用`
-    }
+      return `${shop}${goods}可用`;
+    },
  },
-  mounted () {
-    this.getList()
-  }
-}
+  mounted() {
+    this.getList();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  @import '../assets/styles/coupon.scss';
-  .content{
-    width: 100%;
-    background-color: #fff;
+@import "../assets/styles/coupon.scss";
+.content {
+  width: 100%;
+  background-color: #fff;

-    > div {
-      margin: 10px auto;
-      width: 1200px;
-    }
+  > div {
+    margin: 10px auto;
+    width: 1200px;
  }
-  .coupon-title {
-    display: flex;
-    align-items: center;
+}
+.coupon-title {
+  display: flex;
+  align-items: center;

-    p{
-      font-size: 18px;
-      margin-right: 500px;
-    }
-    border-bottom: 2px solid $theme_color;
+  p {
+    font-size: 18px;
+    margin-right: 500px;
  }
-  .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;
+  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>
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -2,48 +2,40 @@
  <div style="background: #fff">
    <BaseHeader></BaseHeader>
    <Search></Search>
-    <drawer></drawer>
-    <ShopHeader :detail="storeMsg"></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"
-          >
+          <BreadcrumbItem v-for="(item, index) in categoryBar" :to="goGoodsList(index)" target="_blank" :key="index">
            {{ item.name }}
          </BreadcrumbItem>
        </Breadcrumb>
-        <div class="store-collect">
+        <div class="store-collect" v-if="!takeDownSale">
          <span class="mr_10" v-if="goodsMsg.data">
            <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 ? "已收藏店铺" : "收藏店铺" }}
+            <Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
+            {{ storeCollected? "已收藏店铺": "收藏店铺" }}
          </span>
-          <span class="ml_10" @click="IMService()">联系客服</span>
+          <span class="ml_10" @click="IMService(goodsMsg.data.storeId,goodsMsg.data.goodsId,goodsMsg.data.id)">联系客服</span>
        </div>
      </div>
    </div>

    <!-- 商品信息展示 -->
-    <ShowGoods
-      @handleClickSku="targetClickSku"
-      v-if="goodsMsg.data"
-      :detail="goodsMsg"
-    ></ShowGoods>
+    <ShowGoods @handleClickSku="targetClickSku" v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoods>
    <!-- 商品详细展示 -->
    <ShowGoodsDetail v-if="goodsMsg.data" :detail="goodsMsg"></ShowGoodsDetail>

+    <empty _Title='当前商品已下架' v-if="takeDownSale">
+      <div class="sale-btn">
+        <Button size="small" class="mr_10" @click="target('/')">返回首页</Button>
+        <Button size="small" @click="target('goodsList')">返回商品列表</Button>
+      </div>
+    </empty>
    <Spin size="large" fix v-if="isLoading"></Spin>
    <BaseFooter></BaseFooter>
  </div>
@@ -51,69 +43,52 @@

 <script>
 import Search from "@/components/Search";
-import ShopHeader from "@/components/header/ShopHeader";
+
 import ShowGoods from "@/components/goodsDetail/ShowGoods";
+import empty from "@/components/empty/Main";
 import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
 import { goodsSkuDetail } from "@/api/goods";
 import {
-  cancelCollect,
-  collectGoods,
-  isCollection,
+  cancelStoreCollect,
+  collectStore,
+  isStoreCollection,
  getGoodsDistribution,
 } from "@/api/member";
 import { getDetailById } from "@/api/shopentry";
-import { getIMDetail } from "@/api/common";
-import Storage from "../plugins/storage";
+import imTalk from '@/components/mixes/talkIm'
 export default {
  name: "GoodsDetail",
-  beforeRouteEnter(to, from, next) {
+  beforeRouteEnter (to, from, next) {
    window.scrollTo(0, 0);
    next();
  },
-  created() {
+  created () {
    this.getGoodsDetail();
  },
-  data() {
+  mixins: [imTalk],
+  data () {
    return {
      goodsMsg: {}, // 商品信息
      isLoading: false, // 加载状态
      categoryBar: [], // 分类
      storeCollected: false, // 商品收藏
      storeMsg: {}, // 店铺信息
-      IMLink: "",
+      takeDownSale:false, // 是否下架
+
    };
  },
  methods: {
-    // 跳转im客服
-    async IMService() {
-      // 获取访问Token
-      let accessToken = Storage.getItem("accessToken");
-      await this.getIMDetailMethods();
-      if (!accessToken) {
-        this.$Message.error("请登录后再联系客服");
-        return;
-      }
-      window.open(
-        this.IMLink +
-          "?token=" +
-          accessToken +
-          "&id=" +
-          this.goodsMsg.data.storeId
-      );
-    },
-    // 获取im信息
-    async getIMDetailMethods() {
-      let res = await getIMDetail();
-      if (res.success) {
-        this.IMLink = res.result;
-      }
+    // 跳转首页或商品页面
+    target(url){
+      this.$router.push({path: url})
+
    },
    // 点击规格
-    targetClickSku(val) {
+    targetClickSku (val) {
      this.getGoodsDetail(val);
    },
    // 获取商品详情
-    getGoodsDetail(val) {
+    getGoodsDetail (val) {
      this.isLoading = true;
      const params = val || this.$route.query;

@@ -141,6 +116,7 @@ export default {
        .then((res) => {
          this.isLoading = false;
          if (res.success) {
+
            const result = res.result;
            const cateName = res.result.categoryName;
            const cateId = result.data.categoryPath.split(",");
@@ -149,37 +125,45 @@ export default {
              // 插入分类id和name
              cateArr.push({
                id: e,
-                name: cateName[index],
+                name: cateName ? cateName[index] : "",
              });
            });
            this.categoryBar = cateArr;
            this.$set(this, "goodsMsg", res.result);
+            if (!this.goodsMsg.data.intro) {
+              this.goodsMsg.data.intro = ''
+            }
            // 判断是否收藏
            if (this.Cookies.getItem("userInfo")) {
-              isCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
+              isStoreCollection("STORE", this.goodsMsg.data.storeId).then((res) => {
                if (res.success && res.result) {
                  this.storeCollected = true;
                }
              });
            }
+
            if (!this.storeMsg) {
              // 获取店铺信息
              getDetailById(this.goodsMsg.data.storeId).then((res) => {
                if (res.success) {
                  this.storeMsg = res.result;
+
                }
              });
            }
          } else {
            this.$Message.error(res.message);
-            this.$router.push("/");
+            this.isLoading = false
          }
        })
        .catch((e) => {
-          this.$router.push("/");
+          this.isLoading = false
+          if(e.code === 11001){
+            this.takeDownSale = true
+          }
        });
    },
-    goGoodsList(currIndex) {
+    goGoodsList (currIndex) {
      // 跳转商品列表
      const arr = [];
      this.categoryBar.forEach((e, index) => {
@@ -189,16 +173,16 @@ export default {
      });
      return location.origin + "/goodsList?categoryId=" + arr.toString();
    },
-    async collect() {
+    async collect () {
      // 收藏店铺
      if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.goodsMsg.data.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.goodsMsg.data.storeId);
        if (cancel.success) {
          this.$Message.success("已取消收藏");
          this.storeCollected = false;
        }
      } else {
-        let collect = await collectGoods("STORE", this.goodsMsg.data.storeId);
+        let collect = await collectStore("STORE", this.goodsMsg.data.storeId);
        if (collect.code === 200) {
          this.storeCollected = true;
          this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
@@ -209,9 +193,9 @@ export default {
  watch: {},
  components: {
    Search,
-    ShopHeader,
    ShowGoods,
    ShowGoodsDetail,
+    empty
  },
 };
 </script>
@@ -242,4 +226,8 @@ export default {
    }
  }
 }
+.sale-btn{
+  margin:10px 0
+
+}
 </style>
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -1,9 +1,8 @@
 <template>
-  <div>
+  <div class="wrapper">
    <BaseHeader></BaseHeader>
    <Search @search="handleSearch"></Search>
-    <drawer></drawer>
-    <cateNav></cateNav>
+
    <div class="container">
      <!-- 商品筛选栏 -->
      <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@@ -49,60 +48,61 @@
              class="goods-show-info"
              v-for="(item, index) in goodsList"
              :key="index"
-              @click="goGoodsDetail(item.id, item.content.goodsId)"
+              @click="goGoodsDetail(item.id, item.goodsId)"
            >
              <div class="goods-show-img">
-                <img width="220" height="220" :src="item.content.thumbnail" />
+                <img width="220" height="220" :src="item.thumbnail" />
              </div>
              <div class="goods-show-price">
                <span>
                  <span class="seckill-price text-danger">{{
-                    item.content.price | unitPrice("￥")
+                    item.price | unitPrice("￥")
                  }}</span>
                </span>
              </div>
              <div class="goods-show-detail">
                <Tag
-                  v-if="item.content.salesModel === 'WHOLESALE'"
+                  v-if="item.salesModel === 'WHOLESALE'"
                  class="goods-show-tag"
                  color="purple"
-                  >
+                >
                  批发
                </Tag>
-                <span>{{ item.content.goodsName }}</span>
+                <span>{{ item.goodsName }}</span>
              </div>
              <div class="goods-show-num">
-                已有<span>{{ item.content.commentNum || 0 }}</span
+                已有<span>{{ item.commentNum || 0 }}</span
                >人评价
              </div>
              <div class="goods-show-seller">
-                <Tag
-                  class="goods-show-buyer"
-                  v-if="item.content.selfOperated"
-                  size="default"
-                  color="error"
-                  >自营
-                </Tag>
-                <div class="goods-show-right">
-                  <div
-                    class="goods-show-middle"
-                    v-if="goodsListType.content.goodsType == 'VIRTUAL_GOODS'"
-                  >
-                    虚拟
-                  </div>
-                  <div
-                    class="goods-show-middle"
-                    v-else-if="
-                      goodsListType.content.goodsType == 'PHYSICAL_GOODS'
-                    "
-                  >
-                    实物
-                  </div>
-                </div>
                <span class="text-bottom" style="color: #e4393c">{{
-                  item.content.storeName
+                  item.storeName
                }}</span>
              </div>
+
+              <div class="goods-show-right">
+                <Tag
+                  class="goods-show-tag"
+                  color="red"
+                  v-if="item.selfOperated"
+                >
+                  自营
+                </Tag>
+                <Tag
+                  class="goods-show-tag"
+                  color="blue"
+                  v-if="item.goodsType === 'VIRTUAL_GOODS'"
+                >
+                  虚拟
+                </Tag>
+                <Tag
+                  class="goods-show-tag"
+                  color="blue"
+                  v-else-if="item.goodsType === 'PHYSICAL_GOODS'"
+                >
+                  实物
+                </Tag>
+              </div>
            </div>
          </div>
        </div>
@@ -145,7 +145,6 @@ export default {
      ],
      goodsList: [], // 商品列表
      loading: false, // 加载状态
-      goodsListType: "",
      total: 0, // 列表总数
      params: {
        // 请求参数
@@ -158,19 +157,28 @@ export default {
  watch: {
    $route() {
      const keyword = this.$route.query.keyword;
-      this.handleSearch(keyword);
+      if (keyword) {
+        this.handleSearch(keyword);
+      }
      if (this.$route.query.categoryId) {
        let cateId = this.$route.query.categoryId.split(",");
        Object.assign(this.params, this.$route.query);
        this.params.categoryId = cateId[cateId.length - 1];
-        this.getGoodsList();
      }
+      if (this.$route.query.promotionType) {
+        this.params.promotionType = this.$route.query.promotionType;
+      }
+      if (this.$route.query.promotionsId) {
+        this.params.promotionsId = this.$route.query.promotionsId;
+      }
+      this.getGoodsList();
    },
  },
  methods: {
    // 搜索
    handleSearch(key) {
      this.params.keyword = key;
+      this.$route.query.keyword = key
      this.params.pageNumber = 0;
      this.getGoodsList();
    },
@@ -221,11 +229,8 @@ export default {
        .then((res) => {
          this.loading = false;
          if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
-            for (var i = 0; i < this.goodsList.length; i++) {
-              this.goodsListType = this.goodsList[i];
-            }
+            this.goodsList = res.result.records;
+            this.total = res.result.total;
          }
        })
        .catch(() => {
@@ -256,12 +261,16 @@ export default {

 <style scoped lang="scss">
@import "../assets/styles/goodsList.scss";
+.cate-nav{
+  margin-top: 10px;
+}
 .goods-show-info > .goods-show-seller > .goods-show-buyer {
-  height: 16px;
-  width: 30px;
+  width: 35px;
+  height: 17px;
  white-space: nowrap;
  line-height: 17px;
  text-align: center;
+  align-content: center;
  padding: 0 3px;
  background-color: #e23a3a;
 }
@@ -281,8 +290,8 @@ export default {
  vertical-align: middle;
 }
 .container {
-  margin: 15px auto;
-  width: 1200px;
+  margin:25px auto 15px auto;
+  width: 1184px;
  min-width: 1000px;
  position: relative;
 }
@@ -293,72 +302,14 @@ export default {
  display: flex;
 }
 /* ---------------侧边广告栏开始------------------- */
-.as-box {
-  width: 200px;
-  border: 1px solid #ccc;
-}
+
 .goods-show-right {
-  width: 35px;
-  height: 17px;
-  // vertical-align:middle;
-  overflow: hidden;
-  margin-top: 1.5px;
-  margin-right: 5px;
-  line-height: 16px;
-  background: white;
-  border-radius: 4px;
-  margin-bottom: 5px;
-  float: left;
-  text-align: center;
-  border: 1px solid rgba(112, 123, 187, 0.8);
-  color: rgba(112, 123, 187, 0.8);
-}
-.goods-show-middle:hover {
-  color: rgba(2, 15, 88, 0.6);
-  border: 0.2px solid rgba(0, 13, 87, 0.6);
-  border-radius: 4px;
-  line-height: 18px;
-}
-.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: rgb(204, 204, 204);
-}
-.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 {
+  display: flex;
+  flex-direction: row;
  margin-top: 5px;
-  font-size: 12px;
 }
-.item-as-selled {
-  margin-top: 5px;
-  font-size: 12px;
-}
-.item-as-selled span {
-  color: #005aa0;
-}
-/* ---------------侧边广告栏结束------------------- */
+
+

 /* ---------------商品栏开始------------------- */
 .goods-list-box {
--- a/buyer/src/pages/Index.vue
+++ b/buyer/src/pages/Index.vue
@@ -1,6 +1,28 @@
 <template>
  <div class="container">
-    <drawer></drawer>
+    <Modal v-model="showCpmodel" width="350">
+            <template #header>
+                <p style="color:black;text-align:left">
+                    <!-- <Icon type="ios-information-circle"></Icon> -->
+                    <span>活动优惠券</span>
+                </p>
+            </template>
+              <template>
+                  <Scroll :on-reach-bottom="handleReachBottom">
+                      <Card dis-hover v-for="(item, index) in autoCoupList" :key="index" style="margin: 10px 15px">
+                            <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color" style="font-size: 15px;">￥<span class="price">{{item.price | unitPrice}}</span></span>
+                            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color" style="font-size: 15px;"><span class="price">{{item.discount}}</span>折</span>
+                            <span class="describe" style="font-size: 15px;margin-left: 5px;">满{{item.consumeThreshold}}元可用</span>
+                            <p style="font-size: 10px;">使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
+                            <p style="font-size: 10px;">有效期：{{item.endTime}}</p>
+                      </Card>
+                  </Scroll>
+              </template>
+            <template #footer>
+                <Button type="error" @click="showCpmodel=false">确定</Button>
+            </template>
+        </Modal>
+
    <!-- 固定头部 -->
    <hover-search class="hover-search" :class="{show: topSearchShow}"></hover-search>
    <!-- 顶部广告 -->
@@ -15,6 +37,8 @@
    <model-form ref="modelForm" :data="modelForm"></model-form>
    <!-- 底部栏 -->
    <BaseFooter></BaseFooter>
+    <!-- 侧边栏 -->
+    <fixedBar class="fixed-bar" :class="{'show-fixed': topSearchShow}"></fixedBar>
  </div>
 </template>

@@ -22,8 +46,9 @@
 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';
+import fixedBar from '@/components/fixed/index';
+import storage from "@/plugins/storage";
+import { indexData,getAutoCoup } from '@/api/index.js';
 import {seckillByDay} from '@/api/promotion'
 export default {
  name: 'Index',
@@ -38,9 +63,14 @@ export default {
        that.topSearchShow = false;
      }
    };
+    if(storage.getItem('userInfo')){
+      this.getAutoCoup()
+    }
  },
  data () {
    return {
+      autoCoupList:[],
+      showCpmodel:false,
      modelForm: { list: [] }, // 楼层装修数据
      topAdvert: {}, // 顶部广告
      showNav: false, // 是否展示分类栏
@@ -49,33 +79,114 @@ export default {
      carouselOpacity: false // 不同轮播分类样式
    };
  },
+  props:{
+    pageData:{
+      type:null,
+      default:""
+    }
+  },
+  // created(){
+
+  // },
  methods: {
-    getIndexData () {
-      // 获取首页装修数据
-      indexData({ clientType: 'PC' }).then(async (res) => {
-        if (res.success) {
-          let dataJson = JSON.parse(res.result.pageData);
-          // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
-          // 轮播图根据不同轮播，样式不同
-          for (let i = 0; i < dataJson.list.length; i++) {
-            let type = dataJson.list[i].type
-            if (type === 'carousel2') {
-              this.carouselLarge = true;
-            } else if (type === 'carousel1') {
-              this.carouselLarge = true
-              this.carouselOpacity = true
-            } else if (type === 'seckill') {
-              let seckill = await this.getListByDay()
-              dataJson.list[i].options.list = seckill
-            }
-          }
-          this.modelForm = dataJson;
-          storage.setItem('navList', dataJson.list[1])
-          this.showNav = true
-          this.topAdvert = dataJson.list[0];
-        }
-      });
+    // 优惠券可用范围
+    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}可用`
    },
+    getAutoCoup(){
+      let data = new Date()
+      let datas = data.getDate()
+      let hours = data.getHours()
+      let flagCoup = storage.getItem('getTimes') //缓存
+      if(flagCoup && flagCoup != undefined && flagCoup != null){  //判断当前是否有缓存
+        if(Number(datas) > Number(flagCoup)){ //判断缓存是否小于当前天数
+          if(Number(hours) >= 6){//超过或等于6时清楚缓存
+            storage.setItem('getTimes',datas)//存储缓存
+            this.getcps()
+          }
+        }
+      }else{
+        // window.localStorage.setItem('getTimes',datas)//存储缓存
+        this.getcps()
+      }
+    },
+    getcps(){
+      console.log(123123)
+      let data = new Date()
+      let datas = data.getDate()
+      getAutoCoup().then(res=>{ //调用自动发券
+            if(res.success){
+              this.autoCoupList.push(...res.result);
+              let objs = {};
+              this.autoCoupList = this.autoCoupList.reduce((cur, next) => {
+                //对象去重
+                if (next.id != undefined) {
+                  objs[next.id]
+                    ? ""
+                    : (objs[next.id] = true && cur.push(next));
+                }
+                return cur;
+              }, []);
+              if(this.autoCoupList != '' && this.autoCoupList.length > 0){
+                this.showCpmodel = true;
+              }
+              storage.setItem('getTimes',datas)//存储缓存
+            }
+      })
+    },
+    handleReachBottom(){
+
+    } ,
+    getIndexData () {
+      if(this.pageData){
+        this.parsePageData(JSON.stringify(this.pageData))
+      }
+      else{
+        // 获取首页装修数据
+        indexData({ clientType: 'PC' }).then(async (res) => {
+          if (res.success && res.result) {
+            this.parsePageData(res.result.pageData)
+          }
+        });
+      }
+    },
+
+    async parsePageData(pageData){
+      let dataJson = JSON.parse(pageData);
+      // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
+      // 轮播图根据不同轮播，样式不同
+      for (let i = 0; i < dataJson.list.length; i++) {
+        let type = dataJson.list[i].type
+        if (type === 'carousel2') {
+          this.carouselLarge = true;
+        } else if (type === 'carousel1') {
+          this.carouselLarge = true
+          this.carouselOpacity = true
+        } else if (type === 'seckill') {
+          let seckill = await this.getListByDay()
+          dataJson.list[i].options.list = seckill
+        }
+      }
+      this.modelForm = dataJson;
+      storage.setItem('navList', dataJson.list[1])
+      this.showNav = true
+      this.topAdvert = dataJson.list[0];
+    },
+
    async getListByDay () { // 当天秒杀活动
      const res = await seckillByDay()
      if (res.success && res.result.length) {
@@ -88,12 +199,14 @@ export default {
  components: {
    Search,
    ModelForm,
-    HoverSearch
+    HoverSearch,
+    fixedBar
  }
 };
 </script>

 <style scoped lang="scss">
+ @import '../assets/styles/coupon.scss';
 .container {
  @include sub_background_color($light_background_color);
 }
@@ -119,4 +232,55 @@ export default {
  transform: translateZ(0);
  top: 0;
 }
+.fixed-bar{
+  opacity: 0 !important;
+  transform: translateY(-10px);
+  transition: .35s;
+  z-index: 999999;
+  height: 0px !important;
+  overflow: hidden;
+}
+.show-fixed{
+  height: 354px !important;
+  opacity: 1 !important;
+  transform: translateY(0);
+  -webkit-transform: translateZ(0);
+  -moz-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  -o-transform: translateZ(0);
+  transform: translateZ(0);
+}
+
+
+/* 2K */
+@media screen and (min-width: 2561px) and (max-width: 3840px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:900px;
+    top: 500px;
+  }
+}
+
+/* 1080p */
+@media screen and (max-width: 2560px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:300px;
+    top: 500px;
+  }
+}
+
+
+
+@media screen and (max-width: 2025px) {
+  /* 样式 */
+  .fixed-bar{
+    position: fixed;
+    right:150px;
+    top: 300px;
+  }
+}
+
 </style>
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -235,6 +235,7 @@ export default {
                this.$Message.success("登录成功");
                storage.setItem("accessToken", res.result.accessToken);
                storage.setItem("refreshToken", res.result.refreshToken);
+                storage.setItem('getTimes',0)
                apiLogin.getMemberMsg().then((res) => {
                  if (res.success) {
                    storage.setItem("userInfo", res.result);
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -1,95 +1,104 @@
 <template>
  <div class="merchant">
-      <BaseHeader/>
-      <!-- 搜索栏 -->
-      <Search :store="true" @search="search"></Search>
-      <!-- 店铺logo -->
-      <div class="shop-logo">
-        <div>
-          <p>{{storeMsg.storeName || 'xx店铺'}}</p>
-          <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
-        </div>
-        <div>
-          <span class="hover-pointer" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
-          <span style="width:80px" class="hover-pointer ml_10" @click="IMService()"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
-        </div>
+    <BaseHeader/>
+    <!-- 搜索栏 -->
+    <Search  :storeId="storeMsg.storeId" @search="search"></Search>
+    <!-- 店铺logo -->
+    <div class="shop-logo">
+      <div>
+        <p>{{ storeMsg.storeName || '店铺' }}</p>
+        <p :alt="storeMsg.storeDesc" class="ellipsis" v-html="storeMsg.storeDesc"></p>
      </div>
-      <div class="store-category">
-        <ul class="cate-list">
-          <li
-            class="cate-item"
-            @click="searchByCate({ id: '', labelName: '店铺推荐' })"
-          >
-            首页
-          </li>
-          <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
-            <Dropdown v-if="cate.children.length">
-              <div @click.self="searchByCate(cate)">
-                {{ cate.labelName }}
-                <Icon type="ios-arrow-down"></Icon>
-              </div>
-              <DropdownMenu slot="list">
-                <DropdownItem
-                  @click.native="searchByCate(sec)"
-                  :name="sec.id"
-                  v-for="sec in cate.children"
-                  :key="sec.id"
-                >{{ sec.labelName }}
-                </DropdownItem
-                >
-              </DropdownMenu>
-            </Dropdown>
-            <span v-else @click.self="searchByCate(cate)">{{
-                cate.labelName
-              }}</span>
-          </li>
-        </ul>
+      <div>
+        <span class="hover-pointer" @click="collect"><Icon :color="storeCollected ? '#ed3f14' : '#fff'"
+                                                           type="ios-heart"/>{{
+            storeCollected ? '已收藏店铺' : '收藏店铺'
+          }}</span>
+        <span class="hover-pointer ml_10" style="width:80px" @click="IMService(storeMsg.storeId,null,null)"><Icon
+          custom="icomoon icon-customer-service"/>联系客服</span>
      </div>
+    </div>
+    <div class="store-category">
+      <ul class="cate-list">
+        <li
+          class="cate-item"
+          @click="searchByCate({ id: '', labelName: '店铺推荐' })"
+        >
+          首页
+        </li>
+        <li v-for="(cate, index) in cateList" :key="index" class="cate-item">
+          <Dropdown v-if="cate.children.length">
+            <div @click.self="searchByCate(cate)">
+              {{ cate.labelName }}
+              <Icon type="ios-arrow-down"></Icon>
+            </div>
+            <DropdownMenu slot="list">
+              <DropdownItem
+                v-for="sec in cate.children"
+                :key="sec.id"
+                :name="sec.id"
+                @click.native="searchByCate(sec)"
+              >{{ sec.labelName }}
+              </DropdownItem
+              >
+            </DropdownMenu>
+          </Dropdown>
+          <span v-else @click.self="searchByCate(cate)">{{
+              cate.labelName
+            }}</span>
+        </li>
+      </ul>
+    </div>

+
+    <div v-if="storeMsg.pageShow&&storeMsg.pageShow==='1'">
+      <!-- 楼层装修部分 -->
+      <model-form ref="modelForm" :data="modelForm"></model-form>
+    </div>
+
+
+    <div v-else>
      <div class="promotion-decorate">{{ cateName }}</div>
+      <div class="goods-list">
+        <empty v-if="goodsList.length === 0"/>
+        <div
+          v-for="(item, index) in goodsList"
+          v-else
+          :key="index"
+          class="goods-show-info"
+          @click="goGoodsDetail(item.id, item.goodsId)"
+        >

-<!--      <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.content.id, item.content.goodsId)"-->
-<!--        >-->
-<!--          <div class="goods-show-img">-->
-<!--            <img width="220" height="220" :src="item.content.thumbnail"/>-->
-<!--          </div>-->
-<!--          <div class="goods-show-price">-->
-<!--            <span>-->
-<!--              <span class="seckill-price text-danger">{{-->
-<!--                  item.content.price | unitPrice("￥")-->
-<!--                }}</span>-->
-<!--            </span>-->
-<!--          </div>-->
-<!--          <div class="goods-show-detail">-->
-<!--            <span>{{ item.content.goodsName }}</span>-->
-<!--          </div>-->
-<!--          <div class="goods-show-num">-->
-<!--            已有<span>{{ item.content.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>-->
-<!--      -->
+          <div class="goods-show-img">
+            <img :src="item.small" height="220" width="220" alt=""/>
+          </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
+          :page-size="params.pageSize"
+          :total="total"
+          show-sizer
+          @on-change="changePageNum"
+          @on-page-size-change="changePageSize"
+        ></Page>
+      </div>

-
-    <!-- 楼层装修部分 -->
-    <model-form ref="modelForm" :data="modelForm"></model-form>
+    </div>

    <BaseFooter/>

@@ -97,17 +106,16 @@
 </template>

 <script>
-import { getIMDetail } from "@/api/common";
-import Storage from "../plugins/storage";
-import {getDetailById, getCateById} from "@/api/shopentry";
-import {cancelCollect, collectGoods, isCollection} from "@/api/member";
+
+import {getCateById, getDetailById} from "@/api/shopentry";
+import {cancelStoreCollect, collectStore} from "@/api/member";
 import {goodsList} from "@/api/goods";
 import Search from "@/components/Search";
 import ModelForm from "@/components/indexDecorate/ModelForm";
 import HoverSearch from "@/components/header/hoverSearch";
 import storage from "@/plugins/storage";
 import {getFloorStoreData} from "@/api/index.js";
-import {seckillByDay} from "@/api/promotion";
+import imTalk from '@/components/mixes/talkIm'

 export default {
  name: "Merchant",
@@ -116,6 +124,7 @@ export default {
    ModelForm,
    HoverSearch,
  },
+  mixins: [imTalk],
  data() {
    return {
      // 店铺装修的内容
@@ -131,7 +140,6 @@ export default {
      cateList: [], // 店铺分裂
      goodsList: [], // 商品列表
      total: 0, // 商品数量
-      IMLink:"",
      params: {
        // 请求参数
        pageNumber: 1,
@@ -156,8 +164,8 @@ export default {
            let dataJson = JSON.parse(res.result.pageData);
            // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
            // 轮播图根据不同轮播，样式不同
-            for (let i = 0; i < dataJson.list.length; i++) {
-              let type = dataJson.list[i].type;
+            for (const element of dataJson.list) {
+              let type = element.type;
              if (type === "carousel2") {
                this.carouselLarge = true;
              } else if (type === "carousel1") {
@@ -178,45 +186,23 @@ export default {
        }
      );
    },
-    // 跳转im客服
-    async IMService() {
-      // 获取访问Token
-      let accessToken = Storage.getItem("accessToken");
-      await this.getIMDetailMethods();
-      if (!accessToken) {
-        this.$Message.error("请登录后再联系客服");
-        return;
-      }
-      window.open(
-        this.IMLink +
-        "?token=" +
-        accessToken +
-        "&id=" +
-        this.storeMsg.storeId
-      );
-    },
-    // 获取im信息
-    async getIMDetailMethods() {
-      let res = await getIMDetail();
-      if (res.success) {
-        this.IMLink = res.result;
-      }
-    },
-    getStoreMsg () { // 店铺信息
-      getDetailById(this.$route.query.id).then(res => {
-        if (res.success) {
-          this.storeMsg = res.result
-          document.title = this.storeMsg.storeName
-          if (this.Cookies.getItem('userInfo')) {
-            isCollection('STORE', this.storeMsg.storeId).then(res => {
-              if (res.success && res.result) {
-                this.storeCollected = true;
-              }
-            })
-          }
-        }
-      })
-    },
+
+
+    // getStoreMsg () { // 店铺信息
+    //   getDetailById(this.$route.query.id).then(res => {
+    //     if (res.success) {
+    //       this.storeMsg = res.result
+    //       document.title = this.storeMsg.storeName
+    //       if (this.Cookies.getItem('userInfo')) {
+    //         isCollection('STORE', this.storeMsg.storeId).then(res => {
+    //           if (res.success && res.result) {
+    //             this.storeCollected = true;
+    //           }
+    //         })
+    //       }
+    //     }
+    //   })
+    // },
    // async getListByDay() {
    //   // 当天秒杀活动
    //   const res = await seckillByDay();
@@ -227,33 +213,41 @@ export default {
    //   }
    // },

-    // getStoreMsg() {
-    //   // 店铺信息
-    //   getDetailById(this.$route.query.id).then((res) => {
-    //     if (res.success) {
-    //
-    //       this.storeMsg = res.result;
-    //
-    //
-    //       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;
-    //         }
-    //       };
-    //     }
-    //   });
-    // },
+    getStoreMsg() {
+      // 店铺信息
+      getDetailById(this.$route.query.id).then((res) => {
+        if (res.success) {
+
+          this.storeMsg = res.result;
+          console.log(this.storeMsg)
+
+          //判定如果开启楼层展示，则获取页面信息 否则读取商品信息
+          if (this.storeMsg.pageShow && this.storeMsg.pageShow === '1') {
+
+            this.getIndexData();
+          } else {
+            this.getGoodsList();
+            this.getCateList();
+          }
+          let that = this;
+          window.onscroll = function () {
+            let top =
+              document.documentElement.scrollTop || document.body.scrollTop;
+            if (top > 300) {
+              that.topSearchShow = true;
+            } else {
+              that.topSearchShow = false;
+            }
+          };
+        }
+      });
+    },
    getCateList() {
      // 店铺分类
      getCateById(this.$route.query.id).then((res) => {
        if (res.success) {
          this.cateList = res.result;
+          console.log(this.cateList,'cateList')
        }
      });
    },
@@ -262,8 +256,8 @@ export default {
      goodsList(this.params)
        .then((res) => {
          if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
+            this.goodsList = res.result.records;
+            this.total = res.result.total;
          }
        })
        .catch(() => {
@@ -303,13 +297,13 @@ export default {
    async collect() {
      // 收藏店铺
      if (this.storeCollected) {
-        let cancel = await cancelCollect("STORE", this.storeMsg.storeId);
+        let cancel = await cancelStoreCollect("STORE", this.storeMsg.storeId);
        if (cancel.success) {
          this.$Message.success("已取消收藏");
          this.storeCollected = false;
        }
      } else {
-        let collect = await collectGoods("STORE", this.storeMsg.storeId);
+        let collect = await collectStore("STORE", this.storeMsg.storeId);
        if (collect.code === 200) {
          this.storeCollected = true;
          this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
@@ -320,7 +314,7 @@ export default {
 };
 </script>

-<style scoped lang="scss">
+<style lang="scss" scoped>
@import "../assets/styles/goodsList.scss";

 .merchant {
--- a/buyer/src/pages/ShoppingCart.vue
+++ b/buyer/src/pages/ShoppingCart.vue
@@ -2,7 +2,7 @@
  <div>
    <BaseHeader></BaseHeader>
    <Search></Search>
-    <cateNav></cateNav>
+
    <!-- 添加成功提示 -->
    <div class="add-info-box-container">
      <div class="add-info-box">
--- a/buyer/src/pages/Topic.vue
+++ b/buyer/src/pages/Topic.vue
@@ -0,0 +1,37 @@
+<template>
+  <div v-if="pageData">
+    <Index :page-data="pageData" />
+  </div>
+</template>
+
+<script>
+import Index from './Index.vue'
+import { getTopicData } from '@/api/index'
+export default {
+  data() {
+    return {
+      pageData: ""
+    }
+  },
+  components: { Index },
+  mounted() {
+    // 接收id进行查询
+    const id = this.$route.query.id
+    this.init(id)
+  },
+  methods: {
+    async init(id) {
+      const res = await getTopicData(id)
+      if (res.success) {
+        console.log(res.result)
+        // 直接复用首页就行
+        if (res.result.pageData) {
+          this.pageData = JSON.parse(res.result.pageData)
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
--- a/buyer/src/pages/article/index.vue
+++ b/buyer/src/pages/article/index.vue
@@ -2,7 +2,7 @@
  <div>
    <BaseHeader></BaseHeader>
    <Search></Search>
-    <cateNav></cateNav>
+
    <div class="title-bg"><p>文章帮助中心</p></div>
    <div class="container width_1200">
      <Layout class="layoutAll">
@@ -182,7 +182,6 @@ export default {
  text-align: center;
 }
 .title-bg{
-  border-top: 3px solid $theme_color;
  height: 100px;
  width: 100%;
  background-color: #7b7b7b;
--- a/buyer/src/pages/home/enumeration.js
+++ b/buyer/src/pages/home/enumeration.js
@@ -17,6 +17,10 @@ export const orderStatusList = [
    name: '待发货',
    status: 'UNDELIVERED'
  },
+  {
+    name: '部分发货',
+    status: 'PARTS_DELIVERED'
+  },
  {
    name: '已发货',
    status: 'DELIVERED'
@@ -30,8 +34,12 @@ export const orderStatusList = [
    status: 'TAKE'
  },
  {
-    name: '已取消',
+    name: '已关闭',
    status: 'CANCELLED'
+  },
+  {
+    name: '待提货',
+    status: 'STAY_PICKED_UP'
  }
 ]
 // 订单售后状态
--- a/buyer/src/pages/home/memberCenter/AccountSafe.vue
+++ b/buyer/src/pages/home/memberCenter/AccountSafe.vue
@@ -20,7 +20,7 @@
 </template>

 <script>
-import { getPwdStatus } from '@/api/account';
+// import { getPwdStatus } from '@/api/account';
 export default {
  name: 'AccountSafe',
  data () {
@@ -40,21 +40,21 @@ export default {
      this.$router.push({name: 'ModifyPwd', query: { status: 1 }})
    },
    // 获取密码状态
-    getPwdStatus () {
-      getPwdStatus().then(res => {
-        if (res) {
-          this.pwdStatus = '修改密码'
-        } else {
-          this.pwdStatus = '设置密码'
-        }
-      });
-    }
+    // 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 {
+  ::v-deep .ivu-col-span-2, .ivu-col-span-4 {
    text-align: center;
    color: $theme_color;
  }
@@ -71,7 +71,7 @@ export default {
    border-bottom: 1px solid $border_color;
    padding: 16px 0;

-    /deep/ .ivu-col {
+    ::v-deep .ivu-col {
      padding: 8px 0;

    }
--- a/buyer/src/pages/home/memberCenter/CommentList.vue
+++ b/buyer/src/pages/home/memberCenter/CommentList.vue
@@ -36,7 +36,7 @@
            <i-col span="4">
              <Tooltip transfer>
                  <div class="content">{{item.content}}</div>
-                  <div style="white-space: normal;" slot="content">
+                  <div style="white-space: normal;word-break:break-all" slot="content">
                    {{item.content}}
                  </div>
              </Tooltip>
@@ -160,7 +160,11 @@ export default {
  color: #999;
  max-height: 60px;
  overflow: hidden;
-  word-wrap: break-word;
+  // word-wrap: break-word;
+  display:-webkit-box;
+  -webkit-box-orient:vertical;/*设置方向*/
+  -webkit-line-clamp:3;/*设置超过为省略号的行数*/
+  word-break:break-all; 
 }

 .eval-detail {
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -24,7 +24,7 @@

        <FormItem>
          <Button type="primary" :loading="applyLoading" @click="apply"
-            >提交申请</Button
+          >提交申请</Button
          >
        </FormItem>
      </Form>
@@ -34,7 +34,7 @@
      <Alert type="success">
        您提交的信息正在审核
        <template slot="desc"
-          >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
        >
      </Alert>
    </div>
@@ -42,11 +42,11 @@
    <div v-if="status === 2">
      <div class="tips">

-          <p>分销下线付款之后会生成分销订单。</p>
-          <p>
-            冻结金额：用户提现金额即为冻结金额，审核通过后扣除冻结金额，审核拒绝之后冻结金额返回可提现金额。
-          </p>
-          <p>可提现金额：分销订单佣金T+1解冻后可变为可提现金额。</p>
+        <p>分销下线付款之后会生成分销订单。</p>
+        <p>
+          冻结金额：用户提现金额即为冻结金额，审核通过后扣除冻结金额，审核拒绝之后冻结金额返回可提现金额。
+        </p>
+        <p>可提现金额：分销订单佣金T+1解冻后可变为可提现金额。</p>

      </div>

@@ -54,7 +54,7 @@
        <div class="mb_20 account-price">
          <span class="subTips">可提现金额：</span>
          <span class="fontsize_48 global_color"
-            >￥{{ result.canRebate | unitPrice }}</span
+          >￥{{ result.canRebate | unitPrice }}</span
          >
          <span class="subTips">冻结金额：</span>
          <span class="">￥{{ result.commissionFrozen | unitPrice }}</span>
@@ -65,7 +65,7 @@
            size="small"
            class="ml_20"
            @click="withdrawApplyModal = true"
-            >申请提现</Button
+          >申请提现</Button
          >
        </div>
      </div>
@@ -102,13 +102,13 @@
                size="small"
                style="margin-right: 5px"
                @click="fenxiao(row)"
-                >分销商品</Button
+              >分销商品</Button
              >
              <Button
                type="error"
                size="small"
                @click="selectGoods(row.id, false)"
-                >取消选择</Button
+              >取消选择</Button
              >
            </template>
          </Table>
@@ -156,7 +156,7 @@
                size="small"
                style="margin-right: 5px"
                @click="selectGoods(row.id, true)"
-                >选择商品</Button
+              >选择商品</Button
              >
            </template>
          </Table>
@@ -197,8 +197,8 @@
                  row.distributionCashStatus == "APPLY"
                    ? "待处理"
                    : row.distributionCashStatus == "VIA_AUDITING"
-                    ? "通过"
-                    : "拒绝"
+                      ? "通过"
+                      : "拒绝"
                }}</span
              >
            </template>
@@ -222,11 +222,27 @@
      <Alert type="error">
        分销功能暂未开启
        <template slot="desc"
-          >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
        >
      </Alert>
    </div>
+    <!-- 分销资格被清退 -->
+    <div v-if="status === 4">
+      <Alert type="error">
+        您的分销资格已被清退。请联系管理员或进行申诉

+        <Button style="margin-left: 50px;" type="warning" @click="repaying">申诉</Button>
+      </Alert>
+    </div>
+    <!-- 分销申诉审核 -->
+    <div v-if="status === 5">
+      <Alert type="success">
+        您提交的申诉正在审核
+        <template slot="desc"
+        >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >
+      </Alert>
+    </div>
    <Modal v-model="withdrawApplyModal" width="530">
      <p slot="header">
        <Icon type="edit"></Icon>
@@ -234,7 +250,7 @@
      </p>
      <div>
        <Input v-model="withdrawPrice" size="large" number maxlength="9"
-          ><span slot="append">元</span></Input
+        ><span slot="append">元</span></Input
        >
      </div>
      <div slot="footer" style="text-align: center">
@@ -243,21 +259,39 @@
    </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"
+      <div class="qrcode">
+        <div style="width: 150px; height: 150px; border: 1px solid #eee">
+          <vue-qr
+            :text="qrcode"
+            :callback="qrcodeData"
+            :margin="0"
+            colorDark="#000"
+            colorLight="#fff"
+            :size="150"
+          ></vue-qr>
+          <div class="qrcode-platform">PC端</div>
+          <Button class="download-btn" type="success" @click="downloadQrcode"
          >下载二维码</Button
-        >
+          >
+        </div>
+        <div style="width: 150px; height: 150px; border: 1px solid #eee">
+          <vue-qr
+            :text="qrcodeH5"
+            :callback="qrcodeDataH5"
+            :margin="0"
+            colorDark="#000"
+            colorLight="#fff"
+            :size="150"
+          ></vue-qr>
+          <div class="qrcode-platform">移动应用端</div>
+          <Button class="download-btn" type="success" @click="downloadQrcodeH5"
+          >下载二维码</Button
+          >
+        </div>
      </div>
-      <div class="mt_10">
-        商品链接：<Input style="width: 400px" v-model="qrcode"></Input>
+
+      <div class="mt_10" style="margin-top: 100px;">
+        商品链接：<Input style="width: 600px" v-model="qrcode"></Input>
      </div>
    </Modal>
  </div>
@@ -280,6 +314,7 @@ export default {
  components: { vueQr },
  data() {
    return {
+      config:require('@/config'),
      status: 0, // 申请状态，0为未申请 1 申请中 2 申请完成 3 功能暂未开启
      applyForm: {}, // 申请表单
      rules: {
@@ -313,14 +348,6 @@ export default {
            // 可以单个或者同时写两个触发验证方式
            trigger: "blur",
          },
-          {
-            validator: (rule, value, callback) => {
-              // 上面有说，返回true表示校验通过，返回false表示不通过
-              // this.$u.test.mobile()就是返回true或者false的
-              return checkBankno(value);
-            },
-            message: "银行账号不正确",
-          },
        ],
      },
      tabName: "goodsChecked", // 当前所在tab
@@ -364,8 +391,10 @@ export default {
        order: "desc",
      },
      qrcode: "", // 二维码
+      qrcodeH5:"",//H5二维码
      qrcodeShow: false, // 显示二维码
      base64Img: "", // base64编码
+      base64ImgH5: "", // base64H5编码
      goodsNameCurr: "", // 当前分销商品名称
    };
  },
@@ -378,7 +407,7 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          this.applyLoading = true;
-          applyDistribution(this.form).then((res) => {
+          applyDistribution(this.applyForm).then((res) => {
            this.applyLoading = false;
            if (res.success) {
              this.$Message.success("申请已提交，请等待管理员审核");
@@ -406,6 +435,10 @@ export default {
      // 二维码base64地址
      this.base64Img = data64;
    },
+    qrcodeDataH5(data64) {
+      // 二维码H5端base64地址
+      this.base64ImgH5 = data64;
+    },
    downloadQrcode() {
      // 下载二维码
      let a = document.createElement("a"); // 生成一个a元素
@@ -414,6 +447,14 @@ export default {
      a.href = this.base64Img; // 将生成的URL设置为a.href属性
      a.dispatchEvent(event); // 触发a的单击事件
    },
+    downloadQrcodeH5(){
+      // 下载H5二维码
+      let a = document.createElement("a"); // 生成一个a元素
+      let event = new MouseEvent("click"); // 创建一个单击事件
+      a.download = this.goodsNameCurr || "photo";
+      a.href = this.base64ImgH5; // 将生成的URL设置为a.href属性
+      a.dispatchEvent(event); // 触发a的单击事件
+    },
    tabPaneChange(tab) {
      // tab栏切换
      if (tab === "goodsChecked") {
@@ -453,7 +494,8 @@ export default {
    },
    fenxiao(row) {
      // 分销商品
-      this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
+      this.qrcode = `${this.config.PC_DOMAIN}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
+      this.qrcodeH5 = `${this.config.WAP_DOMAIN}/pages/product/goods?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
      this.goodsNameCurr = row.goodsName;
      this.qrcodeShow = true;
    },
@@ -469,19 +511,32 @@ export default {
        if (res.success) this.logData = res.result;
      });
    },
+    //申诉
+    repaying(){
+      applyDistribution().then((res) => {
+        this.applyLoading = false;
+        if (res.success) {
+          this.$Message.success("申诉已提交，请等待管理员审核");
+          // this.status = 1;
+        }
+      });
+    },
    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") {
+          } else if ( type === "REFUSE") {
            this.status = 0;
-          } else {
+          } else if (type === "RETREAT") {
+            this.status = 4;
+          }else if (type === "APPEAL") {
+            this.status = 5;
+          }else {
            this.status = 1;
          }
        } else if (!res.data.success && res.data.code === 22000) {
@@ -523,11 +578,13 @@ export default {
  }
 }
 .download-btn {
-  position: relative;
-  top: -200px;
-  left: 200px;
+  // position: relative;
+  // top: -200px;
+  // left: 200px;
+  margin-left: 25px;
+  margin-top: 5px
 }
-/depp/ .ivu-alert-message {
+::v-deep .ivu-alert-message {
  p {
    margin: 4px 0;
  }
@@ -540,4 +597,15 @@ export default {
    margin: 6px 0;
  }
 }
+.qrcode{
+  display: flex;
+  justify-content: space-evenly;
+  padding-top: 10px
+
+}
+.qrcode-platform{
+  text-align: center;
+  font-size: 14px;
+  margin: 5px;
+}
 </style>
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -1,9 +1,10 @@
 <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>
+    <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 v-for="(item, index) in list" :key="index">
        <div class="goodsItem" :key="item.skuId">
          <div class="goodsImg hover-pointer" v-if="params.type === 'GOODS'">
            <img :src="item.image" />
@@ -11,24 +12,26 @@
          <div class="goodsImg hover-pointer" v-else>
            <img :src="item.storeLogo" />
          </div>
-          <div class="goodsTitle hover-color" v-if="params.type === 'GOODS'" @click="buynow(item.skuId, item.goodsId)">
-            {{item.goodsName}}
+          <div class="goodsTitle hover-color" v-if="params.type === 'GOODS'" @click="buynow(item.skuId, item.goodsId,item.id)">
+            {{ item.goodsName }}
          </div>
-          <div v-else class="goodsTitle hover-pointer">
-            {{item.storeName}}
+          <div v-else class="goodsTitle  hover-pointer" @click="buynow(item.skuId, item.goodsId,item.id)" >
+            {{ item.storeName }}
+            <Tag color="error" class="operated" v-if="item.selfOperated">商家自营</Tag>
          </div>
          <div class="goodsPrice">
-            <span v-if="params.type === 'GOODS'">{{item.price | unitPrice('￥')}}</span>
-            <Tag color="error" v-if="item.selfOperated">商家自营</Tag>
+            <span v-if="params.type === 'GOODS'">{{ item.price | unitPrice('￥') }}</span>
+
          </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="buynow(item.skuId, item.goodsId)"
+              v-if="params.type === 'GOODS'">立即购买</Button>
            <Button size="small" type="primary" @click="goShop(item.id)" v-else>店铺购买</Button>
            <Button size="small" v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
-            <Button size="small" v-if="params.type === 'SHOP'" @click="cancel(item.id)">取消收藏</Button>
+            <Button size="small" v-if="params.type === 'STORE'" @click="cancelStore(item.id)">取消收藏</Button>
          </div>
        </div>
-      </template>
+      </div>
      <Spin size="large" fix v-if="spinShow"></Spin>
    </div>
    <empty v-else />
@@ -36,7 +39,7 @@
 </template>

 <script>
-import { collectList, cancelCollect } from '@/api/member.js'
+import { collectList, cancelCollect, storeCollectList, cancelStoreCollect } from '@/api/member.js'
 export default {
  name: 'Favorites',
  props: {
@@ -45,7 +48,7 @@ export default {
      default: false
    }
  },
-  data () {
+  data() {
    return {
      favoriteWay: ['收藏商品', '收藏店铺'], // 收藏分类
      list: [], // 收藏列表
@@ -53,25 +56,32 @@ export default {
      params: { // 请求参数
        pageNumber: 1,
        pageSize: 100,
-        type: 'GOODS'
+        type: this.$route.query.type || 'GOODS'
      },
      spinShow: false // 加载状态
    };
  },
+
  methods: {
-    getList () { // 获取收藏列表
+    getList() { // 获取收藏列表
      this.spinShow = true
      collectList(this.params).then(res => {
        this.spinShow = false
        if (res.success) this.list = res.result.records;
      })
    },
-    change (index) { // tab栏切换
-      if (index === 0) { this.params.type = 'GOODS' }
-      if (index === 1) { this.params.type = 'SHOP' }
-      this.getList()
+    getStoreList() { // 获取收藏列表
+      this.spinShow = true
+      storeCollectList(this.params).then(res => {
+        this.spinShow = false
+        if (res.success) this.list = res.result.records;
+      })
    },
-    cancel (id) { // 取消收藏
+    change(index) { // tab栏切换
+      if (index === 0) { this.params.type = 'GOODS', this.getList() }
+      if (index === 1) { this.params.type = 'STORE', this.getStoreList() }
+    },
+    cancel(id) { // 取消收藏
      let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
      this.$Modal.confirm({
        title: 'Title',
@@ -85,24 +95,50 @@ export default {
        }
      });
    },
-    buynow (skuId, goodsId) { // 跳转详情
-      let url = this.$router.resolve({
-        path: '/goodsDetail',
-        query: {skuId, goodsId}
-      })
-      window.open(url.href, '_blank')
+    cancelStore(id) { // 取消收藏
+      let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
+      this.$Modal.confirm({
+        title: 'Title',
+        content: `<p>确定取消收藏该${typeName}吗？</p>`,
+        onOk: () => {
+          cancelStoreCollect(this.params.type, id).then(res => {
+            if (res.success) {
+              this.getStoreList();
+            }
+          })
+        }
+      });
    },
-    goShop (id) { // 跳转店铺页面
+    buynow(skuId, goodsId,storeId) { // 跳转详情
+      console.log(this.params.type)
+      let url
+      if (this.params.type === 'STORE') {
+        url = this.$router.resolve({
+          path: '/Merchant',
+          query: { 'id': storeId }
+        })
+      } else {
+        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}
+        query: { id }
      })
      window.open(url.href, '_blank')
    }
  },
-  mounted () {
+  mounted() {
    if (this.homePage) this.params.pageSize = 5;
    this.getList()
+
  }
 };
 </script>
@@ -115,46 +151,55 @@ export default {
 .goodsTitle {
  margin: 0 6px;
 }
+
+.operated {
+  margin-left: 10px;
+}
+
 .wrapper {
  margin-bottom: 40px;
 }
+
 .goodsItem {
  display: flex;
  height: 60px;
  line-height: 60px;
  margin-bottom: 10px;

-  > .goodsImg {
+  >.goodsImg {
    width: 60px;
    height: 60px;
    overflow: hidden;

-    > img {
+    >img {
      width: 100%;
      height: 100%;
    }
  }

-  > .goodsPrice,
+  >.goodsPrice,
  .goodsShop {
    width: 150px;
    text-align: center;
  }

-  > .goodsTitle {
+  >.goodsTitle {
    width: 400px;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
  }
 }
+
 .goodsBuy {
  margin-left: 80px;
-  >*{
+
+  >* {
    margin: 0 4px;
  }
 }
-.page-size{
+
+.page-size {
  text-align: right;
 }
 </style>
--- a/buyer/src/pages/home/memberCenter/Profile.vue
+++ b/buyer/src/pages/home/memberCenter/Profile.vue
@@ -37,9 +37,9 @@
 </template>

 <script>
-import storage from '@/plugins/storage.js';
 import { editMemberInfo } from '@/api/account.js';
 import { commonUrl } from '@/plugins/request.js';
+import storage from '@/plugins/storage.js';
 export default {
  name: 'Profile',
  data () {
@@ -70,6 +70,7 @@ export default {
            if (res.success) {
              this.$Message.success('修改个人资料成功')
              storage.setItem('userInfo', res.result)
+              this.$router.go(0)
            }
          })
        }
--- a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
+++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
@@ -60,24 +60,27 @@
              v-model="orderGoods.content"
            />
          </div>
-          <div>
-            <span class="color999">商家回复：</span>
-            <span>{{ orderGoods.reply }}</span>
-          </div>
          <div style="display: flex; align-items: center">
            <template v-if="orderGoods.images">
-              <div
-                class="demo-upload-list"
-                v-for="(img, index) in orderGoods.images.split(',')"
-                :key="index"
-              >
+              <div class="demo-upload-list" v-for="(img, index) in orderGoods.images.split(',')" :key="index">
                <img :src="img" />
-                <div class="demo-upload-list-cover">
-                  <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
-                </div>
+                <div class="demo-upload-list-cover"><Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon></div>
              </div>
            </template>
          </div>
+          <div style="margin-top: 20px;" v-if="orderGoods.reply || orderGoods.replyImage">
+            <span class="color999">商家回复：</span>
+            <span>{{ orderGoods.reply }}</span>
+            <div style="display: flex; align-items: center">
+              <template v-if="orderGoods.replyImage">
+                <div class="demo-upload-list" v-for="(img, index) in orderGoods.replyImage.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>
+
        </div>
      </li>
    </ul>
--- a/buyer/src/pages/home/orderCenter/AddAddress.vue
+++ b/buyer/src/pages/home/orderCenter/AddAddress.vue
@@ -7,8 +7,9 @@
          <i-input v-model="formData.name" placeholder="请输入收件人姓名" style="width: 600px"></i-input>
        </FormItem>
        <FormItem label="收件地区" prop="address">
-          <i-input v-model="formData.address" disabled placeholder="请选择收货地址" style="width: 600px"></i-input>
-          <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
+          <span>{{ formData.address || '暂无地址' }}</span>
+
+          <Button type="default" style="margin-left: 10px;" size="small" @click="$refs.map.open()">选择</Button>
        </FormItem>
        <FormItem label="详细地址" prop="detail">
          <i-input v-model="formData.detail" placeholder="请输入详细地址" style="width: 600px"></i-input>
@@ -29,14 +30,15 @@
      <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>
+
+    <multipleMap  ref="map" @callback="getAddress" />
  </div>
 </template>

 <script>
 import card from "@/components/card";
-import liliMap from "@/components/map";

+import multipleMap from "@/components/map/multiple-map";
 import * as RegExp from "@/plugins/RegExp.js";
 import {
  newMemberAddress,
@@ -117,15 +119,25 @@ export default {
        }
      });
    },
-    getAddress(item) {
+    getAddress(val) {
      // 获取地图选择信息
-      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;
+      if(val.type === 'select'){
+        const paths = val.data.map(item => item.name).join(',')
+        const ids = val.data.map(item => item.id).join(',')
+        this.$set(this.formData,'address',paths)
+        this.$set(this.formData,'consigneeAddressIdPath',ids)
+        const coord = val.data[val.data.length - 1].center.split(',')
+        this.formData.lat = coord[1]
+        this.formData.lon = coord[0]
+      }else{
+        this.$set(this.formData, "address", val.data.addr);
+        this.$set(this.formData, "consigneeAddressIdPath", val.data.addrId);
+        this.$set(this.formData, "detail", val.data.address);
+        this.formData.lat = val.data.position.lat;
+        this.formData.lon = val.data.position.lng;
+      }
+
+
    },
  },
  mounted() {
@@ -134,7 +146,7 @@ export default {
  },
  components: {
    card,
-    liliMap,
+    multipleMap
  },
 };
 </script>
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -9,7 +9,7 @@
          class="width_300"
          search
          enter-button
-          v-model="params.sn"
+          v-model="params.keywords"
          @on-search="getList"
          placeholder="请输入订单号搜索"
        />
@@ -95,8 +95,8 @@
              <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
            </Select>
          </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
          </FormItem>
          <FormItem label="发货时间" prop="mDeliverTime">
            <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime"
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -85,8 +85,8 @@
              <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
            </Select>
          </FormItem>
-          <FormItem label="快递单号" prop="logisticsNo">
-            <Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input>
+          <FormItem label="物流单号" prop="logisticsNo">
+            <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
          </FormItem>
          <FormItem label="发货时间" prop="mDeliverTime">
            <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -4,7 +4,7 @@
    <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="mb_24 box" v-if="!homePage">
      <div class="global_float_right" >
        <Input
          class="width_300"
@@ -51,12 +51,11 @@
              <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 }}
+                  <span class="global_color">{{ goods.goodsPrice | unitPrice("￥") }} </span>x {{ goods.num }}
+                  <span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}}</span>
                </div>
-                <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:100px;margin-right:10px">评价</Button>
-                <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:100px">投诉</Button>
+                <Button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</Button>
+                <Button v-if="goods.complainStatus == 'NO_APPLY'" @click="complain(order.sn, goodsIndex)" type="warning" class="fontsize_12" size="small" style="position:relative;top:-22px;left:190px">投诉</Button>
              </div>
            </div>
          </div>
@@ -70,7 +69,8 @@
            <Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay">去支付</Button>
            <Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog">确认收货</Button>
            <!-- 售后 -->
-            <Button v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
+            <Button v-if="order.groupAfterSaleStatus && (order.groupAfterSaleStatus.includes('NOT_APPLIED')|| order.groupAfterSaleStatus.includes('PART_AFTER_SALE'))"
+                    @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
          </div>
        </div>
      </div>
@@ -154,6 +154,21 @@ export default {
    this.getList();
  },
  methods: {
+    // 退款状态枚举
+    refundPriceList(status) {
+      switch (status) {
+        case 'ALL_REFUND':
+          return "全部退款";
+        case 'PART_REFUND':
+          return "部分退款";
+        case 'NO_REFUND':
+          return "";
+        case 'REFUNDING':
+          return "退款中";
+        default:
+          return "";
+      }
+    },
    goodsDetail (skuId, goodsId) {
      // 跳转商品详情
      let routeUrl = this.$router.resolve({
@@ -206,7 +221,7 @@ export default {
    applyAfterSale (goodsItem) { // 申请售后
      let arr = []
      goodsItem.forEach(e => {
-        if (e.afterSaleStatus === 'NOT_APPLIED') {
+        if (e.afterSaleStatus === 'NOT_APPLIED'|| e.afterSaleStatus === 'PART_AFTER_SALE') {
          arr.push(e)
        }
      });
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -30,6 +30,7 @@
        size="small"
        >取消订单</Button
      >
+      <Button v-if="order.allowOperationVO.showLogistics || orderPackage.length > 0 || logistics" type="info" @click="logisticsList()" size="small">查看物流</Button>
    </Card>
    <p class="verificationCode" v-if="order.order.verificationCode">
      核验码：<span>{{ order.order.verificationCode }}</span>
@@ -53,7 +54,7 @@
        ></Step>
      </Steps>
    </div>
-    <div class="order-card">
+    <div class="order-card" v-if="order.order.deliveryMethod === 'LOGISTICS' && order.order.orderType !== 'VIRTUAL'">
      <h3>收货人信息</h3>
      <p>收货人：{{ order.order.consigneeName }}</p>
      <p>手机号码：{{ order.order.consigneeMobile | secrecyMobile }}</p>
@@ -62,15 +63,20 @@
        {{ order.order.consigneeDetail }}
      </p>
    </div>
+    <div class="order-card" v-if="order.order.deliveryMethod === 'SELF_PICK_UP'">
+      <h3>自提点信息</h3>
+      <p>自提点名称：{{ order.order.storeAddressPath }}</p>
+      <p>联系方式：{{ order.order.storeAddressMobile }}</p>
+    </div>
    <div class="order-card">
      <h3>付款信息</h3>
      <p>支付方式：{{ order.paymentMethodValue }}</p>
      <p>付款状态：{{ order.payStatusValue }}</p>
    </div>
-    <div class="order-card" v-if="!order.order.verificationCode">
+    <div class="order-card" v-if="!order.order.verificationCode && order.order.orderType !== 'VIRTUAL'">
      <h3>配送信息</h3>
      <p>配送方式：{{ order.deliveryMethodValue }}</p>
-      <p>配送状态：{{ order.deliverStatusValue }}</p>
+      <p v-if="order.order.deliveryMethod === 'LOGISTICS'">配送状态：{{ order.deliverStatusValue }}</p>
      <p v-if="logistics">
        物流信息：{{ logistics.shipper || "暂无物流信息" }}
      </p>
@@ -89,7 +95,7 @@
    </div>
    <div class="order-card" v-if="order.order.payStatus === 'PAID'">
      <h3>发票信息</h3>
-      <template v-if="order.order.needReceipt">
+      <template v-if="order.order.needReceipt && order.receipt">
        <p>发票抬头：{{ order.receipt.receiptTitle }}</p>
        <p>发票内容：{{ order.receipt.receiptContent }}</p>
        <p v-if="order.receipt.taxpayerId">
@@ -101,17 +107,17 @@
    <!-- 订单商品 -->
    <div class="goods">
      <div class="shop-name">
-        <span @click="shopPage(order.order.storeId)">{{
-          order.order.storeName
-        }}</span>
+        <span @click="shopPage(order.order.storeId)">{{order.order.storeName}}</span>
      </div>
      <table>
        <thead>
          <tr>
-            <th width="40%">商品</th>
-            <th width="20%">货号</th>
+            <th width="30%">商品</th>
+            <th width="15%">货号</th>
            <th width="10%">单价</th>
-            <th width="10%">数量</th>
+            <th width="5%">数量</th>
+            <th width="10%">退款状态</th>
+            <th width="10%">实际退款金额</th>
            <th width="10%">小计</th>
            <th width="10%">操作</th>
          </tr>
@@ -136,6 +142,8 @@
            <td>{{ goods.id }}</td>
            <td>{{ goods.goodsPrice | unitPrice("￥") }}</td>
            <td>{{ goods.num }}</td>
+            <td>{{refundPriceList(goods.isRefund)}}</td>
+            <td>{{ goods.refundPrice | unitPrice("￥") }}</td>
            <td>{{ (goods.goodsPrice * goods.num) | unitPrice("￥") }}</td>
            <td>
              <Button
@@ -179,7 +187,7 @@
          ><span>{{ order.order.goodsPrice | unitPrice("￥") }}</span
          ><br />
        </div>
-        <div>
+        <div v-if="order.order.orderType !== 'VIRTUAL'">
          <span>运费：</span
          ><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span
          ><br />
@@ -196,6 +204,10 @@
          <span>活动优惠：</span
          ><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span>
        </div>
+        <div v-if="order.order.priceDetailDTO.updatePrice">
+          <span>修改价格：</span
+          ><span>{{ order.order.priceDetailDTO.updatePrice | unitPrice("￥") }}</span>
+        </div>
        <div>
          <span>应付金额：</span>
          <span class="actrual-price">{{
@@ -221,6 +233,70 @@
        </Radio>
      </RadioGroup>
    </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">{{ order.order.sn }}</div></dd>
+        </dl>
+      </div>
+      <div v-if="orderPackage.length > 0" v-for="(packageItem, packageIndex) in orderPackage" :key="packageIndex">
+        <div class="layui-layer-wrap">
+          <dl><dt>物流公司：</dt>
+            <dd><div class="text-box">{{ packageItem.logisticsName }}</div></dd>
+          </dl>
+          <dl><dt>快递单号：</dt>
+            <dd><div nctype="ordersSn" class="text-box">{{ packageItem.logisticsNo }}</div></dd>
+          </dl>
+          <div class="div-express-log">
+            <ul class="express-log express-log-name">
+              <li v-for="(item, index) in packageItem.orderPackageItemList" :key="index">
+                <span class="time" style="width: 50%;"><span>商品名称：</span><span>{{ item.goodsName }}</span></span>
+                <span class="time" style="width: 30%;"><span>发货时间：</span><span>{{ item.logisticsTime }}</span></span>
+                <span class="time" style="width: 20%;"><span>发货数量：</span><span>{{ item.deliverNumber }}</span></span>
+              </li>
+            </ul>
+            <div class="div-express-log" style="overflow: hidden;">
+              <ul class="express-log" v-if="packageItem.traces && packageItem.traces.traces">
+                <li v-for="(item, index) in packageItem.traces.traces" :key="index">
+                  <span class="time">{{ item.AcceptTime || item.acceptTime }}</span>
+                  <span class="detail">{{ item.AcceptStation || item.remark }}</span>
+                </li>
+              </ul>
+              <ul class="express-log" v-else><li>暂无物流信息</li></ul>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-if = "orderPackage.length == 0 && logistics">
+        <div class="layui-layer-wrap">
+          <dl>
+            <dt>物流公司：</dt>
+            <dd><div class="text-box">{{ logistics.shipper }}</div></dd>
+          </dl>
+          <dl>
+            <dt>快递单号：</dt>
+            <dd><div nctype="ordersSn" class="text-box">{{ logistics.logisticCode }}</div></dd>
+          </dl>
+          <div class="div-express-log">
+            <ul class="express-log" v-if="logistics && logistics.traces">
+              <li v-for="(item, index) in logistics.traces" :key="index">
+                <span class="time">{{ item.AcceptTime }}</span>
+                <span class="detail">{{ item.AcceptStation }}</span>
+              </li>
+            </ul>
+            <ul class="express-log" v-else><li>暂无物流信息</li></ul>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button @click="logisticsModal = false">取消</Button>
+      </div>
+    </Modal>
+
  </div>
 </template>
 <script>
@@ -229,6 +305,7 @@ import {
  getTraces,
  sureReceived,
  cancelOrder,
+  getPackage
 } from "@/api/order.js";
 import { afterSaleReason } from "@/api/member";
 export default {
@@ -245,9 +322,27 @@ export default {
      },
      cancelAvail: false, // 取消订单modal控制
      cancelReason: [], // 取消订单原因
+      orderPackage: [],
+      packageTraceList: [],
+      logisticsModal: false,
    };
  },
  methods: {
+    // 退款状态枚举
+    refundPriceList(status) {
+      switch (status) {
+      case 'ALL_REFUND':
+        return "全部退款";
+      case 'PART_REFUND':
+        return "部分退款";
+      case 'NO_REFUND':
+        return "未退款";
+      case 'REFUNDING':
+        return "退款中";
+      default:
+          return "未退款";
+      }
+    },
    goodsDetail(skuId, goodsId) {
      // 跳转商品详情
      let routeUrl = this.$router.resolve({
@@ -270,9 +365,20 @@ export default {
        if (res.success) {
          this.order = res.result;
          this.progressList = res.result.orderLogs;
+          if (this.order.order.deliveryMethod === 'LOGISTICS') {
+            this.getOrderPackage(this.order.order.sn);
+            this.traces();
+          }
        }
      });
    },
+    getOrderPackage(sn) {
+      getPackage(sn).then(res => {
+        if (res.success) {
+          this.orderPackage = res.result
+        }
+      })
+    },
    traces() {
      // 物流信息
      getTraces(this.$route.query.sn).then((res) => {
@@ -281,6 +387,15 @@ export default {
        }
      });
    },
+    logisticsList() {
+      this.logisticsModal = true;
+      this.packageTraceList = this.orderPackage;
+      // getTracesList(this.order.order.sn).then((res) => {
+      //   if (res.success && res.result != null) {
+      //     this.packageTraceList = res.result;
+      //   }
+      // });
+    },
    received(sn) {
      // 确认收货
      sureReceived(sn).then((res) => {
@@ -336,7 +451,6 @@ export default {
  },
  mounted() {
    this.getDetail();
-    this.traces();
  },
 };
 </script>
@@ -456,4 +570,119 @@ table {
 .progress {
  margin: 15px 0;
 }
+
+.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;
+      }
+    }
+  }
+}
+
+.layui-layer-wrap > .div-express-log {
+  max-height: 300px;
+}
+::v-deep .layui-layer-wrap > .div-express-log::-webkit-scrollbar{
+  width: 1px;
+  height: 5px;
+}
+::v-deep .layui-layer-wrap > .div-express-log::-webkit-scrollbar-thumb{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.3);
+}
+::v-deep .layui-layer-wrap > .div-express-log::-webkit-scrollbar-track{
+  border-radius: 1em;
+  background-color: rgba(50,50,50,.1);
+}
+
+
+.div-express-log {
+  border: solid 1px #e7e7e7;
+  background: #fafafa;
+  overflow-y: auto;
+  overflow-x: auto;
+}
+
+.express-log {
+  /*margin: 5px -10px 5px 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;
+  }
+}
+
+.express-log-name {
+  li {
+    display: flex;
+    span  {
+      display: flex;
+    }
+  }
+}
+
+.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;
+      }
+    }
+  }
+}
 </style>
--- a/buyer/src/pages/home/userCenter/Coupons.vue
+++ b/buyer/src/pages/home/userCenter/Coupons.vue
@@ -1,136 +1,155 @@
 <template>
  <div class="wrapper">
    <card _Title="优惠券列表" :_Tabs="statusNameList" @_Change="change" />
-    <empty v-if="list.length==0" />
+    <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>
+            <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>
+          <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
+          <p>有效期：{{ item.endTime }}</p>
        </div>
        <b></b>
-        <a class="c-right" :class="{'canot-use':params.memberCouponStatus !== 'NEW'}" @click="go(item)">立即使用</a>
+        <a
+          class="c-right"
+          :class="{ 'canot-use': params.memberCouponStatus !== 'NEW' }"
+          @click="go(item)"
+          >立即使用</a
+        >
        <i class="circle-top"></i>
        <i class="circle-bottom"></i>
      </li>
    </ul>
-    <Page :total="total" @on-change="changePageNum"
+    <Page
+      :total="total"
+      @on-change="changePageNum"
      class="pageration"
      @on-page-size-change="changePageSize"
      :page-size="params.pageSize"
      show-total
-      show-sizer>
+      show-sizer
+    >
    </Page>
    <Spin v-if="loading" fix></Spin>
  </div>
 </template>

 <script>
-import { memberCouponList } from '@/api/member.js';
+import { memberCouponList } from "@/api/member.js";
 export default {
-  name: 'Coupons',
-  data () {
+  name: "Coupons",
+  data() {
    return {
-      statusNameList: [ // 优惠券状态
-        '未使用',
-        '已使用',
-        '已过期'
+      statusNameList: [
+        // 优惠券状态
+        "未使用",
+        "已使用",
+        "已过期",
      ],
-      statusList: ['NEW', 'USED', 'EXPIRE'], // 优惠券状态
+      statusList: ["NEW", "USED", "EXPIRE"], // 优惠券状态
      loading: false, // 列表加载状态
-      params: { // 请求参数
+      params: {
+        // 请求参数
        pageNumber: 1,
        pageSize: 10,
-        memberCouponStatus: 'NEW'
+        memberCouponStatus: "NEW",
      },
      total: 0, // 优惠券总数
-      list: [] // 优惠券列表
+      list: [], // 优惠券列表
    };
  },
  methods: {
-    getList () { // 获取优惠券列表
-      this.loading = true
-      memberCouponList(this.params).then(res => {
-        this.loading = false
+    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
+          this.list = res.result.records;
+          this.total = res.result.total;
        }
-      })
+      });
    },
    // 切换优惠券状态
-    change (index) {
-      this.params.memberCouponStatus = this.statusList[index]
+    change(index) {
+      this.params.memberCouponStatus = this.statusList[index];
      this.params.pageNumber = 1;
-      this.getList()
+      this.getList();
    },
-    go (item) { // 根据使用条件跳转商品列表页面
-      if (this.params.memberCouponStatus !== 'NEW') return;
+    go(item) {
+      // 根据使用条件跳转商品列表页面
+      if (this.params.memberCouponStatus !== "NEW") return;

-      if (item.storeId !== '0') {
-        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'})
-        }
-      }
+      this.$router.push({
+        path: "/goodsList",
+        query: { promotionsId: item.couponId, promotionType: "COUPON" },
+      });
    },

-    changePageNum (val) { // 分页改变页码
+    changePageNum(val) {
+      // 分页改变页码
      this.params.pageNumber = val;
-      this.getList()
+      this.getList();
    },

-    changePageSize (val) { // 分页改变页数
+    changePageSize(val) {
+      // 分页改变页数
      this.params.pageNumber = 1;
      this.params.pageSize = val;
-      this.getList()
+      this.getList();
    },

-    useScope (type, storeName) { // 根据字段返回 优惠券适用范围
-      let shop = '平台';
-      let goods = '全部商品'
-      if (storeName !== 'platform') shop = storeName
+    useScope(type, storeName) {
+      // 根据字段返回 优惠券适用范围
+      let shop = "平台";
+      let goods = "全部商品";
+      if (storeName !== "platform") shop = storeName;
      switch (type) {
-        case 'ALL':
-          goods = '全部商品'
+        case "ALL":
+          goods = "全部商品";
          break;
-        case 'PORTION_GOODS':
-          goods = '部分商品'
+        case "PORTION_GOODS":
+          goods = "部分商品";
          break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品'
+        case "PORTION_GOODS_CATEGORY":
+          goods = "部分分类商品";
          break;
      }
-      return `${shop}${goods}可用`
-    }
+      return `${shop}${goods}可用`;
+    },
  },
-  mounted () {
-    this.getList()
-  }
-}
+  mounted() {
+    this.getList();
+  },
+};
 </script>

 <style scoped lang="scss">
-@import '../../../assets/styles/coupon.scss';
-.coupon-item{
+@import "../../../assets/styles/coupon.scss";
+.coupon-item {
  height: 125px;
-  .c-left{
+  .c-left {
    padding: 16px;
  }
-  .c-right{
+  .c-right {
    padding: 20px 16px;
    width: 43px;
    font-size: 14px;
  }
-  .canot-use{
+  .canot-use {
    color: #999;
    background-color: #eee;
  }
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -1,13 +1,13 @@
 <template>
  <div class="wrapper">
-    <card _Title="资金管理" />
+    <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>
+        <span class="">￥{{ frozenDeposit | unitPrice }}</span>
      </div>
      <div class="account-btns">
        <Button type="primary" @click="recharge">在线充值</Button>
@@ -22,19 +22,19 @@
      <div>
        <Form
          ref="formData"
-          :model="formData"
-          label-position="left"
          :label-width="100"
+          :model="formData"
          :rules="formValidate"
+          label-position="left"
        >
          <FormItem label="充值金额" prop="price">
-            <Input v-model="formData.price" size="large" number maxlength="9"
-              ><span slot="append">元</span></Input>
+            <Input v-model="formData.price" maxlength="9" number size="large"
+            ><span slot="append">元</span></Input>
          </FormItem>
        </Form>
      </div>
      <div slot="footer" style="text-align: center">
-        <Button type="success" size="large" @click="rechargePrice">充值</Button>
+        <Button size="large" type="success" @click="rechargePrice">充值</Button>
      </div>
    </Modal>
    <!-- 提现申请 -->
@@ -46,23 +46,45 @@
      <div>
        <Form
          ref="withdrawApplyFormData"
+          :label-width="120"
          :model="withdrawApplyFormData"
-          label-position="left"
-          :label-width="100"
          :rules="withdrawApplyFormValidate"
        >
+          <FormItem label="提现类型" prop="type">
+            <Select v-model="withdrawApplyFormData.type" disabled>
+              <Option value="ALI">支付宝</Option>
+              <Option value="WECHAT">微信</Option>
+            </Select>
+          </FormItem>
          <FormItem label="提现金额" prop="price">
            <Input
              v-model="withdrawApplyFormData.price"
-              size="large"
-              number
              maxlength="9"
-              ><span slot="append">元</span></Input>
+              number
+              size="large"
+            ><span slot="append">元</span></Input>
+            <span style="color: red">最低提现金额 {{ withdrawApplyFormData.minPrice }}元</span>
+          </FormItem>
+          <FormItem v-if="withdrawApplyFormData.type === 'ALI'" label="真实姓名" prop="realName">
+            <Input
+              v-model="withdrawApplyFormData.realName"
+              maxlength="9"
+              number
+              size="large"
+            ></Input>
+          </FormItem>
+          <FormItem v-if="withdrawApplyFormData.type === 'ALI'" label="第三方登录账号" prop="connectNumber">
+            <Input
+              v-model="withdrawApplyFormData.connectNumber"
+              maxlength="9"
+              number
+              size="large"
+            ></Input>
          </FormItem>
        </Form>
      </div>
      <div slot="footer" style="text-align: center">
-        <Button type="success" size="large" @click="withdrawal">提现</Button>
+        <Button size="large" type="success" @click="withdrawal">提现</Button>
      </div>
    </Modal>
    <!-- 余额日志 -->
@@ -73,15 +95,15 @@
        <div class="page-size">
          <Page
            :current="walletForm.pageNumber"
-            :total="logColumnsData.total"
            :page-size="walletForm.pageSize"
+            :page-size-opts="[10, 20, 50]"
+            :total="logColumnsData.total"
+            show-sizer
+            show-total
+            size="small"
+            transfer
            @on-change="changePage"
            @on-page-size-change="changePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-sizer
-            transfer
          ></Page>
        </div>
      </TabPane>
@@ -95,15 +117,15 @@
        <div class="page-size">
          <Page
            :current="rechargeForm.pageNumber"
-            :total="rechargeListData.total"
            :page-size="rechargeForm.pageSize"
+            :page-size-opts="[10, 20, 50]"
+            :total="rechargeListData.total"
+            show-sizer
+            show-total
+            size="small"
+            transfer
            @on-change="rechargeChangePage"
            @on-page-size-change="rechargeChangePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-sizer
-            transfer
          ></Page>
        </div>
      </TabPane>
@@ -117,15 +139,15 @@
        <div class="page-size">
          <Page
            :current="withdrawApplyForm.pageNumber"
-            :total="withdrawApplyColumnsListData.total"
            :page-size="withdrawApplyForm.pageSize"
+            :page-size-opts="[10, 20, 50]"
+            :total="withdrawApplyColumnsListData.total"
+            show-sizer
+            show-total
+            size="small"
+            transfer
            @on-change="withdrawChangePage"
            @on-page-size-change="withdrawChangePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-sizer
-            transfer
          ></Page>
        </div>
      </TabPane>
@@ -134,17 +156,12 @@
 </template>

 <script>
-import {
-  getMembersWallet,
-  getDepositLog,
-  getRecharge,
-  getWithdrawApply,
-  recharge,
-  withdrawalApply
-} from '@/api/member';
+import {getDepositLog, getMembersWallet, getRecharge, getWithdrawApply, recharge, withdrawalApply} from '@/api/member';
+import {withdrawalSettingVO} from "@/api/pay";
+
 export default {
  name: 'MoneyManagement',
-  data () {
+  data() {
    return {
      frozenDeposit: 0, // 冻结余额
      memberDeposit: 0, // 余额
@@ -157,7 +174,11 @@ export default {
      },
      // 提现金额
      withdrawApplyFormData: {
-        price: 1
+        price: 1,
+        minPrice: 1,
+        type: '',
+        realName: '',
+        connectNumber: '',
      },
      // 余额日志
      walletForm: {
@@ -180,17 +201,23 @@ export default {
      // 提现申请校验
      withdrawApplyFormValidate: {
        price: [
-          { required: true, message: '请输入大于0小于9999的合法提现金额' },
+          {required: true, message: '请输入大于0小于9999的合法提现金额'},
          {
            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
            message: '请输入大于0小于9999的合法提现金额',
            trigger: 'change'
          }
-        ]
+        ],
+        realName: [
+          {required: true, message: '请输入真实姓名'},
+        ],
+        connectNumber: [
+          {required: true, message: '请输入第三方登录账号'},
+        ],
      },
      formValidate: {
        price: [
-          { required: true, message: '请输入大于等于1小于9999的合法充值金额' },
+          {required: true, message: '请输入大于等于1小于9999的合法充值金额'},
          {
            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
            message: '请输入大于等于1小于9999的合法充值金额',
@@ -341,7 +368,11 @@ export default {
            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 if (params.row.applyStatus === 'ERROR') {
+              return h('div', [h('span', {}, '提现失败')]);
            } else {
              return h('div', [h('span', {}, '审核拒绝')]);
            }
@@ -362,12 +393,12 @@ export default {
      withdrawApplyColumnsListData: {} // 提现记录
    };
  },
-  mounted () {
+  mounted() {
    this.init();
  },
  methods: {
    // 初始化数据
-    init () {
+    init() {
      getMembersWallet().then((res) => {
        this.frozenDeposit = res.result.memberFrozenWallet;
        this.memberDeposit = res.result.memberWallet;
@@ -378,7 +409,7 @@ export default {
        }
      });
    },
-    tabPaneChange (v) {
+    tabPaneChange(v) {
      // 如果查询充值记录
      if (v === 'recharge') {
        this.getRechargeData();
@@ -393,7 +424,7 @@ export default {
      }
    },
    // 充值记录
-    getRechargeData () {
+    getRechargeData() {
      getRecharge(this.rechargeForm).then((res) => {
        if (res.message === 'success') {
          this.rechargeListData = res.result;
@@ -401,7 +432,7 @@ export default {
      });
    },
    // 提现记录
-    getWithdrawApplyData () {
+    getWithdrawApplyData() {
      getWithdrawApply(this.withdrawApplyForm).then((res) => {
        if (res.message === 'success') {
          this.withdrawApplyColumnsListData = res.result;
@@ -409,49 +440,49 @@ export default {
      });
    },
    // 余额日志
-    changePage (v) {
+    changePage(v) {
      this.walletForm.pageNumber = v;
      this.init();
    },
-    changePageSize (v) {
+    changePageSize(v) {
      this.walletForm.pageNumber = 1;
      this.walletForm.pageSize = v;
      this.init();
    },
    // 充值记录
-    rechargeChangePage (v) {
+    rechargeChangePage(v) {
      this.rechargeForm.pageNumber = v;
      this.getRechargeData();
    },
-    rechargeChangePageSize (v) {
+    rechargeChangePageSize(v) {
      this.rechargeForm.pageNumber = 1;
      this.rechargeForm.pageSize = v;
      this.getRechargeData();
    },
    // 提现记录
-    withdrawChangePage (v) {
+    withdrawChangePage(v) {
      this.withdrawApplyForm.pageNumber = v;
      this.getWithdrawApplyData();
    },
-    withdrawChangePageSize (v) {
+    withdrawChangePageSize(v) {
      this.withdrawApplyForm.pageNumber = 1;
      this.withdrawApplyForm.pageSize = v;
      this.getWithdrawApplyData();
    },
    // 弹出在线充值框
-    recharge () {
+    recharge() {
      this.formData.price = 1;
      this.modal = true;
    },
    // 在线充值
-    rechargePrice () {
+    rechargePrice() {
      this.$refs['formData'].validate((valid) => {
        if (valid) {
          recharge(this.formData).then((res) => {
            if (res.message === 'success') {
              this.$router.push({
                path: '/payment',
-                query: { orderType: 'RECHARGE', sn: res.result.rechargeSn }
+                query: {orderType: 'RECHARGE', sn: res.result.rechargeSn}
              });
            }
          });
@@ -459,12 +490,23 @@ export default {
      });
    },
    // 申请提现弹出框
-    withdrawalApply () {
-      this.withdrawApplyFormData.price = 1;
+    withdrawalApply() {
      this.withdrawApplyModal = true;
+      this.withdrawApplyFormData.minPrice = 1;
+      this.withdrawApplyFormData.price = 1;
+      this.withdrawApplyFormData.type = '';
+      this.withdrawApplyFormData.realName = '';
+      this.withdrawApplyFormData.connectNumber = '';
+      withdrawalSettingVO().then((res) => {
+        if (res.code === 200) {
+          this.withdrawApplyFormData.minPrice = res.result.minPrice;
+          this.withdrawApplyFormData.type = res.result.type;
+          this.withdrawApplyFormData.price = 1;
+        }
+      });
    },
    // 提现
-    withdrawal () {
+    withdrawal() {
      this.$refs['withdrawApplyFormData'].validate((valid) => {
        if (valid) {
          withdrawalApply(this.withdrawApplyFormData).then((res) => {
@@ -482,25 +524,30 @@ export default {
 };
 </script>

-<style scoped lang="scss">
+<style lang="scss" scoped>
 .box {
  margin: 20px 0;
 }
+
 .page-size {
  margin: 15px 0px;
  display: flex;
  justify-content: flex-end;
  align-items: center;
 }
+
 .account-price {
  font-weight: bold;
 }
+
 .subTips {
  margin-left: 10px;
 }
+
 .account-btns {
  margin: 10px 0;
 }
+
 .ivu-btn {
  margin: 0 4px;
 }
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -112,7 +112,10 @@ export default {
      tracksList(this.params).then((res) => {
        this.spinShow = false;
        if (res.success && res.result.records.length) {
-          this.list = res.result.records;
+          this.list = res.result.records.filter(item =>{
+            return item != null
+          });
+          this.total = res.result.total
        } else {
          this.list = [];
        }
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -9,42 +9,29 @@
      </div>
      <div class="cart-steps">
        <span :class="stepIndex == 1 ? 'active' : ''">1.我的购物车</span>
-        <Icon
-          :class="stepIndex == 1 ? 'active-arrow' : ''"
-          custom="icomoon icon-next"
-        ></Icon>
+        <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
        <span :class="stepIndex == 1 ? 'active' : ''">2.填写订单信息</span>
-        <Icon
-          :class="stepIndex == 1 ? 'active-arrow' : ''"
-          custom="icomoon icon-next"
-        ></Icon>
+        <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
        <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
      </div>
    </div>
    <Divider />
    <div class="content width_1200">
      <!-- 收货地址 -->
-      <div class="address">
+      <div class="address" v-if="selectedDeliverMethod === 'LOGISTICS' && goodsType !== 'VIRTUAL_GOODS'">
        <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 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 class="ml_10" v-if="item.alias" color="warning">{{ item.alias }}
              </Tag>
            </div>
            <div>{{ item.mobile }}</div>
@@ -53,12 +40,7 @@
            </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
-              >
+              <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>
@@ -70,75 +52,99 @@
            <div>添加新地址</div>
          </div>
        </div>
-
-        <div
-          class="more-addr"
-          @click="moreAddr = !moreAddr"
-          v-if="addressList.length > 3"
-        >
+        <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="address" v-if="selectedDeliverMethod === 'SELF_PICK_UP'">
+        <div class="card-head">
+          <span>自提点信息</span>
+        </div>
+        <div class="address-manage">
+          <div class="address-item" v-show="storeMoreAddr ? true : index < 3"
+            :class="selectedAddress.id === item.id ? 'border-red' : ''" @mouseenter="showEditBtn = index"
+            @mouseleave="showEditBtn = ''" @click="selectStoreAddress(item)" v-for="(item, index) in storeAddressList"
+            :key="index">
+            <div>
+              <span>{{ item.addressName }}</span>
+            </div>
+            <div>{{ item.mobile }}</div>
+            <div>
+              {{ item.address | unitAddress }} {{ item.detail }}
+            </div>
+            <div class="corner-icon" v-show="selectedStoreAddress.id === item.id">
+              <div></div>
+              <Icon type="md-checkmark" />
+            </div>
+          </div>
+        </div>
+        <div class="more-addr" @click="storeMoreAddr = !storeMoreAddr" v-if="addressList.length > 3">
+          {{ storeMoreAddr ? "收起地址" : "更多地址" }}
+          <Icon v-show="!storeMoreAddr" type="md-arrow-dropdown" />
+          <Icon v-show="storeMoreAddr" type="md-arrow-dropup" />
+        </div>
+      </div>
+      <div>
+      </div>
+      <div class="goods-content" v-if="goodsType !== 'VIRTUAL_GOODS'">
+        <div class="card-head mt_20 mb_20">
+          <span>配送方式</span>
+        </div>
+        <div class="delivery-method">
+
+          <div class="method-item" v-show="moreAddr ? true : index < 3"
+            :class="selectedDeliverMethod === item.value ? 'border-red' : ''" @mouseenter="showEditBtn = item.value"
+            @mouseleave="showEditBtn = ''" @click="selectDeliverMethod(item)" v-for="(item, index) in shippingMethod"
+            :key="index">
+            <div>{{ item.label }}</div>
+            <div class="corner-icon" v-show="selectedDeliverMethod === item.value">
+              <div></div>
+              <Icon type="md-checkmark" />
+            </div>
+          </div>
+        </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="goods-msg" v-for="(shop, shopIndex) in goodsList" :key="shopIndex">
          <div v-if="shop.checked">
            <div class="shop-name">
              <span>
                <span class="hover-color" @click="goShopPage(shop.storeId)">{{
-                  shop.storeName
-                }}</span
-                >&nbsp;&nbsp;
+                    shop.storeName
+                }}</span>&nbsp;&nbsp;
              </span>
            </div>
            <div class="goods-list">
-              <div
-                class="goods-item"
-                v-for="(goods, goodsIndex) in shop.checkedSkuList"
-                :key="goodsIndex"
-              >
-                <span
-                  class="hover-color"
-                  @click="
-                    goGoodsDetail(goods.goodsSku.id, goods.goodsSku.goodsId)
-                  "
-                >
+              <div class="goods-item" v-for="(goods, goodsIndex) in shop.checkedSkuList" :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
+                      goods.goodsSku.goodsName
                  }}</span>
                </span>
                <span class="goods-price">{{
-                  goods.purchasePrice | unitPrice("￥")
+                    goods.purchasePrice | unitPrice("￥")
                }}</span>
                <span>x{{ goods.num }}</span>
                <span>{{ goods.goodsSku.quantity > 0 ? "有货" : "无货" }}</span>
                <span class="goods-price">{{
-                  goods.subTotal | unitPrice("￥")
+                    goods.subTotal | 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
-              >
+              <Input type="textarea" maxlength="60" v-model="shop.remark" show-word-limit placeholder="订单备注" />
+              <span style="font-size: 12px; color: #999">提示：请勿填写有关支付、收货、发票方面的信息</span>
            </div>
          </div>
        </div>
@@ -146,13 +152,9 @@
      <!-- 发票信息 -->
      <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
-          >
+          <span class="relative">发票信息<span class="inv-tips">
+              <Icon type="ios-alert-outline" />开企业抬头发票须填写纳税人识别号，以免影响报销
+            </span></span>
        </div>
        <div class="inovice-content">
          <span>{{ invoiceData.receiptTitle }}</span>
@@ -167,47 +169,24 @@
        </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"
-          >
+          <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">{{
+                <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
-                >
+                }}</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>
-            <img
-              class="used"
-              v-if="usedCouponId.includes(item.id)"
-              src="../../assets/images/geted.png"
-              alt=""
-            />
+            <img class="used" v-if="usedCouponId.includes(item.id)" src="../../assets/images/geted.png" alt="" />
            <b></b>
            <a class="c-right" @click="useCoupon(item.id, true)">立即使用</a>
-            <a
-              class="c-right"
-              v-if="usedCouponId.includes(item.id)"
-              @click="useCoupon(item.id, false)"
-              >放弃优惠</a
-            >
+            <a class="c-right" v-if="usedCouponId.includes(item.id)" @click="useCoupon(item.id, false)">放弃优惠</a>
            <i class="circle-top"></i>
            <i class="circle-bottom"></i>
          </li>
@@ -216,30 +195,24 @@
      <!-- 订单价格 -->
      <div class="order-price">
        <div>
-          <span>{{ totalNum }}件商品，总商品金额：</span
-          ><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span>
+          <span>{{ totalNum }}件商品，总商品金额：</span><span>{{ priceDetailDTO.goodsPrice | unitPrice("￥") }}</span>
        </div>
        <div v-if="priceDetailDTO.freightPrice > 0">
-          <span>运费：</span
-          ><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span>
+          <span>运费：</span><span>{{ priceDetailDTO.freightPrice | unitPrice("￥") }}</span>
        </div>
        <div v-if="priceDetailDTO.discountPrice > 0">
-          <span>优惠金额：</span
-          ><span>-{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
+          <span>优惠金额：</span><span>-{{ priceDetailDTO.discountPrice | unitPrice("￥") }}</span>
        </div>
        <div v-if="priceDetailDTO.couponPrice > 0">
-          <span>优惠券金额：</span
-          ><span>-{{ priceDetailDTO.couponPrice | unitPrice("￥") }}</span>
+          <span>优惠券金额：</span><span>-{{ priceDetailDTO.couponPrice | unitPrice("￥") }}</span>
        </div>

        <div v-if="$route.query.way === 'POINTS'">
-          <span>应付积分：</span
-          ><span class="actrual-price">{{ priceDetailDTO.payPoint }}</span>
+          <span>应付积分：</span><span class="actrual-price">{{ priceDetailDTO.payPoint }}</span>
        </div>
        <div v-else>
-          <span>应付金额：</span
-          ><span class="actrual-price">{{
-            priceDetailDTO.flowPrice | unitPrice("￥")
+          <span>应付金额：</span><span class="actrual-price">{{
+              priceDetailDTO.flowPrice | unitPrice("￥")
          }}</span>
        </div>
      </div>
@@ -247,26 +220,21 @@
    <!-- 底部支付栏 -->
    <div class="order-footer width_1200">
      <div class="pay ml_20" @click="pay">提交订单</div>
-      <div class="pay-address" v-if="addressList.length">
+      <div class="pay-address" v-if="addressList.length && selectedDeliverMethod === 'LOGISTICS'">
        配送至：{{ selectedAddress.consigneeAddressPath | unitAddress }}
        {{ selectedAddress.detail }}&nbsp;&nbsp;收货人：{{
-          selectedAddress.name
+            selectedAddress.name
        }}&nbsp;&nbsp;{{ selectedAddress.mobile }}
      </div>
+      <div class="pay-address" v-if="addressList.length && selectedDeliverMethod === 'SELF_PICK_UP'">
+        自提地点：{{selectedStoreAddress.address}} &nbsp;&nbsp;联系方式：{{ selectedStoreAddress.mobile }}
+      </div>
    </div>
    <BaseFooter></BaseFooter>
    <!-- 添加发票模态框 -->
-    <invoice-modal
-      ref="invModal"
-      :invoiceData="invoiceData"
-      @change="getInvMsg"
-    />
+    <invoice-modal ref="invModal" :invoiceData="invoiceData" @change="getInvMsg" />
    <!-- 选择地址模态框 -->
-    <address-manage
-      ref="address"
-      :id="addrId"
-      @change="addrChange"
-    ></address-manage>
+    <address-manage ref="address" :id="addrId" @change="addrChange"></address-manage>
  </div>
 </template>

@@ -279,8 +247,12 @@ import {
  createTrade,
  selectAddr,
  selectCoupon,
+  setShipMethod,
+  setStoreAddressId,
+  shippingMethodList,
  couponNum,
 } from "@/api/cart";
+import { getStoreAddress } from "@/api/shopentry.js"
 import { canUseCouponList } from "@/api/member.js";

 export default {
@@ -288,15 +260,36 @@ export default {
  components: { invoiceModal, addressManage },
  data() {
    return {
+      selectedStoreAddress: 'm',
+      selectMethod: '',
      stepIndex: 1, // 顶部步骤条状态
      invoiceAvailable: false, // 发票编辑按钮
      showEditBtn: "", // 鼠标移入显示编辑按钮
      orderMark: "", // 订单备注
+      goodsType: "", // 商品类型
+      storeMoreAddr: false,
      invoiceData: {
        // 发票数据
        receiptTitle: "个人",
        receiptContent: "不开发票",
      },
+      searchForm: {
+        pageNumber: 1,
+        pageSize: 100
+      },
+      shippingMethod: [],
+      storeAddressList: [],
+      shippingWay: [
+        {
+          value: "LOGISTICS",
+          label: "物流",
+        },
+        {
+          value: "SELF_PICK_UP",
+          label: "自提",
+        },
+      ],
+      selectedDeliverMethod: 'LOGISTICS',
      addressList: [], // 地址列表
      selectedAddress: {}, // 所选地址
      goodsList: [], // 商品列表
@@ -308,6 +301,7 @@ export default {
      couponList: [], // 可用优惠券列表
      usedCouponId: [], // 已使用优惠券id
      selectedCoupon: {}, // 已选优惠券对象
+      storeId: '', //店铺Id
    };
  },
  mounted() {
@@ -317,6 +311,7 @@ export default {
    // 初始化数据
    init() {
      this.getGoodsDetail();
+      this.getDistribution();
    },
    goAddressManage() {
      // 跳转地址管理页面
@@ -324,7 +319,7 @@ export default {
    },
    getAddress() {
      // 获取收货地址列表
-      memberAddress().then((res) => {
+      memberAddress(this.searchForm).then((res) => {
        if (res.success) {
          this.addressList = res.result.records;
          this.addressList.forEach((e, index) => {
@@ -335,6 +330,38 @@ export default {
        }
      });
    },
+    // 获取配送方式列表
+    async getDistribution() {
+      let shopRes = await shippingMethodList({ way: this.$route.query.way });
+      let shopList;
+      if (shopRes.success) {
+        shopList = shopRes.result;
+        let way = [];
+        console.log(shopList)
+        this.shippingWay.forEach((item) => {
+          shopList.forEach((child) => {
+            if (item.value == child) {
+              way.push(item);
+            }
+          });
+        });
+        this.shippingMethod = way;
+        console.log(this.shippingMethod)
+      }
+    },
+
+    async getStoreAddressList() {
+      getStoreAddress(this.storeId,this.searchForm).then(res => {
+        if (res.success) {
+          this.storeAddressList = res.result.records
+          this.storeAddressList.forEach((e, index) => {
+            if (e.id === this.selectedAddress.id && index > 2) {
+              this.storeMoreAddr = true;
+            }
+          });
+        }
+      })
+    },
    getGoodsDetail() {
      // 订单商品详情
      this.$Spin.show();
@@ -364,7 +391,10 @@ export default {
            this.goodsList = res.result.cartList;
            this.priceDetailDTO = res.result.priceDetailDTO;
            this.skuList = res.result.skuList;
-
+            if (res.result.skuList[0] && res.result.skuList[0].goodsSku) {
+              this.goodsType = res.result.skuList[0].goodsSku.goodsType;
+            }
+            this.storeId = this.goodsList[0].storeId
            if (res.result.receiptVO) {
              this.invoiceData = res.result.receiptVO;
            }
@@ -401,6 +431,7 @@ export default {
              this.selectedAddress = res.result.memberAddress;
            }
            this.getAddress();
+            this.getStoreAddressList();
            this.totalNum = 0;
            for (let i = 0; i < this.skuList.length; i++) {
              this.totalNum += this.skuList[i].num;
@@ -475,8 +506,32 @@ export default {
      };
      selectAddr(params).then((res) => {
        if (res.success) {
-          this.$Message.success("选择收货地址成功");
-          this.selectedAddress = item;
+          this.$Message.success("选择配送方式成功");
+          this.selectMethod = item;
+          this.getGoodsDetail();
+        }
+      });
+    },
+    selectStoreAddress(item) {
+      console.log(item.id)
+      console.log(this.$route.query.way)
+      // 选择自提地址
+      setStoreAddressId(item.id,this.$route.query.way).then((res) => {
+        if (res.success) {
+          this.$Message.success("选择自提地址成功");
+          this.selectedStoreAddress = item;
+          this.getGoodsDetail();
+        }
+      });
+    },
+    selectDeliverMethod(item) {
+      let params = {
+        way: this.$route.query.way,
+        shippingMethod: item.value,
+      };
+      setShipMethod(params).then((res) => {
+        if (res.success) {
+          this.selectedDeliverMethod = item.value;
          this.getGoodsDetail();
        }
      });
@@ -503,7 +558,7 @@ export default {
            }
          });
        },
-        onCancel: () => {},
+        onCancel: () => { },
      });
    },
    goGoodsDetail(skuId, goodsId) {
@@ -605,9 +660,11 @@ export default {

 <style scoped lang="scss">
@import "../../assets/styles/coupon.scss";
+
 .goods-msg {
  overflow: hidden;
 }
+
 /** logo start */
 .logo {
  height: 40px;
@@ -680,12 +737,82 @@ export default {
  padding: 15px 25px;
 }

+.delivery-method {
+  display: flex;
+  flex-wrap: wrap;
+
+  >div {
+    border: 1px dotted #949494;
+    width: 50px;
+    height: 40px;
+    margin: 20px 20px 0 0;
+    padding: 10px;
+    cursor: pointer;
+    color: #999;
+  }
+
+  .method-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;
+  }
+}
+
 /** 地址管理 */
 .address-manage {
  display: flex;
  flex-wrap: wrap;

-  > div {
+  >div {
    border: 1px dotted #949494;
    width: 265px;
    height: 120px;
@@ -704,20 +831,21 @@ export default {
    .ivu-icon {
      font-size: 24px;
    }
+
  }

  .address-item {
    position: relative;
    font-size: 12px;

-    > div:nth-child(1) {
+    >div:nth-child(1) {
      margin-bottom: 10px;

      span {
        margin-right: 10px;
      }

-      > span:nth-child(1) {
+      >span:nth-child(1) {
        color: #000000;
        font-size: 14px;
      }
@@ -767,7 +895,7 @@ export default {
  display: flex;
  justify-content: space-between;

-  > span:nth-child(1) {
+  >span:nth-child(1) {
    font-weight: bold;

    .ivu-icon {
@@ -779,7 +907,7 @@ export default {
    }
  }

-  > span:nth-child(2) {
+  >span:nth-child(2) {
    color: #999;
    position: relative;
    display: flex;
@@ -833,22 +961,23 @@ export default {
      height: 48px;
    }

-    > span {
+    >span {
      text-align: center;
      width: 100px;
    }

-    > span:nth-child(1) {
+    >span:nth-child(1) {
      font-size: 12px;

      flex: 1;
      text-align: left;
-      > span {
+
+      >span {
        margin-left: 10px;
      }
    }

-    > span:last-child {
+    >span:last-child {
      color: $theme_color;
      font-weight: bold;
    }
@@ -895,11 +1024,11 @@ export default {
  }

  .inovice-content {
-    > span {
+    >span {
      margin-right: 10px;
    }

-    > span:last-child {
+    >span:last-child {
      color: $theme_color;
      cursor: pointer;

@@ -919,7 +1048,7 @@ export default {
  font-size: 16px;
  color: #999;

-  > div > span:nth-child(2) {
+  >div>span:nth-child(2) {
    width: 130px;
    text-align: right;
    display: inline-block;
--- a/buyer/src/pages/payment/PayMent.vue
+++ b/buyer/src/pages/payment/PayMent.vue
@@ -78,6 +78,8 @@ export default {
          this.support = this.payDetail.support
          this.walletValue = this.payDetail.walletValue
        }
+      }).catch((err) => {
+        this.$router.push({name: 'MyOrder'});
      });
    },
    // 支付
--- a/buyer/src/pages/promotion/seckill.vue
+++ b/buyer/src/pages/promotion/seckill.vue
@@ -6,12 +6,7 @@
    <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 }"
-        >
+        <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>
@@ -30,13 +25,8 @@
    <!-- 秒杀商品列表 -->
    <div class="goods-list">
      <empty v-if="goodsList.length === 0" />
-      <div
-        v-else
-        class="goods-show-info1"
-        v-for="(item, index) in goodsList"
-        :key="index"
-        @click="goGoodsDetail(item.skuId, item.goodsId)"
-      >
+      <div v-else class="goods-show-info1" v-for="(item, index) in goodsList" :key="index"
+        @click="goGoodsDetail(item.skuId, item.goodsId)">
        <div class="goods-show-img">
          <img width="200" height="200" :src="item.goodsImage" />
        </div>
@@ -50,45 +40,31 @@
            }}</span>
          </span>
        </div>
-        <div class="goods-show-detail">
+        <div class="goods-show-detail" style="margin-bottom: 20px">
          <span>{{ item.goodsName }}</span>
        </div>
-        <div
-          class="goods-seckill-btn"
-          :class="{
-            'goods-seckill-btn-gray': nowHour < list[currIndex].timeLine,
-          }"
-        >
+        <div class="goods-seckill-btn" :class="{
+          'goods-seckill-btn-gray': nowHour < list[currIndex].timeLine,
+        }">
          {{ nowHour >= list[currIndex].timeLine ? "立即抢购" : "即将开始" }}
        </div>
-        <div
-          v-if="nowHour >= list[currIndex].timeLine"
-          class="goods-seckill-btn goods-seckill-btn-gray"
-        >
+        <div v-if="nowHour >= list[currIndex].timeLine && item.quantity <= item.salesNum"
+          class="goods-seckill-btn goods-seckill-btn-gray">
          已售罄
        </div>
        <div v-if="nowHour >= list[currIndex].timeLine" class="goods-show-num1">
-          <span
-            >已售{{
-              (item.quantity && item.quantity > 0
-                ? Math.ceil(
-                    (item.salesNum / (item.quantity + item.salesNum)) * 100
-                  )
-                : 100) + "%"
-            }}</span
-          ><Progress
-            hide-info
-            stroke-color="#df0021"
-            style="width: 110px"
-            class="ml_10"
-            :percent="
-              item.quantity && item.quantity > 0
-                ? Math.ceil(
-                    (item.salesNum / (item.quantity + item.salesNum)) * 100
-                  )
-                : 100
-            "
-          />
+          <span>已售{{
+            (item.quantity && item.quantity > 0
+              ? Math.ceil(
+                (item.salesNum / (item.quantity)) * 100
+              )
+              : 100) + "%"
+          }}</span><Progress hide-info stroke-color="#df0021" style="width: 110px" class="ml_10" :percent="item.quantity && item.quantity > 0
+      ? Math.ceil(
+        (item.salesNum / (item.quantity)) * 100
+      )
+      : 100
+    " />
        </div>
        <div class="goods-show-seller">
          <span>{{ item.storeName }}</span>
@@ -101,7 +77,7 @@
 <script>
 import { seckillByDay } from "@/api/promotion";
 export default {
-  data() {
+  data () {
    return {
      list: [], // 秒杀时段列表
      goodsList: [], // 商品列表
@@ -112,19 +88,19 @@ export default {
      nowHour: new Date().getHours(), // 当前小时数
    };
  },
-  beforeDestroy() {
+  beforeDestroy () {
    // 销毁前清除定时器
    clearInterval(this.interval);
  },
  watch: {
-    currIndex(val) {
+    currIndex (val) {
      clearInterval(this.interval);
      this.interval = null;
      this.nowHour = new Date().getHours();
      this.countDown(val);
      this.goodsList = this.list[val].seckillGoodsList;
    },
-    diffSeconds(val) {
+    diffSeconds (val) {
      const hours = Math.floor(val / 3600);
      // 当前秒数 / 60，向下取整
      // 获取到所有分钟数 3600 / 60 = 60分钟
@@ -138,7 +114,7 @@ export default {
        clearInterval(this.interval);
        this.interval = null;
      }
-      function filteTime(time) {
+      function filteTime (time) {
        if (time < 10) {
          return "0" + time;
        } else {
@@ -148,7 +124,7 @@ export default {
    },
  },
  methods: {
-    getListByDay() {
+    getListByDay () {
      // 当天秒杀活动
      seckillByDay().then((res) => {
        if (res.success) {
@@ -158,7 +134,7 @@ export default {
        }
      });
    },
-    goGoodsDetail(skuId, goodsId) {
+    goGoodsDetail (skuId, goodsId) {
      // 跳转商品详情
      let routeUrl = this.$router.resolve({
        path: "/goodsDetail",
@@ -166,7 +142,7 @@ export default {
      });
      window.open(routeUrl.href, "_blank");
    },
-    countDown(currIndex) {
+    countDown (currIndex) {
      // 倒计时
      // 0点时间戳
      let zeroTime = new Date(new Date().toLocaleDateString()).getTime();
@@ -191,13 +167,14 @@ export default {
      }, 1000);
    },
  },
-  mounted() {
+  mounted () {
    this.getListByDay();
  },
 };
 </script>
 <style lang="scss" scoped>
@import "../../assets/styles/goodsList.scss";
+
 .goods-seckill-btn {
  position: absolute;
  right: 0;
@@ -209,20 +186,26 @@ export default {
  line-height: 35px;
  font-size: 14px;
  background-color: $theme_color;
+  margin-bottom: 1px;
+  margin-right: 1px;
 }
+
 .goods-seckill-btn-gray {
  background-color: #666;
 }
+
 .promotion-decorate::before,
 .promotion-decorate::after {
  background-image: url("/src/assets/images/sprite@2x.png");
 }
+
 .time-line {
  width: 1200px;
  height: 60px;
  margin: 0 auto;
  background-color: #fff;
  display: flex;
+
  li {
    padding: 0 30px;
    font-size: 16px;
@@ -231,9 +214,11 @@ export default {
    height: 100%;
    display: flex;
    align-items: center;
+
    &:hover {
      cursor: pointer;
    }
+
    .not-curr {
      border: 1px solid #999;
      border-radius: 20px;
@@ -243,37 +228,44 @@ export default {
      font-weight: normal;
    }
  }
+
  .currTimeline {
    background-color: $theme_color;
    color: #fff;
-    > div:nth-child(1) {
+
+    >div:nth-child(1) {
      font-size: 20px;
    }
-    > div:nth-child(2) {
+
+    >div:nth-child(2) {
      font-size: 14px;
      margin-left: 10px;
    }
  }
 }
+
 .goods-show-info1 {
-  width: 275px;
+  width: 290px;
  padding: 6px;
  margin: 10px 0px;
-  margin-left: 5px;
+  margin-left: 8px;
  position: relative;
  border: 1px solid #fff;
  cursor: pointer;
  background-color: #fff;
 }
+
 .goods-show-info1:hover {
  border: 1px solid #ccc;
  box-shadow: 0px 0px 15px #ccc;
 }
+
 .goods-show-img {
  display: flex;
  justify-content: center;
 }
+
 .ivu-progress-success .ivu-progress-bg {
-    background-color: #111fff;
+  background-color: #111fff;
 }
 </style>
--- a/buyer/src/pages/shopEntry/FirstApply.vue
+++ b/buyer/src/pages/shopEntry/FirstApply.vue
@@ -10,11 +10,8 @@
        />
      </FormItem>
      <FormItem prop="companyAddressIdPath" label="公司所在地">
-        <region
-          style="width: 250px"
-          @selected="selectedRegion"
-          :addressId="address"
-        />
+        <span>{{ form.companyAddressPath || '暂无地址' }}</span>
+        <Button type="default" style="margin-left: 10px;" @click="$refs.map.open()">选择</Button>
      </FormItem>
      <FormItem prop="companyAddress" label="公司详细地址">
        <Input
@@ -187,16 +184,18 @@
    <Modal title="View Image" v-model="visible">
      <img :src="previewPicture" v-if="visible" style="width: 100%" />
    </Modal>
+
+    <multipleMap ref="map" @callback="getAddress" />
  </div>
 </template>
 <script>
 import { applyFirst } from '@/api/shopentry';
 import * as RegExp from '@/plugins/RegExp.js';
-import region from '@/components/map/region.vue';
+import multipleMap from "@/components/map/multiple-map";
 import storage from '@/plugins/storage';
 import { commonUrl } from '@/plugins/request.js';
 export default {
-  components: { region },
+  components: { multipleMap },
  props: {
    content: {
      default: {},
@@ -209,7 +208,7 @@ export default {
      accessToken: {}, // 验证token
      visible: false, // 预览图片
      loading: false, // 加载状态
-      address: '', // 地址
+
      previewPicture: '', // 预览图片url
      form: { // 表单数据
        legalPhoto: [],
@@ -234,7 +233,7 @@ export default {
        ],
        companyPhone: [
          { required: true, message: '请填写公司电话' },
-          { pattern: RegExp.TEL, message: '请填写正确的号码' }
+          { pattern: RegExp.mobile, message: '请填写正确的号码' }
        ],
        companyEmail: [
          { required: true, message: '请填写电子邮箱' },
@@ -258,6 +257,19 @@ export default {
    };
  },
  methods: {
+    // 获取店铺地址
+    getAddress(val){
+      if(val.type === 'select'){
+        const paths = val.data.map(item => item.name).join(',')
+        const ids = val.data.map(item => item.id).join(',')
+        this.$set(this.form, 'companyAddressIdPath', ids)
+        this.$set(this.form, 'companyAddressPath', paths)
+      }else{
+        this.$set(this.form, 'companyAddressIdPath', val.data.addrId)
+        this.$set(this.form, 'companyAddressPath', val.data.addr)
+      }
+    },
+
    // 下一步
    next () {
      this.$refs.firstForm.validate((valid) => {
@@ -279,15 +291,7 @@ export default {
        }
      });
    },
-    // 地址选择回显
-    selectedRegion (item) {
-      this.$set(this.form, 'companyAddressIdPath', item[0].toString());
-      this.$set(
-        this.form,
-        'companyAddressPath',
-        item[1].toString().replace(/\s/g, '')
-      );
-    },
+
    // 上传之前
    beforeUpload () {
      this.uploadLoading = true;
@@ -354,7 +358,7 @@ export default {
      if (this.form.licencePhoto) {
        this.form.legalPhoto = this.content.legalPhoto.split(',');
        this.form.licencePhoto = this.content.licencePhoto.split(',');
-        this.address = this.form.companyAddressIdPath;
+
      }
    }
  }
--- a/buyer/src/pages/shopEntry/ShopEntry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -22,12 +22,15 @@
        <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
      </div>
      <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
+      &nbsp;
      <Button type="primary" @click='currentIndex = 0'
        v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
    </div>

    <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
-      <div class="agreeent-con" v-html="agreementCon"></div>
+      <Scroll :on-reach-bottom="handleReachBottom">
+        <div class="agreeent-con" v-html="agreementCon"></div>
+      </Scroll>

      <div slot="footer" style="text-align: center">
        <p>
@@ -39,6 +42,7 @@
  </div>
 </template>
 <script>
+
 import { agreement, applyStatus } from "@/api/shopentry";
 import firstApply from "./FirstApply";
 import secondApply from "./SecondApply";
@@ -68,6 +72,9 @@ export default {
      agreement().then((res) => {
        this.agreementCon = res.result.content;
      });
+    },
+    handleReachBottom(){
+
    },
    getData(status) {
      // 获取已填写店铺信息
@@ -146,8 +153,11 @@ export default {
    },
  },
  mounted() {
-    this.getData("init");
-    this.getArticle();
+
+      this.getData("init");
+      this.getArticle();
+
+
  },
 };
 </script>
@@ -162,7 +172,7 @@ export default {
  padding: 10px 20px;

  h1 {
-    
+
    margin-top: 20px;
  }
 }
@@ -172,6 +182,10 @@ export default {
 }
 .agreeent-con {
  max-height: 500px;
+  ::v-deep img{
+    max-width: 100%;
+
+  }
 }
 .success-page {
  height: 500px;
--- a/buyer/src/pages/shopEntry/ThirdApply.vue
+++ b/buyer/src/pages/shopEntry/ThirdApply.vue
@@ -60,24 +60,10 @@
          >
        </Select>
      </FormItem>
-      <FormItem prop="storeCenter" label="店铺定位">
-        <Button
-          type="info"
-          v-if="!form.storeCenter"
-          @click="$refs.liliMap.showMap = true"
-        >点击获取店铺定位</Button>
-        <Button
-          type="success"
-          v-else
-          @click="$refs.liliMap.showMap = true"
-        >已定位</Button>
-      </FormItem>
+
      <FormItem prop="storeAddressIdPath" label="店铺所在地">
-        <region
-          style="width: 250px"
-          @selected="selectedRegion"
-          :addressId="address"
-        />
+        <span>{{ form.storeAddressPath || '暂无地址' }}</span>
+        <Button type="default" style="margin-left: 10px;" @click="$refs.map.open()">选择</Button>
      </FormItem>
      <FormItem prop="storeAddressDetail" label="店铺详细地址">
        <Input
@@ -107,16 +93,20 @@
    <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>
+    <multipleMap ref="map" @callback="getAddress" />
  </div>
 </template>
 <script>
 import { applyThird } from '@/api/shopentry';
 import { getCategory } from '@/api/goods';
-import Map from '@/components/map/index';
+
 import storage from '@/plugins/storage';
 import { commonUrl } from '@/plugins/request.js';
-import region from '@/components/map/region.vue';
+
+
+import multipleMap from "@/components/map/multiple-map";
+
+
 export default {
  props: {
    content: {
@@ -124,7 +114,7 @@ export default {
      type: Object
    }
  },
-  components: { liliMap: Map, region },
+  components: { multipleMap },
  data () {
    return {
      loading: false, // 加载状态
@@ -132,7 +122,7 @@ export default {
      action: commonUrl + '/common/common/upload/file', // 上传地址
      accessToken: {}, // 验证token
      previewPicture: '', // 预览图片
-      address: '', // 回显地址
+
      visible: false, // 图片预览
      form: { // 表单数据
        storeLogo: []
@@ -217,12 +207,22 @@ export default {
      this.form[listName].splice(index, 1);
    },
    // 选择坐标回调
-    getAddress (item) {
-      this.$set(
-        this.form,
-        'storeCenter',
-        item.position.lng + ',' + item.position.lat
-      );
+    getAddress (val) {
+      if(val.type === 'select'){
+        const paths = val.data.map(item => item.name).join(',')
+        const ids = val.data.map(item => item.id).join(',')
+        this.$set(this.form, "storeAddressPath", paths);
+        this.$set(this.form, "storeAddressIdPath", ids);
+        this.form.storeCenter = val.data[val.data.length - 1].center
+      }else{
+        this.$set(this.form, "storeAddressPath", val.data.addr);
+        this.$set(this.form, "storeAddressIdPath", val.data.addrId);
+        this.$set(
+          this.form,
+          'storeCenter',
+          val.data.position.lng + ',' + val.data.position.lat
+        );
+      }
    },
    // 获取商品分类
    getCategoryList () {
@@ -230,15 +230,8 @@ export default {
        if (res.success) this.categoryList = res.result;
      });
    },
-    // 地址选择回显
-    selectedRegion (item) {
-      this.$set(this.form, 'storeAddressIdPath', item[0].toString());
-      this.$set(
-        this.form,
-        'storeAddressPath',
-        item[1].toString().replace(/\s/g, '')
-      );
-    }
+
+
  },
  mounted () {
    this.accessToken.accessToken = storage.getItem('accessToken');
@@ -253,7 +246,6 @@ export default {
      } else {
        this.form.storeLogo = [];
      }
-      this.address = this.form.storeAddressIdPath;
      this.$forceUpdate();
    }
    this.$refs.thirdForm.resetFields()
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -160,7 +160,7 @@ service.interceptors.response.use(
        Message.error(errorData.message || _message);
      }
    }
-    return Promise.reject(error);
+    return Promise.reject(errorData);
  }
 );

--- a/buyer/src/router/index.js
+++ b/buyer/src/router/index.js
@@ -88,7 +88,7 @@ const Home = (resolve) => require(["@/pages/user/Home"], resolve);

 const Merchant = (resolve) => require(["@/pages/Merchant"], resolve);
 const UserMain = (resolve) => require(["@/pages/home/Main"], resolve);
-
+const topic = (resolve) => require(["@/pages/Topic"], resolve);
 /**
 * 店铺入驻
 */
@@ -113,6 +113,11 @@ export default new Router({
      name: "Index",
      component: Index,
    },
+    {
+      path: "/topic", // 首页
+      name: "topic",
+      component: topic,
+    },
    {
      path: "/login", // 登陆
      name: "login",
--- a/buyer/vue.config.js
+++ b/buyer/vue.config.js
@@ -70,7 +70,7 @@ module.exports = {

    loaderOptions: {
      sass: {
-        data: `@import "@/assets/styles/global.scss";` //全局加载scss
+        additionalData: `@import "@/assets/styles/global.scss";` //全局加载scss
      },
      // 向 CSS 相关的 loader 传递选项
      less: {
--- a/buyer/yarn.lock
+++ b/buyer/yarn.lock
--- a/im/.env
+++ b/im/.env
@@ -0,0 +1,10 @@
+NODE_ENV=production
+VUE_APP_PREVIEW=false
+VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
+VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
+VUE_APP_COMMON=https://common-api.pickmall.cn
+VUE_APP_BUYER=https://buyer-api.pickmall.cn
+VUE_APP_SELLER=https://store-api.pickmall.cn
+VUE_APP_WEBSITE_NAME="LiLi IM"
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
--- a/im/.env.development
+++ b/im/.env.development
@@ -0,0 +1,10 @@
+NODE_ENV=development
+VUE_APP_PREVIEW=false
+VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
+VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
+VUE_APP_COMMON=https://common-api.pickmall.cn
+VUE_APP_BUYER=https://buyer-api.pickmall.cn
+VUE_APP_SELLER=https://store-api.pickmall.cn
+VUE_APP_WEBSITE_NAME="LiLi IM"
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
--- a/im/.gitignore
+++ b/im/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
--- a/im/LICENSE
+++ b/im/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 YuanDong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M20 24V17.0718L26 20.5359L32 24L26 27.4641L20 30.9282V24Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>`