Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

新增分销模块分销业绩详细信息补充
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp
2025-12-19 17:05:55 +08:00 · 2022-02-14 14:31:36 +08:00 · 2022-02-14 14:31:29 +08:00 · 2022-02-14 14:21:50 +08:00 · 2022-02-14 14:21:48 +08:00 · 2022-02-12 15:20:48 +08:00
167 changed files with 7324 additions and 10303 deletions
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,10 +2,23 @@
  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
    "version": "0.0",
    "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"app-plus" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
    ]
 }
--- a/App.vue
+++ b/App.vue
@@ -58,6 +58,10 @@ export default {
      this.checkArguments(); // 检测启动参数
    });
    // #endif
+
+    // #ifdef MP-WEIXIN
+    this.applyUpdateWeChat();
+    // #endif
  },

  onShow() {
@@ -66,6 +70,33 @@ export default {
    // #endif
  },
  methods: {
+    /**
+     * 微信小程序版本提交更新版本 解决缓存问题
+     */
+    applyUpdateWeChat() {
+      const updateManager = uni.getUpdateManager();
+
+      updateManager.onCheckForUpdate(function (res) {
+        // 请求完新版本信息的回调
+      });
+
+      updateManager.onUpdateReady(function (res) {
+        uni.showModal({
+          title: "更新提示",
+          content: "发现新版本，是否重启应用？",
+          success(res) {
+            if (res.confirm) {
+              // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+              updateManager.applyUpdate();
+            }
+          },
+        });
+      });
+      updateManager.onUpdateFailed(function (res) {
+        // 新的版本下载失败
+      });
+    },
+
    //  TODO 开屏广告 后续优化添加
    launch() {
      try {
@@ -164,7 +195,7 @@ export default {

 <style lang="scss">
@import "uview-ui/index.scss";
-@import "./static/font/iconfont/iconfont.css";
+
 // -------适配底部安全区  苹果x系列刘海屏

 // #ifdef MP-WEIXIN
--- a/README.md
+++ b/README.md
@@ -1,110 +1,138 @@
-## Lilishop B2B2C商城系统
+## 🔥 Lilishop B2B2C商城系统
+
+##### 🌹  开源不易，如有帮助请点Star 
+
+
+
+#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，进群先看文档后提问）
+
+##### 交流 qq 1群 961316482（已满）
+
+##### 交流 qq 2群 875294241
+
+
+
+##### 商城 公众号/小程序体验，扫描二维码

-##### 官方公众号 & 开源不易，如有帮助请点Star
 ![image-20210511171611793](https://pickmall.cn/assets/imgs/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)


-### 介绍
+### 🔥 商城介绍
 **官网**：https://pickmall.cn

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

-产品前后端分离、支持分布式部署。
+业务兼容O2O商城/B2B商城/B2B2C商城/F2B2C商城/S2B2C商城。支持小程序商城、H5商城、APP商城、 PC商城。

-商城展示端包含 PC、H5、微信小程序、APP。
+
+商城前后端分离、支持分布式部署。

 商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块

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

-开箱即用，简单配置即可部署一套属于您的系统。
+##### 商城 API/消费者 聚合版
+api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转https://gitee.com/beijing_hongye_huicheng/lilishop-simplify

-### 文档
+### ☃️ 商城 开发/使用/常见问题 帮助文档

-**产品文档**（需求、架构、使用、部署、开发）：https://docs.pickmall.cn
+https://docs.pickmall.cn
+
+### 💧 开源商城项目地址(gitee)
+
+**API（商城所有API）**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
+
+**UI（商城管理端/商家端/买家PC端）**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+
+**uniapp（商城移动端，支持小程序/APP/H5）**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+
+**docker一键部署（商城部署脚本）**：https://gitee.com/beijing_hongye_huicheng/docker.git
+
+### 💧 开源商城项目地址(github)
+
+**API（商城所有API）**：https://github.com/hongyehuicheng/lilishop.git
+
+**UI（商城管理端/商家端/买家PC端）**： https://github.com/hongyehuicheng/lilishop-ui.git
+
+**uniapp（商城移动端，支持小程序/APP/H5）**：https://github.com/hongyehuicheng/lilishop-uniapp.git
+
+**docker一键部署（商城部署脚本）**：https://github.com/hongyehuicheng/docker.git


-### 项目链接(gitee)
+☃️ UI 项目下3个文件夹 buyer：买家PC端，seller：商家端，manager：后台管理端

-**Java后台**：https://gitee.com/beijing_hongye_huicheng/lilishop.git

-**Vue后台前端**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+### 💧 演示地址(手机验证码为 ‘111111’)

-**Uni-app**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+**商城管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456

-**docker一键部署**：https://gitee.com/beijing_hongye_huicheng/docker.git
+**商城店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111

-### 项目链接(github)
+**商城PC页面**：https://pc-b2b2c.pickmall.cn

-**Java后台**：https://github.com/hongyehuicheng/lilishop.git
+**商城移动端（请使浏览器手机模式，或者用手机浏览器打开）**：https://m-b2b2c.pickmall.cn

-**Vue后台前端**： https://github.com/hongyehuicheng/lilishop-ui.git
-
-**Uni-app**：https://github.com/hongyehuicheng/lilishop-uniapp.git
-
-**docker一键部署**：https://github.com/hongyehuicheng/docker.git
-
-### 演示地址
-
-**运营后台**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
-
-**店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
-
-**用户前台**：https://pc-b2b2c.pickmall.cn
-
-**移动端**：https://m-b2b2c.pickmall.cn
+**小程序/公众号**：扫描二维码

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

-### 3行命令搭建本地环境
+### 🚙 3行命令搭建本地商城（注：只能本机访问，如需调整，请自行操作镜像）

-温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
+温馨提示：由于服务中间件较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。

-##### 下载docker脚本
+
+
+#####  docker环境安装 [点击跳转](https://docs.pickmall.cn/deploy/%E8%BF%90%E8%A1%8C%E7%8E%AF%E5%A2%83%E5%87%86%E5%A4%87.html)
+
+
+
+##### 下载docker-compose脚本
 `git clone https://gitee.com/beijing_hongye_huicheng/docker.git `
-##### 部署基础环境
+
+##### 部署商城所需中间件
 `docker-compose up -d`

-##### 部署应用
+##### 部署商城应用
 `docker-compose -f docker-compose-application.yml up -d`



-PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
+PS:商城数据库单独部署 https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql 这里有与tag版本一致的sql，根据tag获取sql，如果使用master代码，则需要在lilishop项目根目录的DB目录中，获取对应的升级sql。

-##### 各个地址
+##### 商城 API/UI 地址

 | API           | 地址            |
 | -------------- | --------------- |
-| 买家API    | http://127.0.0.1:8888     |
-| 商家API     | http://127.0.0.1:8889      |
-| 管理端API       | http://127.0.0.1:8887   |
-| 通用API    | http://127.0.0.1:8890     |
+| 商城买家API  | http://127.0.0.1:8888     |
+| 商城商家API   | http://127.0.0.1:8889      |
+| 商城管理端API     | http://127.0.0.1:8887   |
+| 商城基础API  | http://127.0.0.1:8890     |

 | 前端演示         | 地址            |
 | -------------- | --------------- |
-| PC       | http://127.0.0.1:10000     |
-| WAP        | http://127.0.0.1:10001      |
-| 商家       | http://127.0.0.1:10002   |
-| 管理端       | http://127.0.0.1:10003     |
+| 商城PC端    | http://127.0.0.1:10000     |
+| 商城WAP端     | http://127.0.0.1:10001      |
+| 商城卖家端    | http://127.0.0.1:10002   |
+| 商城管理端     | http://127.0.0.1:10003     |





-### 功能列表
+### ⚾️ 功能列表



-#### 平台功能
+#### 🥎 商城平台功能

 ![平台功能](https://pickmall.cn/assets/imgs/other/managerList.jpg)



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

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

@@ -112,30 +140,28 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_



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



-#### 移动端
-
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="管理端功能展示" style="zoom:50%;" />
+#### ⚽️ 商城移动端

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



-#### 管理端
+#### ⚽️ 商城管理端

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


-### 技术选型
+### 商城技术选型

-#### 架构图
+#### 🥅 架构图

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

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

 | 说明           | 框架            | 说明           |               |
 | -------------- | --------------- | -------------- | ------------- |
@@ -149,7 +175,7 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 | 短信           | 阿里云短信      | 认证           | JWT           |
 | 日志处理       | Log4j           | 接口规范       | RESTful       |

-##### 前端-运营后台、店铺后台
+##### 🖥 前端-运营后台、店铺后台

 | 说明       | 框架       | 说明       | 框架    |
 | ---------- | ---------- | ---------- | ------- |
@@ -159,119 +185,34 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 | 基础UI库   | iView      | UI界面基于 | iView   |
 | 网络请求   | axios      |            |         |

-##### 前端-移动端
+##### 📱前端-移动端

 | 说明      | 架构    | 说明     | 架构    |
 | --------- | ------- | -------- | ------- |
 | 基础UI库  | uViewui | 基础框架 | uni-app |
 | CSS预处理 | scss    | 地图引擎 | amap    |

-### 升级计划
-
-#### 计划每个月发布一个版本，具体时间可能有出入
-
-时间：2021年6月15日
+### 🌟 版本升级

 ```
-新增功能：
-1.微信小程序直播
-2.优惠券活动
-3.新人赠券
-4.准确发券
-5.用户等级
-6.数据导出
-7.订单批量
-8.APP版本升级检测
-9.积分商城
-
-功能优化：
-1.优惠券有效期增加类型：设置领取后*内有效。
-2.秒杀活动设置为每天开启，需设置秒杀活动开启时间。
-3.店铺配送模板，配送地区如果选择省份则下方的市级地址不展示。
-4.店铺配送模板支持，店铺包邮。
-5.普通商品设置去除卖家承担运费。
+商城后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商

+后续会考虑推出微服务商城系统/商城中台等
 ```

-时间：2021年7月15日

-```
-新增功能：
-1.会员权益
-2.支持用户升级会员
-3.供求单
-4.IM：腾讯云智服
-5.服务商品
-6.店铺支持订单核销
-7.店铺自提点
-功能优化：
-1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
-```
-
-时间：2021年8月16日
-
-```
-新增功能：
-1.微淘功能
-2.店铺移动端
-3.店铺发货单
-```
-
-时间：2021年9月15日
-
-```
-新增功能：
-增加供应商功能
-```
-
-### 版本升级
-
-```
-后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
-
-后续会考虑推出微服务/中台等 企业级版本
-```
-
-### 技术亮点
-
-
-    1.后端框架基于Springboot，构建基于maven，持久层使用MyBatisPlus。使用elasticsearch、redis、mongodb、rocketmq 等各种中间健。都是主流架构，轻松应对各种环境。
-    
-    2.支持集群、分布式，支持docker 轻松部署，解决各种复杂场景！
-    
-    3.代码模块清晰，主要分为三端api（买家、卖家、管理），各端API互相隔离，自己鉴权，自己操作业务。
-    
-    4.使用阿里开源的RocketMQ，基于mq解决各种并发场景，解决事务一致性，解决搞并发延迟场景问题。
-    
-    5.项目使用多级缓存，应用不同场景，redis缓存业务数据、mongodb缓存关系型多对多关系问题、nginx缓存高频访问低频修改的页面。
-    
-    6.支持各种联合登陆，支持各种客户端的支付问题，灵活配置灵活开启。
-    
-    7.内置完善的楼层装修机制，各种拖拉拽，维护跳转页面或外网，即便是一个什么都不懂的运营也可以轻松掌握。
-    
-    8.内置阿里短信接口，可以在线申请短信模版。内置阿里oss系统，可以对文件执行各种操作。oss商家端资源相互隔离。
-    
-    10.强大的统计报表，统计效果，可以实现各个场景，包含在线人数，历史在线人数，活跃人数等信息。
-    
-    11.标准Api接口、提供swagger文档，快速二开。
-    
-    12.分布式调度任务中心，解决分布式定时任务多次执行问题。
-    
-    13.代码注释完善，快速上手。
-    
-    14.非移动端采用IView框架，各种自定义插件、选择器实现。移动端采用uniapp，一次编写，全端使用
-    
-    15.已经对接好各种第三方插件，支持各种复杂等联合登陆，联合支付等场景。
-
-
-### 开源须知
+### ⚠️ 开源须知
 1.仅允许用于个人学习研究使用.

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

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

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

-**QQ群**：961316482
+
+### 🐧 交流群
+
+##### 官方qq 1群 961316482（已满）
+##### 官方qq 2群 875294241

--- a/api/address.js
+++ b/api/address.js
@@ -12,13 +12,14 @@ import api from "@/config/api.js";
 */
 export function getAddressList(pageNumber, pageSize) {
  return http.request({
-    url: "/memberAddress",
+    url: "/member/address",
    method: Method.GET,
    needToken: true,
    params: { pageNumber, pageSize },
  });
 }

+
 /**
 * 获取物流公司
 */
@@ -36,7 +37,7 @@ export function getLogistics() {
 */
 export function getAddressCode(cityCode, townName) {
  return http.request({
-    url: api.common + "/region/region",
+    url: api.common + "/common/region/region",
    method: Method.GET,
    needToken: true,
    params: { cityCode, townName },
@@ -50,7 +51,7 @@ export function getAddressCode(cityCode, townName) {
 */
 export function addAddress(data) {
  return http.request({
-    url: "/memberAddress",
+    url: "/member/address",
    method: Method.POST,
    needToken: true,
    header: { "content-type": "application/x-www-form-urlencoded" },
@@ -66,7 +67,7 @@ export function addAddress(data) {
 */
 export function editAddress(params) {
  return http.request({
-    url: `/memberAddress`,
+    url: `/member/address`,
    method: Method.PUT,
    needToken: true,
    header: { "content-type": "application/x-www-form-urlencoded" },
@@ -80,7 +81,7 @@ export function editAddress(params) {
 */
 export function deleteAddress(id) {
  return http.request({
-    url: `/memberAddress/delById/${id}`,
+    url: `/member/address/delById/${id}`,
    method: Method.DELETE,
    needToken: true,
  });
@@ -94,7 +95,7 @@ export function deleteAddress(id) {
 */
 export function getAddressDetail(id) {
  return http.request({
-    url: `/memberAddress/get/${id}`,
+    url: `/member/address/get/${id}`,
    method: Method.GET,
    loading: false,
    needToken: true,
@@ -106,7 +107,7 @@ export function getAddressDetail(id) {
 */
 export function getAddressDefault() {
  return http.request({
-    url: `/memberAddress/get/default`,
+    url: `/member/address/get/default`,
    method: Method.GET,
    loading: false,
    needToken: true,
--- a/api/after-sale.js
+++ b/api/after-sale.js
@@ -34,16 +34,29 @@ export function applyCancelOrder(params) {
  });
 }

+/**
 /**
 * 获取商家售后收件地址
 */
-export function getstoreAfterSaleAddress(sn) {
+export function getStoreAfterSaleAddress(sn) {
  return http.request({
-    url: `/afterSale/getStoreAfterSaleAddress/${sn}`,
+    url: `/order/afterSale/getStoreAfterSaleAddress/${sn}`,
    method: Method.GET,
    needToken: true,
  });
 }
+/**
+ * 取消售后
+ */
+export function cancelAfterSale(afterSaleSn) {
+  return http.request({
+    url: `/order/afterSale/cancel/${afterSaleSn}`,
+    method: Method.POST,
+    needToken: true,
+  });
+}
+
+

 /**
 * 获取售后服务记录相关数据
@@ -51,7 +64,7 @@ export function getstoreAfterSaleAddress(sn) {
 */
 export function getAfterSaleList(params) {
  return http.request({
-    url: `/afterSale/page`,
+    url: `/order/afterSale/page`,
    method: Method.GET,
    needToken: true,
    params,
@@ -64,7 +77,7 @@ export function getAfterSaleList(params) {
 */
 export function getServiceDetail(sn) {
  return http.request({
-    url: `/afterSale/get/${sn}`,
+    url: `/order/afterSale/get/${sn}`,
    method: Method.GET,
    needToken: true,
  });
@@ -76,7 +89,7 @@ export function getServiceDetail(sn) {
 */
 export function addComplain(params) {
  return http.request({
-    url: `/complain`,
+    url: `/order/complain`,
    method: Method.POST,
    needToken: true,
    header: {
@@ -91,7 +104,7 @@ export function addComplain(params) {
 */
 export function clearComplain(id, params) {
  return http.request({
-    url: `/complain/status/${id}`,
+    url: `/order/complain/status/${id}`,
    method: Method.PUT,
    needToken: true,
    params,
@@ -103,7 +116,7 @@ export function clearComplain(id, params) {
 */
 export function getAfterSaleLog(sn) {
  return http.request({
-    url: `/afterSale/get/getAfterSaleLog/${sn}`,
+    url: `/order/afterSale/get/getAfterSaleLog/${sn}`,
    method: Method.GET,
    needToken: true,
  });
@@ -114,7 +127,7 @@ export function getAfterSaleLog(sn) {
 */
 export function getComplain(params) {
  return http.request({
-    url: `/complain`,
+    url: `/order/complain`,
    method: Method.GET,
    needToken: true,
    params,
@@ -126,7 +139,7 @@ export function getComplain(params) {
 */
 export function getAfterSaleReason(serviceType) {
  return http.request({
-    url: `/afterSale/get/afterSaleReason/${serviceType}`,
+    url: `/order/afterSale/get/afterSaleReason/${serviceType}`,
    method: Method.GET,
    needToken: true,
  });
@@ -137,7 +150,7 @@ export function getAfterSaleReason(serviceType) {
 */
 export function getClearReason() {
  return http.request({
-    url: `/afterSale/get/afterSaleReason/CANCEL`,
+    url: `/order/afterSale/get/afterSaleReason/CANCEL`,
    method: Method.GET,
    needToken: true,
  });
@@ -148,7 +161,7 @@ export function getClearReason() {
 */
 export function getComplainReason() {
  return http.request({
-    url: `/afterSale/get/afterSaleReason/COMPLAIN`,
+    url: `/order/afterSale/get/afterSaleReason/COMPLAIN`,
    method: Method.GET,
    needToken: true,
  });
@@ -158,7 +171,7 @@ export function getComplainReason() {
 */
 export function getComplainDetail(id) {
  return http.request({
-    url: `/complain/${id}`,
+    url: `/order/complain/${id}`,
    method: Method.GET,
    needToken: true,
  });
@@ -169,7 +182,7 @@ export function getComplainDetail(id) {
 */
 export function getAfterSaleInfo(sn) {
  return http.request({
-    url: `/afterSale/applyAfterSaleInfo/${sn}`,
+    url: `/order/afterSale/applyAfterSaleInfo/${sn}`,
    method: Method.GET,
    needToken: true,
  });
@@ -181,7 +194,7 @@ export function getAfterSaleInfo(sn) {
 */
 export function applyReturn(orderItemSn, params) {
  return http.request({
-    url: `/afterSale/save/${orderItemSn}`,
+    url: `/order/afterSale/save/${orderItemSn}`,
    method: Method.POST,
    header: {
      "Content-Type": "application/x-www-form-urlencoded",
@@ -197,7 +210,7 @@ export function applyReturn(orderItemSn, params) {
 */
 export function fillShipInfo(afterSaleSn, params) {
  return http.request({
-    url: `/afterSale/delivery/${afterSaleSn}`,
+    url: `/order/afterSale/delivery/${afterSaleSn}`,
    method: Method.POST,
    header: {
      "Content-Type": "application/x-www-form-urlencoded",
--- a/api/article.js
+++ b/api/article.js
@@ -23,7 +23,7 @@ export function getArticleCategory(category_type) {
 */
 export function getArticleDetail(type) {
  return http.request({
-    url: `/article/type/${type}`,
+    url: `/other/article/get/${type}`,
    method: Method.GET,
  });
 }
--- a/api/common.js
+++ b/api/common.js
@@ -1,26 +1,32 @@
-/**
- * 公共API
- */
-import {http, Method} from '@/utils/request.js';
-import api from '@/config/api.js';
-
-
-
-/**
- * 获取地区数据
- * @param id
- */
-export function getRegionsById(id = 0) {
-  return http.request({
-    url: `${api.common}/region/item/${id}`,
-    method: Method.GET,
-    message: false,
-  });
-}
-
-/**
- * 文件上传地址
- * @type {string}
- */
-export const upload =api.common+'/upload/file';
-
+/**
+ * 公共API
+ */
+import { http, Method } from "@/utils/request.js";
+import api from "@/config/api.js";
+
+/**
+ * 获取地区数据
+ * @param id
+ */
+export function getRegionsById(id = 0) {
+  return http.request({
+    url: `${api.common}/common/region/item/${id}`,
+    method: Method.GET,
+    message: false,
+  });
+}
+
+// 获取IM接口前缀
+export function getIMDetail() {
+  return http.request({
+    url: `${api.common}/IM`,
+    method: Method.GET,
+    message: false,
+  });
+}
+
+/**
+ * 文件上传地址
+ * @type {string}
+ */
+export const upload = api.common + "/common/upload/file";
--- a/api/goods.js
+++ b/api/goods.js
@@ -9,7 +9,7 @@ import { http, Method } from "@/utils/request.js";
 */
 export function getGoodsMessage(goodsId) {
  return http.request({
-    url: `/goods/get/${goodsId}`,
+    url: `/goods/goods/get/${goodsId}`,
    method: Method.GET,
  });
 }
@@ -19,7 +19,7 @@ import { http, Method } from "@/utils/request.js";
 */
 export function getGoodsRelated(params) {
  return http.request({
-    url: `/goods/es/related`,
+    url: `/goods/goods/es/related`,
    method: Method.GET,
    params,
  });
@@ -32,7 +32,7 @@ export function getGoodsRelated(params) {
 */
 export function getGoods(skuId, goodsId) {
  return http.request({
-    url: `/goods/sku/${goodsId}/${skuId}`,
+    url: `/goods/goods/sku/${goodsId}/${skuId}`,
    method: Method.GET,
  });
 }
@@ -43,7 +43,7 @@ export function getGoodsRelated(params) {
 */
 export function getGoodsDistribution(distributionId) {
  return http.request({
-    url: `/distribution/bindingDistribution/${distributionId}`,
+    url: `/distribution/distribution/bindingDistribution/${distributionId}`,
    method: Method.GET,
  });
 }
@@ -56,7 +56,7 @@ export function getGoodsRelated(params) {
 */
 export function getGoodsList(params) {
  return http.request({
-    url: "/goods/es",
+    url: "/goods/goods/es",
    method: Method.GET,
    params,
  });
@@ -112,23 +112,12 @@ export function getPlateformTagGoods(tag_id) {
 */
 export function getCategoryList(id) {
  return http.request({
-    url: `/category/get/${id}`,
+    url: `/goods/category/get/${id}`,
    method: Method.GET,
    loading: false,
  });
 }

-/**
- * 获取商品分类
- * @param parent_id
- */
-export function getCategory(parent_id = 0) {
-  return http.request({
-    url: `goods/categories/${parent_id}/children`,
-    method: Method.GET,
-    loading: false,
-  });
-}



@@ -137,7 +126,7 @@ export function getCategory(parent_id = 0) {
 */
 export function distribution() {
  return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
    method: Method.GET,
  });
 }
@@ -147,7 +136,7 @@ export function distribution() {
 */
 export function applyDistribution(params) {
  return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
    method: Method.POST,
    params,
  });
@@ -167,20 +156,23 @@ export function cash(params) {
 /**
 * 分销商提现历史
 */
-export function cashLog() {
+export function cashLog(params) {
  return http.request({
    url: `/distribution/cash`,
    method: Method.GET,
+    params
+
  });
 }

 /**
 * 获取分销商分页订单列表
 */
-export function distributionOrderList() {
+export function distributionOrderList(params) {
  return http.request({
-    url: `/distribution/distributionOrder`,
+    url: `/distribution/distribution/distributionOrder`,
    method: Method.GET,
+    params
  });
 }

@@ -189,7 +181,7 @@ export function distributionOrderList() {
 */
 export function distributionGoods(params) {
  return http.request({
-    url: `/distributionGoods`,
+    url: `/distribution/goods`,
    method: Method.GET,
    params,
  });
@@ -197,10 +189,11 @@ export function distributionGoods(params) {
 /**
 * 选择分销商品 分销商品id
 */
-export function checkedDistributionGoods(id) {
+export function checkedDistributionGoods(params) {
  return http.request({
-    url: `/distributionGoods/checked/${id}`,
+    url: `/distribution/goods/checked/${params.id}`,
    method: Method.GET,
+    params
  });
 }

@@ -209,7 +202,7 @@ export function checkedDistributionGoods(id) {
 */
 export function getMpCode(params){
  return http.request({
-    url:`/mini-program/mp/unlimited`,
+    url:`/passport/connect/miniProgram/mp/unlimited`,
    method:Method.GET,
    params
  })
@@ -220,7 +213,7 @@ export function checkedDistributionGoods(id) {
 */
 export function getMpScene(id){
  return http.request({
-    url:`/mini-program/mp/unlimited/scene?id=${id}`,
+    url:`/passport/connect/miniProgram/mp/unlimited/scene?id=${id}`,
    method:Method.GET,

  })
--- a/api/home.js
+++ b/api/home.js
@@ -30,12 +30,12 @@ export function getCategory(parent_id = 0) {
 * 获取热门关键词
 * @param num
 */
-export function getHotKeywords(start = 0, end = 10) {
+export function getHotKeywords(count) {
  return http.request({
-    url: "/goods/hot-words",
+    url: "/goods/goods/hot-words",
    method: Method.GET,
    loading: false,
-    params: { start, end },
+    params: { count },
  });
 }

@@ -46,7 +46,7 @@ export function getHotKeywords(start = 0, end = 10) {
 */
 export function getFloorData() {
  return http.request({
-    url: `/pageData/getIndex?clientType=H5`,
+    url: `/other/pageData/getIndex?clientType=H5`,
    method: "get",
  });
 }
@@ -56,7 +56,7 @@ export function getFloorData() {
 */
 export function getCategoryIndexData(parentId = 0) {
  return http.request({
-    url: `/category/get/${parentId}`,
+    url: `/goods/category/get/${parentId}`,
    method: "get",
  });
 }
--- a/api/login.js
+++ b/api/login.js
@@ -1,34 +1,28 @@
-import {
-	http
-} from "@/utils/request.js";
-
-
-import api from '@/config/api.js'
-
+import { http } from "@/utils/request.js";

+import api from "@/config/api.js";

 /**
 * 通过短信重置密码
 * @param  mobile
 */
 export function resetByMobile(params) {
-	return http.request({
-		url: `/members/resetByMobile`,
-		method: "POST",
-		params
-	});
+  return http.request({
+    url: `/passport/member/resetByMobile`,
+    method: "POST",
+    params,
+  });
 }

-
 /**
 * 发送验证码
 * @param  mobile
 */
-export function sendMobile(mobile) {
-	return http.request({
-		url: `${api.common}/sms/LOGIN/${mobile}`,
-		method: "GET",
-	});
+export function sendMobile(mobile,type='LOGIN') {
+  return http.request({
+    url: `${api.common}/common/sms/${type}/${mobile}`,
+    method: "GET",
+  });
 }

 /**
@@ -37,40 +31,46 @@ export function sendMobile(mobile) {
 * @param  smsCode
 */
 export function smsLogin(params, clientType) {
-	return http.request({
-		url: `/members/smsLogin`,
-		method: "POST",
-		data: params,
-		header: {
-			"content-type": "application/x-www-form-urlencoded",
-			"clientType": clientType
-		}
-	});
+  return http.request({
+    url: `/passport/member/smsLogin`,
+    method: "POST",
+    data: params,
+    header: {
+      "content-type": "application/x-www-form-urlencoded",
+      clientType: clientType,
+    },
+  });
 }

-
-
 /**
 * 修改密码
 * @param  newPassword
 * @param  password
 */

- export function modifyPass(params) {
-	return http.request({
-		url: `/members/modifyPass`,
-		method: "PUT",
-		params,
-	});
+export function modifyPass(params) {
+  return http.request({
+    url: `/passport/member/modifyPass`,
+    method: "PUT",
+    params,
+  });
 }

 /**
 * 刷新token
 */
 export function refreshTokenFn(refresh_token) {
-
-	return http.request({
-		url: `/members/refresh/${refresh_token}`,
-		method: "GET",
-	});
+  return http.request({
+    url: `/passport/member/refresh/${refresh_token}`,
+    method: "GET",
+  });
+}
+
+// 获取密码状态
+export function logout () {
+  return http.request({
+    url: '/passport/member/logout',
+    method: "POST",
+    needToken: true,
+  })
 }
--- a/api/members.js
+++ b/api/members.js
@@ -6,7 +6,7 @@ import { http, Method } from "@/utils/request.js";
 */
 export function feedBack(params) {
  return http.request({
-    url: "/feedback",
+    url: "/other/feedback",
    method: Method.POST,
    needToken: true,
    params,
@@ -16,7 +16,7 @@ export function feedBack(params) {
 // 提现
 export function withdrawalApply(params) {
  return http.request({
-    url: "/members/wallet/withdrawal",
+    url: "/wallet/wallet/withdrawal",
    method: Method.POST,
    needToken: true,
    params,
@@ -30,7 +30,7 @@ export function withdrawalApply(params) {
 */
 export function payCallback(params) {
  return http.request({
-    url: `/cashier/result`,
+    url: `/payment/cashier/result`,
    method: Method.GET,
    params,
  });
@@ -117,7 +117,7 @@ export function getPointsData(params) {
 */
 export function getComments(params) {
  return http.request({
-    url: "/memberEvaluation",
+    url: "/member/evaluation",
    method: Method.GET,
    needToken: true,
    params,
@@ -131,7 +131,7 @@ export function getComments(params) {
 */
 export function getFootprintNum(params) {
  return http.request({
-    url: "/footprint/getFootprintNum",
+    url: "/member/footprint/getFootprintNum",
    method: Method.GET,
    needToken: true,
    params,
@@ -144,7 +144,7 @@ export function getFootprintNum(params) {
 */
 export function commentsMemberOrder(params) {
  return http.request({
-    url: "/memberEvaluation",
+    url: "/member/evaluation",
    method: Method.POST,
    needToken: true,
    header: { "content-type": "application/x-www-form-urlencoded" },
@@ -206,7 +206,7 @@ export function getGoodsCollection(params, type) {
 * 收藏商品
 * @returns {AxiosPromise}
 */
-export function collectionGoods(id, type) {
+export function collectionGoods(type, id) {
  return http.request({
    url: `/member/collection/add/${type}/${id}`,
    method: Method.POST,
@@ -230,11 +230,23 @@ export function deleteGoodsCollection(ids) {
  });
 }

+/**
+ * 删除店铺收藏
+ * @param store_id
+ */
+export function deleteStoreCollection(store_id) {
+  return http.request({
+    url: `/member/collection/delete/STORE/${store_id}`,
+    method: Method.DELETE,
+    needToken: true,
+  });
+}
+
 /**
 * 获取商品是否被收藏
 * @param good_id
 */
-export function getGoodsIsCollect(good_id, type) {
+export function getGoodsIsCollect(type, good_id) {
  return http.request({
    url: `/member/collection/isCollection/${type}/${good_id}`,
    method: Method.GET,
@@ -257,25 +269,13 @@ export function collectionStore(store_id) {
  });
 }

-/**
- * 删除店铺收藏
- * @param store_id
- */
-export function deleteStoreCollection(store_id) {
-  return http.request({
-    url: `members/collection/store/${store_id}`,
-    method: Method.DELETE,
-    needToken: true,
-  });
-}
-
 /**
 * 获取当前登录的用户信息
 * @returns {AxiosPromise}
 */
 export function getUserInfo() {
  return http.request({
-    url: "/members",
+    url: "/passport/member",
    method: Method.GET,
    needToken: true,
  });
@@ -287,7 +287,7 @@ export function getUserInfo() {
 */
 export function getUserWallet() {
  return http.request({
-    url: "/members/wallet",
+    url: "/wallet/wallet",
    method: Method.GET,
    needToken: true,
  });
@@ -300,7 +300,7 @@ export function getUserWallet() {
 */
 export function saveUserInfo(params) {
  return http.request({
-    url: "/members/editOwn",
+    url: "/passport/member/editOwn",
    method: Method.PUT,
    header: { "content-type": "application/x-www-form-urlencoded" },
    needToken: true,
@@ -328,7 +328,7 @@ export function addReceipt(params) {
 */
 export function getGoodsComments(goodsId, params) {
  return http.request({
-    url: `/memberEvaluation/${goodsId}/goodsEvaluation`,
+    url: `/member/evaluation/${goodsId}/goodsEvaluation`,
    method: Method.GET,
    loading: false,
    params,
@@ -341,7 +341,7 @@ export function getGoodsComments(goodsId, params) {
 */
 export function getGoodsCommentsCount(goodsId) {
  return http.request({
-    url: `/memberEvaluation/${goodsId}/evaluationNumber`,
+    url: `/member/evaluation/${goodsId}/evaluationNumber`,
    method: Method.GET,
    loading: false,
  });
@@ -365,7 +365,7 @@ export function getNoReadMessageNum() {
 */
 export function myTrackList(params) {
  return http.request({
-    url: `/footprint`,
+    url: `/member/footprint`,
    method: Method.GET,
    needToken: true,
    params,
@@ -378,7 +378,7 @@ export function myTrackList(params) {
 */
 export function deleteHistoryListId(ids) {
  return http.request({
-    url: `/footprint/delByIds/${ids}`,
+    url: `/member/footprint/delByIds/${ids}`,
    method: Method.DELETE,
    needToken: true,
  });
--- a/api/order.js
+++ b/api/order.js
@@ -51,7 +51,7 @@ export function selectedShipMethod(params) {
 */
 export function getOrderList(params) {
  return http.request({
-    url: "/orders",
+    url: "/order/order",
    method: Method.GET,
    needToken: true,
    params,
@@ -64,7 +64,7 @@ export function getOrderList(params) {
 */
 export function getOrderDetail(orderSn) {
  return http.request({
-    url: `/orders/${orderSn}`,
+    url: `/order/order/${orderSn}`,
    method: Method.GET,
    needToken: true,
  });
@@ -77,7 +77,7 @@ export function getOrderDetail(orderSn) {
 */
 export function cancelOrder(orderSn, reason) {
  return http.request({
-    url: `/orders/${orderSn}/cancel`,
+    url: `/order/order/${orderSn}/cancel`,
    method: Method.POST,
    needToken: true,
    header: { "content-type": "application/x-www-form-urlencoded" },
@@ -91,7 +91,7 @@ export function cancelOrder(orderSn, reason) {
 */
 export function confirmReceipt(orderSn) {
  return http.request({
-    url: `/orders/${orderSn}/receiving`,
+    url: `/order/order/${orderSn}/receiving`,
    method: Method.POST,
    needToken: true,
  });
--- a/api/promotions.js
+++ b/api/promotions.js
@@ -13,7 +13,7 @@ export function getLiveList(params) {
  return http.request({
    url: `broadcast/studio`,
    method: Method.GET,
-    params
+    params,
  });
 }

@@ -51,13 +51,25 @@ export function getPointsCategory() {
 * 获取积分商城商品
 * @param params
 */
-export function getPointsGoods(params) {
+ export function getPointsGoods(params) {
  return http.request({
    url: "/promotion/pointsGoods",
    method: Method.GET,
    params,
  });
 }
+/**
+ * 获取积分商城商品详情
+ * @param params
+ */
+export function getPointsGoodsDetail(id) {
+  return http.request({
+    url: "/promotion/pointsGoods/"+id,
+    method: Method.GET,
+  });
+}
+
+

 /**
 * 获取限时抢购时间线 当天限时抢购信息
@@ -91,3 +103,86 @@ export function getAllCoupons(params) {
    params,
  });
 }
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainList(params) {
+  return http.request({
+    url: "/promotion/kanjiaGoods",
+    method: Method.GET,
+    params,
+  });
+}
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainDetail(id) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/${id}`,
+    method: Method.GET,
+  });
+}
+
+/**
+ * 获取砍价活动
+ * @param params
+ */
+export function getBargainActivity(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity`,
+    method: Method.POST,
+    params,
+  });
+}
+
+/**
+ * 发起砍价活动
+ * @param params
+ */
+export function openBargain(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods`,
+    method: Method.POST,
+    header: { "content-type": "application/x-www-form-urlencoded" },
+    data: params,
+  });
+}
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+export function getBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity/logs`,
+    method: Method.GET,
+    data: params,
+  });
+}
+
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+ export function helpBargain(kanJiaActivityId) {
+  return http.request({
+    url: `promotion/kanjiaGoods/help/${kanJiaActivityId}`,
+    method: Method.POST,
+  });
+}
+
+/**
+ * 分页获取已参与的砍价活动
+ */
+export function getMineBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/kanjiaActivity/mine/`,
+    method: Method.GET,
+    params
+  });
+}
+
+
--- a/api/store.js
+++ b/api/store.js
@@ -4,11 +4,14 @@

 import {http, Method} from '@/utils/request.js';

+
+
+
 /**
 * 获取店铺列表
 * @param params
 */
-export function getstoreList(params) {
+export function getStoreList(params) {
  return http.request({
    url: '/store',
    method: Method.GET,
@@ -20,10 +23,37 @@ export function getstoreList(params) {
 * 获取店铺基本信息
 * @param storeId
 */
-export function getstoreBaseInfo(storeId) {
+ export function getStoreBaseInfo(storeId) {
  return http.request({
-    url: `/store/get/detail/${storeId}`,
+    url: `/store/store/get/detail/${storeId}`,
    method: Method.GET,
    loading: false,
  });
-}
+}
+
+/**
+ * 获取店铺分类
+ * @param id
+ */
+ export function getStoreCategory(id) {
+  return http.request({
+    url: `/store/store/label/get/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+/**
+ * 营业执照
+ * @param id
+ */
+ export function getLicencePhoto(id) {
+  return http.request({
+    url: `/store/store/get/licencePhoto/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+
+
--- a/api/trade.js
+++ b/api/trade.js
@@ -177,7 +177,7 @@ export function createTrade(params) {
 */
 export function getCashierData(params) {
  return http.request({
-    url: "cashier/tradeDetail",
+    url: "payment/cashier/tradeDetail",
    method: Method.GET,
    needToken: true,
    params,
@@ -194,7 +194,7 @@ export function getCashierData(params) {
 */
 export function initiatePay(paymentMethod, paymentClient, params) {
  return http.request({
-    url: `cashier/pay/${paymentMethod}/${paymentClient}`,
+    url: `payment/cashier/pay/${paymentMethod}/${paymentClient}`,
    method: Method.GET,
    needToken: true,
    params,
@@ -209,7 +209,7 @@ export function initiatePay(paymentMethod, paymentClient, params) {
 */
 export function getExpress(orderSn) {
  return http.request({
-    url: `/orders/getTraces/${orderSn}`,
+    url: `/order/order/getTraces/${orderSn}`,
    method: Method.POST,
    needToken: true,
   
--- a/components/m-buy/README.md
+++ b/components/m-buy/README.md
@@ -0,0 +1,3 @@
+## 购买组件
+1.本组件是砍价，积分购买，参团等复用组
+2.后续会将此组件和商品购买组件合并，文档后续再出
--- a/pages/product/product/popup/goods.vue
+++ b/pages/product/product/popup/goods.vue
@@ -1,33 +1,48 @@
 <template>
  <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode" :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+    <u-popup
+      class="popup"
+      v-model="buyMask"
+      :height="setup.height"
+      closeable
+      :mode="setup.mode"
+      :border-radius="setup.radius"
+      @close="closeMask()"
+    >
      <!-- 商品 -->
      <view class="goods-box bottom">
        <view class="goods-header">
          <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx" :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+            <u-image
+              width="200rpx"
+              border-radius="20"
+              class="uimage"
+              height="200rpx"
+              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"
+            ></u-image>
          </view>
          <view class="goods-skus">
-
            <!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
+            <view class="goods-price" v-if="goodsDetail.promotionPrice && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
              <span v-if="goodsDetail.promotionPrice && !pointDetail">
                ￥
-                <span class="goods-price-promotionShow goods-price-bigshow">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{
+                  formatPrice(goodsDetail.promotionPrice)[0]
+                }}</span>
                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
              </span>
              <span v-if="pointDetail.points">
-
-                <span class="goods-price-promotionShow goods-price-bigshow">{{ pointDetail.points }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow">{{
+                  pointDetail.points
+                }}</span>
                积分
              </span>
              <div class="promotion-box">
                ￥
                <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
+                  formatPrice(goodsDetail.price)[0]
+                }}</span>
                .{{ formatPrice(goodsDetail.price)[1] }}
-
              </div>
            </view>
            <!-- 正常商品的价格 -->
@@ -35,10 +50,9 @@
              <span>
                ￥
                <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
+                  formatPrice(goodsDetail.price)[0]
+                }}</span>
                .{{ formatPrice(goodsDetail.price)[1] }}
-
              </span>
            </view>
            <view class="goods-check-skus">
@@ -51,26 +65,63 @@
          </view>
        </view>
        <!-- 商品信息 -->
-        <view class="goods-skus-box">
+        <scroll-view class="goods-skus-box" :scroll-y="true">
          <!-- 规格 -->
-          <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
+          <view
+            class="goods-skus-view"
+            :key="specIndex"
+            v-for="(spec, specIndex) in formatList"
+          >
            <view class="skus-view-list">
              <view class="view-class-title">{{ spec.name }}</view>
-              <view :class="{ active: spec_val.id == currentSelceted[specIndex] }" class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
+
+              <!-- 正常逻辑 循环出sku -->
+              <view
+                v-if="!parentOrder"
+                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+                class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values"
+                :key="spec_index"
+                @click="handleClickSpec(spec, specIndex, spec_val)"
+                >{{ spec_val.value }}
+              </view>
+
+              <!-- 拼团购买，仅筛选出当前拼团类型商品 -->
+              <view
+                v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+                class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values"
+                :key="spec_index"
+                @click="handleClickSpec(spec, specIndex, spec_val)"
+                >{{ spec_val.value }}
+              </view>
            </view>
          </view>
          <!-- 数量 -->
          <view class="goods-skus-number">
            <view class="view-class-title">数量</view>
-            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width" :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
+            <u-number-box
+              :bg-color="numberBox.bgColor"
+              :max="200"
+              :color="numberBox.color"
+              :input-width="numberBox.width"
+              :input-height="numberBox.height"
+              :size="numberBox.size"
+              :min="1"
+              v-model="num"
+            >
            </u-number-box>
          </view>
-        </view>
+        </scroll-view>
        <!-- 按钮 -->
        <view class="btns">
-
-          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'" @click="addToCartOrBuy('cart')">加入购物车</view>
+          <view
+            class="box-btn card"
+            v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
+            @click="addToCartOrBuy('cart')"
+            >加入购物车</view
+          >
          <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
        </view>
      </view>
@@ -80,6 +131,7 @@
 <script>
 import * as API_trade from "@/api/trade.js";
 import setup from "./popup";
+
 export default {
  data() {
    return {
@@ -101,22 +153,45 @@ export default {
      formatList: [],
      currentSelceted: [],
      skuList: "",
-      isMask: false, //是否显示遮罩层
      isClose: false, //是否可以点击遮罩关闭
    };
  },
-  props: [
-    "goodsDetail", //商品详情
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-    "pointDetail", // 积分详情
-  ],
+  props: {
+    buyMask: {
+      type: Boolean,
+      default: false,
+    },
+	isGroup: {
+	  type: Boolean,
+	  default: false,
+	},
+    goodsDetail: {
+      default: "",
+      type: null,
+    },
+    selectedSku: {
+      default: "",
+      type: null,
+    },
+    goodsSpec: {
+      default: "",
+      type: null,
+    },
+    addr: {
+      default: "",
+      type: null,
+    },
+    pointDetail: {
+      default: "",
+      type: null,
+    },
+  },
  watch: {
    buyType: {
      handler(val) {
-        this.buyType = val;
+        if (val) {
+          this.buyType = val;
+        }
      },
      immediate: true,
    },
@@ -129,8 +204,6 @@ export default {
  },

  methods: {
-  
-
    // 格式化金钱  1999 --> [1999,00]
    formatPrice(val) {
      if (typeof val == "undefined") {
@@ -145,12 +218,12 @@ export default {

    /**点击规格 */
    handleClickSpec(val, index, specValue) {
-      this.$set(this.currentSelceted, index, specValue.id);
+      this.currentSelceted[index] = specValue.value;
      let selectedSkuId = this.goodsSpec.find((i) => {
        let matched = true;
        let specValues = i.specValues.filter((j) => j.specName !== "images");
        for (let n = 0; n < specValues.length; n++) {
-          if (specValues[n].specValueId !== this.currentSelceted[n]) {
+          if (specValues[n].specValue !== this.currentSelceted[n]) {
            matched = false;
            return;
          }
@@ -159,17 +232,45 @@ export default {
          return i;
        }
      });
+      if (selectedSkuId?.skuId) {
+        this.$set(this.currentSelceted, index, specValue.value);
+        this.selectSkuList = {
+          spec: {
+            specName: val.name,
+            specValue: specValue.value,
+          },
+          data: this.goodsDetail,
+        };
+        this.selectName = specValue.value;

-      this.selectSkuList = {
-        spec: {
-          specName: val.name,
-          specValue: specValue.value,
-        },
-        data: this.goodsDetail,
-      };
-      this.selectName = specValue.value;
+        this.$emit("handleClickSku", {
+          skuId: selectedSkuId.skuId,
+          goodsId: this.goodsDetail.goodsId,
+        });
+      } else {
+        uni.showToast({
+          title: "暂无该商品!",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },

-      this.$emit("handleClickSku", selectedSkuId.skuId, this.goodsDetail.id);
+    /**
+     * 直接购买
+     */
+    buy(data) {
+      API_trade.addToCart(data).then((res) => {
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/order/fillorder?way=${
+              data.cartType
+            }&addr=${""}&parentOrder=${encodeURIComponent(
+              JSON.stringify(this.parentOrder)
+            )}`,
+          });
+        }
+      });
    },

    /**
@@ -204,11 +305,9 @@ export default {
        // 判断是否拼团商品
        if (this.buyType) {
          data.cartType = "PINTUAN";
-        }
-        else if(this.goodsDetail.goodsType == 'VIRTUAL_GOODS'){
-            data.cartType = "VIRTUAL";
-        }
-        else {
+        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
+          data.cartType = "VIRTUAL";
+        } else {
          data.cartType = "BUY_NOW";
        }

@@ -217,9 +316,7 @@ export default {
            uni.navigateTo({
              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
                this.addr.id || ""
-              }&parentOrder=${encodeURIComponent(
-                JSON.stringify(this.parentOrder)
-              )}`,
+              }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`,
            });
          }
        });
@@ -227,16 +324,18 @@ export default {
    },
    formatSku(list) {
      // 格式化数据
-
      let arr = [{}];
+      
+      if(!Array.isArray(list)){
+        return false
+      }
      list.forEach((item, index) => {
        item.specValues.forEach((spec, specIndex) => {
-          let id = spec.specNameId;
          let name = spec.specName;
          let values = {
-            id: spec.specValueId,
            value: spec.specValue,
            quantity: item.quantity,
+            skuId: item.skuId,
          };
          if (name === "images") {
            return;
@@ -246,7 +345,9 @@ export default {
            if (
              arrItem.name == name &&
              arrItem.values &&
-              !arrItem.values.find((i) => i.id === values.id)
+              !arrItem.values.find((i) => {
+                return i.value === values.value;
+              })
            ) {
              arrItem.values.push(values);
            }
@@ -256,7 +357,6 @@ export default {
            });
            if (!keys.includes(name)) {
              arr.push({
-                id: id,
                name: name,
                values: [values],
              });
@@ -269,11 +369,12 @@ export default {
      this.formatList = arr;

      list.forEach((item) => {
+        // 默认选中
        if (item.skuId === this.goodsDetail.id) {
          item.specValues
            .filter((i) => i.specName !== "images")
            .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValueId;
+              this.currentSelceted[_index] = value.specValue;

              this.selectName = value.specValue;

@@ -286,13 +387,12 @@ export default {
      });

      this.skuList = list;
+      // console.log(" this.skuList", this.skuList)
    },
  },

  mounted() {
    this.formatSku(this.goodsSpec);
-
-    console.log(this.goodsDetail);
  },
 };
 </script>
@@ -326,10 +426,10 @@ export default {
 }

 .active {
-  background: $jd-light-color !important;
-  border: 2rpx solid $jd-color;
+  background: $price-light-color !important;
+  border: 2rpx solid $price-color;
  font-weight: bold;
-  color: $jd-color !important;
+  color: $price-color !important;
  box-sizing: border-box;
 }

@@ -381,7 +481,7 @@ export default {
 }

 .goods-price {
-  color: $jd-color;
+  color: $price-color;
  line-height: 80rpx;
  display: flex;
 }
--- a/pages/cart/payment/popup/popup.js
+++ b/pages/cart/payment/popup/popup.js
--- a/pages/cart/payment/popup/popup.scss
+++ b/pages/cart/payment/popup/popup.scss
@@ -14,7 +14,7 @@
    line-height: 80rpx;
    height: 80rpx;
    
-    background: $jd-color;
+    background: $price-color;
    color: #fff;
    border-radius: 200px;
    text-align: center;
--- a/components/m-goods-recommend/README.md
+++ b/components/m-goods-recommend/README.md
@@ -0,0 +1,10 @@
+## 商品推荐 
+
+
+### OBJECT 参数说明
+属性|说明|类型|必填
+---|---|---|---
+`title`|标题，用于顶部显示的内容|String|否
+`pageSize`|显示多少条数据，建议是2的倍数,默认为12条|*|否
+`categoryId`|分类id|Function|否
+`storeId`|卖家id，搜索店铺商品的时候使用|String|否
--- a/components/m-goods-recommend/index.vue
+++ b/components/m-goods-recommend/index.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div class="goods-recommend">{{title ? `--${title}-- `:''}}</div>
+    <div class="goods-list">
+      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
+        <div class="goods-img">
+          <u-image :src="item.content.thumbnail" mode="aspectFill" height="350rpx" width="100%">
+            <u-loading slot="loading"></u-loading>
+          </u-image>
+        </div>
+        <div class="goods-desc">
+          <div class="goods-title">
+            {{ item.content.goodsName }}
+          </div>
+          <div class="goods-bottom">
+            <div class="goods-price">￥{{ item.content.price | unitPrice }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGoodsList } from "@/api/goods.js";
+export default {
+  data() {
+    return {
+      goodsList: [],
+      params: {
+        pageNumber: 1,
+      },
+    };
+  },
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    pageSize: {
+      type: null,
+      default: 12,
+    },
+    categoryId: {
+      type: null,
+      default: "",
+    },
+    storeId: {
+      type: null,
+      default: "",
+    },
+  },
+  mounted() {
+    this.initGoods();
+  },
+  methods: {
+    /**
+     * 初始化商品
+     */
+    async initGoods() {
+      let submit = JSON.parse(
+        JSON.stringify(
+          Object.assign(this.params, {
+            pageSize: this.pageSize,
+            categoryId: this.categoryId,
+            storeId: this.storeId,
+          })
+        )
+      );
+
+      Object.keys(submit).map((key) => {
+        if (!submit[key] || submit[key].length == 0) {
+          delete submit[key];
+        }
+      });
+      let goodsList = await getGoodsList(submit);
+      this.goodsList.push(...goodsList.data.result.content);
+    },
+    handleClick(item) {
+      uni.navigateTo({
+        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/**商品代码 */
+$w_94: 94%;
+.goods-recommend {
+  background: #f7f7f7;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 30rpx;
+  font-weight: bold;
+}
+.goods-list {
+  display: flex;
+  flex-wrap: wrap;
+  background: #f7f7f7;
+}
+.goods-item {
+  width: 50%;
+  margin-bottom: 10px;
+  border-radius: 0.4em;
+  overflow: hidden;
+}
+.goods-img {
+  position: relative;
+  margin: 0 auto;
+  width: $w_94;
+  height: 350rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  overflow: hidden;
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.goods-desc {
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  width: $w_94;
+  background: #fff;
+  padding: 8rpx 0 8rpx 8rpx;
+  margin: 0 auto;
+  > .goods-title {
+    font-size: 12px;
+    height: 70rpx;
+    display: -webkit-box;
+    font-weight: 500;
+    -webkit-box-orient: vertical;
+
+    -webkit-line-clamp: 2;
+
+    overflow: hidden;
+  }
+
+  > .goods-bottom {
+    display: flex;
+    font-weight: bold;
+
+    > .goods-price {
+      line-height: 2;
+      color: $main-color;
+    }
+  }
+}
+</style>
--- a/components/m-search-revision/m-search-revision.vue
+++ b/components/m-search-revision/m-search-revision.vue
@@ -1,20 +1,21 @@
 <template>
  <view class="serach">
    <view class="left-box" @tap="onClickLeft">
-      <uni-icons style="line-height:70rpx" type="back" size="24" />
+      <u-icon name="arrow-left" size="40" color="#666"></u-icon>
    </view>
    <view class="content" :style="{ 'border-radius': radius + 'px' }">
      <!-- HM修改 增加进入输入状态的点击范围 -->
      <view class="content-box" :class="{ center: mode === 2 }">
        <u-icon name="search" size="32" style="padding:0 15rpx;"></u-icon>
        <!-- HM修改 增加placeholder input confirm-type confirm-->
-        <input style="width:100%; " :placeholder="placeholder" placeholder-class="placeholder-color" @input="inputChange" confirm-type="search" @confirm="triggerConfirm" class="input"
+        <input style="width:100%; " :placeholder="placeholder" placeholder-class="placeholder-color"
+          @input="inputChange" confirm-type="search" @confirm="triggerConfirm" class="input"
          :class="{ center: !active && mode === 2 }" :focus="isFocus" v-model="inputVal" @focus="focus" @blur="blur" />
        <u-icon name="close" v-if="isDelShow" style="padding:0 30rpx;" @click="clear"></u-icon>
      </view>
-      <view v-show="(active && show && button === 'inside') || (isDelShow && button === 'inside')" class="serachBtn" @click="search">搜索</view>
+
    </view>
-    <view v-if="button === 'outside'" class="button" :class="{ active: show || active }">
+    <view class="button active" >
      <view v-if="isShowSeachGoods !=true" class="button-item">
        <div @click="out()">取消</div>
      </view>
@@ -28,14 +29,7 @@
 </template>

 <script>
-import uniStatusBar from "../uni-status-bar/uni-status-bar.vue";
-import uniIcons from "../uni-icons/uni-icons.vue";
-
 export default {
-  components: {
-    uniStatusBar,
-    uniIcons,
-  },
  props: {
    mode: {
      value: Number,
@@ -50,15 +44,6 @@ export default {
      type: String,
      default: "",
    },
-    button: {
-      value: String,
-      default: "outside",
-    },
-    //
-    show: {
-      value: Boolean,
-      default: true,
-    },
    // 默认半径为60
    radius: {
      value: String,
@@ -131,7 +116,6 @@ export default {
      this.$emit("input", "");
      //this.$emit('search', '');//HM修改 清空内容时候不进行搜索
    },
-  

    /**
     * 回退到上一级
@@ -145,7 +129,7 @@ export default {
     */
    search() {
      if (!this.inputVal) {
-        if (!this.show && this.searchName == "取消") {
+        if (this.searchName == "取消") {
          uni.hideKeyboard();
          this.isFocus = false;
          this.active = false;
@@ -175,6 +159,9 @@ export default {
  font-size: $uni-font-size-base;

  .left-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
    width: 15%;
    /* #ifndef APP-NVUE */
    text-align: center;
@@ -225,19 +212,6 @@ export default {
        }
      }
    }
-
-    .serachBtn {
-      height: 100%;
-      flex-shrink: 0;
-      padding: 0 30rpx;
-      //HM修改 按钮背景色
-      background: linear-gradient(to right, grey, grey);
-      //background: $uni-color-success;
-      line-height: 60rpx;
-      color: #eee;
-      //border-left: 1px #ccc solid; //HM修改 去掉边框
-      transition: all 0.3s;
-    }
  }

  .button {
--- a/components/m-share/index.vue
+++ b/components/m-share/index.vue
@@ -58,13 +58,6 @@ export default {
  // 图片缩略图、 商品名称 、 type（goods,shop,pintuan) 拼团商品分享以及店铺分享

  props: ["thumbnail", "goodsName", "type", "goodsId", "link"],
-  // #ifdef MP-WEIXIN
-  onShareAppMessage(res) {
-    return {
-      imageUrl: this.thumbnail || require("@/static/logo.png"),
-    };
-  },
-  // #endif
  methods: {
    close() {
      this.$emit("close");
@@ -72,10 +65,14 @@ export default {
    // h5复制链接
    // #ifdef H5
    copyLink() {
-      let content =
-        this.configs.shareLink +
-        getCurrentPages()[getCurrentPages().length - 1].__page__.fullPath;
-
+      let content;
+      if (this.link) {
+        content = this.configs.shareLink + this.link;
+      } else {
+        content =
+          this.configs.shareLink +
+          getCurrentPages()[getCurrentPages().length - 1].__page__.fullPath;
+      }
      if (content === null || content === undefined) {
        content = "";
      } else content = content + "";
@@ -93,19 +90,24 @@ export default {
    },
    // #endif

+    shareTitle() {
+      let shareTitle;
+      if (this.type == "goods") {
+        shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
+      } else if (this.type == "shops") {
+        shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
+      } else if (this.type == "pintuan") {
+        shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
+      } else if (this.type == "kanjia") {
+        shareTitle = `请快来帮我砍一刀${this.goodsName}`;
+      }
+      return shareTitle;
+    },
+
    // #ifdef APP-PLUS
    handleShare(val) {
+      console.log("12312312")
      if (val.type <= 1) {
-        let shareTitle;
-
-        if (this.type == "goods") {
-          shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
-        } else if (this.type == "shops") {
-          shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
-        } else if (this.type == "pintuan") {
-          shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
-        }
-
        let scene; //  "WXSenceTimeline 朋友圈   WXSceneSession 微信好友"
        val.type == 1
          ? (scene = "WXSenceTimeline")
@@ -117,7 +119,7 @@ export default {
          imageUrl: this.thumbnail,
          type: 0,
          summary: this.goodsName,
-          title: shareTitle,
+          title: this.shareTitle(),
          success: function (res) {
            uni.showToast({
              title: "分享成功!",
--- a/components/ms-dropdown/dropdown-item.vue
+++ b/components/ms-dropdown/dropdown-item.vue
@@ -1,241 +0,0 @@
-<template>
-	<div class="dropdown-item">
-		<!-- selected -->
-		<view class="dropdown-item__selected" @click="changePopup">
-			<slot name="title" v-if="$slots.title"></slot>
-			<block v-else>
-				<view class="selected__name">
-					{{title ? title : selectItem.text}}
-				</view>
-				<!-- <view class="selected__icon"
-					  :class="showClass === 'show'? 'up' : 'down'"
-				>
-					<span class="iconfont">&#xe851;</span>
-				</view> -->
-			</block>
-		</view>
-		<view class="dropdown-item__content" :style="{top: contentTop + 'px'}" v-if="showList">
-			<!-- dropdown -->
-			<view :class="['list', showClass]">
-				<slot v-if="$slots.default"></slot>
-				<block v-else>
-					<view class="list__option" v-for="(item, index) in list" :key="index" @click="choose(item)">
-						<view>{{item.text}}</view>
-						<icon v-if="item.value === value" type="success_no_circle" size="26" />
-					</view>
-				</block>
-			</view>
-			<!-- dropdown-mask -->
-			
-			<!-- @touchmove 禁止滑动 -->
-			<view @touchmove.stop.prevent="moveHandle" :class="['dropdown-mask', showClass]" v-if="showList" @click="closePopup"></view>
-		</view>
-	</div>
-</template>
-
-<script>
-	export default {
-		components: {},
-		props: {
-			value: [Number, String, Object],
-			list: {
-				type: Array,
-				default: () => {
-					return []
-				}
-			},
-			title: [Number, String],
-			contentTopReduse: {
-				type: Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				showList: "",
-				showClass: '',
-				selectItem: {},
-				contentTop: 0
-			}
-		},
-		watch: {},
-		mounted() {
-			this.showList = this.active;
-			this.selectItem = this.list[this.value];
-			// document.addEventListener('click', e => {
-			// 	//this.$el 可以获取当前组件的容器节点
-			// 	if (!this.$el.contains(e.target)) {
-			// 		console.log('change');
-			// 		this.close()
-			// 	}
-			// });
-		},
-		methods: {
-			// 禁止滑动
-			moveHandle() {},
-			choose(item) {
-				this.selectItem = item
-				this.$emit('input', item.value)
-				this.closePopup()
-			},
-			changePopup() {
-				if (this.showList) {
-					this.closePopup()
-				} else {
-					this.openPopup()
-				}
-			},
-			openPopup() {
-				// this.$parent  -> dropdown-menu
-				this.$parent.$emit('close')
-				this.showList = true
-				this.$nextTick(() => {
-					this.getElementData('.dropdown-item__selected', (data) => {
-						this.contentTop = data[0].bottom - this.contentTopReduse;
-						this.showClass = 'show'
-					})
-				})
-			},
-			closePopup() {
-				this.showClass = ''
-				setTimeout(() => {
-					this.showList = false
-				}, 300)
-			},
-			close() {
-				this.showClass = ''
-				this.showList = false
-			},
-			getElementData(el, callback) {
-				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
-					callback(data[0]);
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@font-face {
-		font-family: 'iconfont';
-		/* project id 1564327 */
-		src: url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.eot');
-		src: url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.eot?#iefix') format('embedded-opentype'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.woff2') format('woff2'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.woff') format('woff'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.ttf') format('truetype'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.svg#iconfont') format('svg');
-	}
-
-	.iconfont {
-		font-family: "iconfont" !important;
-		font-size: 28rpx;
-		font-style: normal;
-		-webkit-font-smoothing: antialiased;
-		-webkit-text-stroke-width: 0.2px;
-		-moz-osx-font-smoothing: grayscale;
-	}
-
-	.line {
-		position: absolute;
-		height: 3px;
-		width: 100px;
-		background: #1abc9c;
-	}
-
-	.dropdown-item {
-		position: relative;
-
-		&__selected {
-			position: relative;
-			display: flex;
-			align-items: center;
-			background: transparent;
-			// padding: 10rpx;
-			box-sizing: border-box;
-			justify-content: center;
-
-			.selected__name {
-				font-size: 32rpx;
-				white-space: nowrap;
-				position: relative;
-
-			}
-
-			.selected__icon {
-				margin-left: 8rpx;
-
-				&.down {
-					transition: transform .3s;
-					transform: rotateZ(0);
-				}
-
-				&.up {
-					transition: transform .3s;
-					transform: rotateZ(-180deg);
-				}
-			}
-		}
-
-		&__content {
-			position: fixed;
-			left: 0;
-			right: 0;
-			overflow: hidden;
-			top: 0;
-			bottom: 0;
-			z-index: 10;
-
-			.list {
-				max-height: 400px;
-				overflow-y: auto;
-				position: absolute;
-				left: 0;
-				right: 0;
-				z-index: 3;
-				background: #fff;
-				transform: translateY(-100%);
-				transition: all .3s;
-
-				&.show {
-					transform: translateY(0);
-				}
-
-				&__option {
-					font-size: 32rpx;
-					padding: 26rpx 28rpx;
-					display: flex;
-					justify-content: space-between;
-
-					&:not(:last-child) {
-						border-bottom: 1rpx solid #DDDDDD;
-					}
-				}
-			}
-
-			.dropdown-mask {
-				position: absolute;
-				left: 0;
-				right: 0;
-				top: 0;
-				bottom: 0;
-				transition: all .3s;
-				z-index: 2;
-
-				&.show {
-					background: rgba(0, 0, 0, 0.5);
-				}
-			}
-		}
-
-		&:not(:last-child):after {
-			content: ' ';
-			position: absolute;
-			width: 2rpx;
-			top: 36rpx;
-			bottom: 36rpx;
-			right: 0;
-			background: $uni-border-color;
-		}
-	}
-</style>
--- a/components/ms-dropdown/dropdown-menu.vue
+++ b/components/ms-dropdown/dropdown-menu.vue
@@ -1,35 +0,0 @@
-<template>
-	<div class="dropdown-menu">
-		<slot></slot>
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			}
-		},
-		mounted() {
-			this.$on('close', this.closeDropdown)
-		},
-		methods: {
-			closeDropdown() {
-				this.$children.forEach(item =>{
-					item.close();
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.dropdown-menu {
-		display: flex;
-		overflow: auto;
-		white-space: nowrap;
-	}
-	dropdown-item {
-		flex: 1;
-	}
-</style>
--- a/components/uni-badge/uni-badge.vue
+++ b/components/uni-badge/uni-badge.vue
@@ -1,151 +0,0 @@
-<template>
-	<text v-if="text" :class="inverted ? 'uni-badge--' + type + ' uni-badge--' + size + ' uni-badge--' + type + '-inverted' : 'uni-badge--' + type + ' uni-badge--' + size"
-	 :style="badgeStyle" class="uni-badge" @click="onClick()">{{ text }}</text>
-</template>
-
-<script>
-	/**
-	 * Badge 数字角标
-	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
-	 * @property {String} text 角标内容
-	 * @property {String} type = [default|primary|success|warning|error] 颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * @property {String} size = [normal|small] Badge 大小
-	 * 	@value normal 一般尺寸
-	 * 	@value small 小尺寸
-	 * @property {String} inverted = [true|false] 是否无需背景颜色
-	 * @event {Function} click 点击 Badge 触发事件
-	 * @example <uni-badge text="1"></uni-badge>
-	 */
-	export default {
-		name: 'UniBadge',
-		props: {
-			type: {
-				type: String,
-				default: 'default'
-			},
-			inverted: {
-				type: Boolean,
-				default: false
-			},
-			text: {
-				type: [String, Number],
-				default: ''
-			},
-			size: {
-				type: String,
-				default: 'normal'
-			}
-		},
-		data() {
-			return {
-				badgeStyle: ''
-			};
-		},
-		watch: {
-			text() {
-				this.setStyle()
-			}
-		},
-		mounted() {
-			this.setStyle()
-		},
-		methods: {
-			setStyle() {
-				this.badgeStyle = `width: ${String(this.text).length * 8 + 12}px`
-			},
-			onClick() {
-				this.$emit('click');
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$bage-size: 12px;
-	$bage-small: scale(0.8);
-	$bage-height: 20px;
-
-	.uni-badge {
-		/* #ifndef APP-PLUS */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		flex-direction: row;
-		height: $bage-height;
-		line-height: $bage-height;
-		color: $uni-text-color;
-		border-radius: 100px;
-		background-color: $uni-bg-color-hover;
-		background-color: transparent;
-		text-align: center;
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		font-size: $bage-size;
-		padding: 0px 6px;
-	}
-
-	.uni-badge--inverted {
-		padding: 0 5px 0 0;
-		color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default {
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default-inverted {
-		color: $uni-text-color-grey;
-		background-color: transparent;
-	}
-
-	.uni-badge--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-	}
-
-	.uni-badge--primary-inverted {
-		color: $uni-color-primary;
-		background-color: transparent;
-	}
-
-	.uni-badge--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-	}
-
-	.uni-badge--success-inverted {
-		color: $uni-color-success;
-		background-color: transparent;
-	}
-
-	.uni-badge--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-	}
-
-	.uni-badge--warning-inverted {
-		color: $uni-color-warning;
-		background-color: transparent;
-	}
-
-	.uni-badge--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-	}
-
-	.uni-badge--error-inverted {
-		color: $uni-color-error;
-		background-color: transparent;
-	}
-
-	.uni-badge--small {
-		transform: $bage-small;
-		transform-origin: center center;
-	}
-</style>
--- a/components/uni-drawer/uni-drawer.vue
+++ b/components/uni-drawer/uni-drawer.vue
@@ -1,170 +0,0 @@
-<template>
-	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
-		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
-		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Drawer 抽屉
-	 * @description 抽屉侧滑菜单
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
-	 * @property {Boolean} mask = [true | false] 是否显示遮罩
-	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
-	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
-	 * 	@value left 从左侧滑出
-	 * 	@value right 从右侧侧滑出
-	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
-	 * @event {Function} close 组件关闭时触发事件
-	 */
-	export default {
-		name: 'UniDrawer',
-		props: {
-			/**
-			 * 显示模式（左、右），只在初始化生效
-			 */
-			mode: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 蒙层显示状态
-			 */
-			mask: {
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 遮罩是否可点击关闭
-			 */
-			maskClick:{
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 抽屉宽度
-			 */
-			width: {
-				type: Number,
-				default: 220
-			}
-		},
-		data() {
-			return {
-				visibleSync: false,
-				showDrawer: false,
-				rightMode: false,
-				watchTimer: null,
-				drawerWidth: 220
-			}
-		},
-		created() {
-			// #ifndef APP-NVUE
-			this.drawerWidth = this.width
-			// #endif
-			this.rightMode = this.mode === 'right'
-		},
-		methods: {
-			clear(){},
-			close(type) {
-				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
-				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
-				this._change('showDrawer', 'visibleSync', false)
-			},
-			open() {
-				// fixed by mehaotian 处理重复点击打开的事件
-				if(this.visibleSync) return
-				this._change('visibleSync', 'showDrawer', true)
-			},
-			_change(param1, param2, status) {
-				this[param1] = status
-				if (this.watchTimer) {
-					clearTimeout(this.watchTimer)
-				}
-				this.watchTimer = setTimeout(() => {
-					this[param2] = status
-					this.$emit('change',status)
-				}, status ? 50 : 300)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	// 抽屉宽度
-	$drawer-width: 220px;
-
-	.uni-drawer {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		overflow: hidden;
-		z-index: 999;
-	}
-
-	.uni-drawer__content {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-		top: 0;
-		width: $drawer-width;
-		bottom: 0;
-		background-color: $uni-bg-color;
-		transition: transform 0.3s ease;
-	}
-
-	.uni-drawer--left {
-		left: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX(-$drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(-100%);
-		/* #endif */
-	}
-
-	.uni-drawer--right {
-		right: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX($drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(100%);
-		/* #endif */
-	}
-
-	.uni-drawer__content--visible {
-		transform: translateX(0px);
-	}
-
-
-	.uni-drawer__mask {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 0;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		transition: opacity 0.3s;
-	}
-
-	.uni-drawer__mask--visible {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 1;
-	}
-</style>
--- a/components/uni-icons/icons.js
+++ b/components/uni-icons/icons.js
@@ -1,132 +0,0 @@
-export default {
-	"pulldown": "\ue588",
-	"refreshempty": "\ue461",
-	"back": "\ue471",
-	"forward": "\ue470",
-	"more": "\ue507",
-	"more-filled": "\ue537",
-	"scan": "\ue612",
-	"qq": "\ue264",
-	"weibo": "\ue260",
-	"weixin": "\ue261",
-	"pengyouquan": "\ue262",
-	"loop": "\ue565",
-	"refresh": "\ue407",
-	"refresh-filled": "\ue437",
-	"arrowthindown": "\ue585",
-	"arrowthinleft": "\ue586",
-	"arrowthinright": "\ue587",
-	"arrowthinup": "\ue584",
-	"undo-filled": "\ue7d6",
-	"undo": "\ue406",
-	"redo": "\ue405",
-	"redo-filled": "\ue7d9",
-	"bars": "\ue563",
-	"chatboxes": "\ue203",
-	"camera": "\ue301",
-	"chatboxes-filled": "\ue233",
-	"camera-filled": "\ue7ef",
-	"cart-filled": "\ue7f4",
-	"cart": "\ue7f5",
-	"checkbox-filled": "\ue442",
-	"checkbox": "\ue7fa",
-	"arrowleft": "\ue582",
-	"arrowdown": "\ue581",
-	"arrowright": "\ue583",
-	"smallcircle-filled": "\ue801",
-	"arrowup": "\ue580",
-	"circle": "\ue411",
-	"eye-filled": "\ue568",
-	"eye-slash-filled": "\ue822",
-	"eye-slash": "\ue823",
-	"eye": "\ue824",
-	"flag-filled": "\ue825",
-	"flag": "\ue508",
-	"gear-filled": "\ue532",
-	"reload": "\ue462",
-	"gear": "\ue502",
-	"hand-thumbsdown-filled": "\ue83b",
-	"hand-thumbsdown": "\ue83c",
-	"hand-thumbsup-filled": "\ue83d",
-	"heart-filled": "\ue83e",
-	"hand-thumbsup": "\ue83f",
-	"heart": "\ue840",
-	"home": "\ue500",
-	"info": "\ue504",
-	"home-filled": "\ue530",
-	"info-filled": "\ue534",
-	"circle-filled": "\ue441",
-	"chat-filled": "\ue847",
-	"chat": "\ue263",
-	"mail-open-filled": "\ue84d",
-	"email-filled": "\ue231",
-	"mail-open": "\ue84e",
-	"email": "\ue201",
-	"checkmarkempty": "\ue472",
-	"list": "\ue562",
-	"locked-filled": "\ue856",
-	"locked": "\ue506",
-	"map-filled": "\ue85c",
-	"map-pin": "\ue85e",
-	"map-pin-ellipse": "\ue864",
-	"map": "\ue364",
-	"minus-filled": "\ue440",
-	"mic-filled": "\ue332",
-	"minus": "\ue410",
-	"micoff": "\ue360",
-	"mic": "\ue302",
-	"clear": "\ue434",
-	"smallcircle": "\ue868",
-	"close": "\ue404",
-	"closeempty": "\ue460",
-	"paperclip": "\ue567",
-	"paperplane": "\ue503",
-	"paperplane-filled": "\ue86e",
-	"person-filled": "\ue131",
-	"contact-filled": "\ue130",
-	"person": "\ue101",
-	"contact": "\ue100",
-	"images-filled": "\ue87a",
-	"phone": "\ue200",
-	"images": "\ue87b",
-	"image": "\ue363",
-	"image-filled": "\ue877",
-	"location-filled": "\ue333",
-	"location": "\ue303",
-	"plus-filled": "\ue439",
-	"plus": "\ue409",
-	"plusempty": "\ue468",
-	"help-filled": "\ue535",
-	"help": "\ue505",
-	"navigate-filled": "\ue884",
-	"navigate": "\ue501",
-	"mic-slash-filled": "\ue892",
-	"search": "\ue466",
-	"settings": "\ue560",
-	"sound": "\ue590",
-	"sound-filled": "\ue8a1",
-	"spinner-cycle": "\ue465",
-	"download-filled": "\ue8a4",
-	"personadd-filled": "\ue132",
-	"videocam-filled": "\ue8af",
-	"personadd": "\ue102",
-	"upload": "\ue402",
-	"upload-filled": "\ue8b1",
-	"starhalf": "\ue463",
-	"star-filled": "\ue438",
-	"star": "\ue408",
-	"trash": "\ue401",
-	"phone-filled": "\ue230",
-	"compose": "\ue400",
-	"videocam": "\ue300",
-	"trash-filled": "\ue8dc",
-	"download": "\ue403",
-	"chatbubble-filled": "\ue232",
-	"chatbubble": "\ue202",
-	"cloud-download": "\ue8e4",
-	"cloud-upload-filled": "\ue8e5",
-	"cloud-upload": "\ue8e6",
-	"cloud-download-filled": "\ue8e9",
-	"headphones":"\ue8bf",
-	"store":"\ue609"
-}
--- a/components/uni-icons/uni-icons.vue
+++ b/components/uni-icons/uni-icons.vue
--- a/components/uni-list-item/uni-list-item.vue
+++ b/components/uni-list-item/uni-list-item.vue
@@ -1,269 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-		<view :class="disabled ? 'uni-list-item--disabled' : ''" :hover-class="disabled || showSwitch ? '' : 'uni-list-item--hover'" class="uni-list-item" @click="onClick">
-			<view class="uni-list-item__container" :class="{ 'uni-list-item--first': isFirstChild }">
-				<view v-if="thumb" class="uni-list-item__icon"><image :src="thumb" class="uni-list-item__icon-img" /></view>
-				<view v-else-if="showExtraIcon" class="uni-list-item__icon">
-					<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" class="uni-icon-wrapper" />
-				</view>
-				<view class="uni-list-item__content">
-					<slot name="left"></slot>
-					<text class="uni-list-item__content-title">{{ title }}</text>
-					<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
-				</view>
-				<view class="uni-list-item__extra">
-					<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
-					<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
-					<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked" @change="onSwitchChange" />
-					<slot name="right"></slot>
-					<uni-icons v-if="showArrow" :size="20" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-import uniIcons from '../uni-icons/uni-icons.vue';
-import uniBadge from '../uni-badge/uni-badge.vue';
-
-/**
- * ListItem 列表子组件
- * @description 列表子组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=24
- * @property {String} title 标题
- * @property {String} note 描述
- * @property {String} thumb 左侧缩略图，若thumb有值，则不会显示扩展图标
- * @property {String} badgeText 数字角标内容
- * @property {String} badgeType 数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
- * @property {String} rightText 右侧文字内容
- * @property {Boolean} disabled = [true|false]是否禁用
- * @property {Boolean} showArrow = [true|false] 是否显示箭头图标
- * @property {Boolean} showBadge = [true|false] 是否显示数字角标
- * @property {Boolean} showSwitch = [true|false] 是否显示Switch
- * @property {Boolean} switchChecked = [true|false] Switch是否被选中
- * @property {Boolean} showExtraIcon = [true|false] 左侧是否显示扩展图标
- * @property {Boolean} scrollY = [true|false] 允许纵向滚动，需要显式的设置其宽高
- * @property {Object} extraIcon 扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
- * @event {Function} click 点击 uniListItem 触发事件
- * @event {Function} switchChange 点击切换 Switch 时触发
- */
-export default {
-	name: 'UniListItem',
-	components: {
-		uniIcons,
-		uniBadge
-	},
-	props: {
-		title: {
-			type: String,
-			default: ''
-		}, // 列表标题
-		note: {
-			type: String,
-			default: ''
-		}, // 列表描述
-		disabled: {
-			// 是否禁用
-			type: [Boolean, String],
-			default: false
-		},
-		showArrow: {
-			// 是否显示箭头
-			type: [Boolean, String],
-			default: true
-		},
-		showBadge: {
-			// 是否显示数字角标
-			type: [Boolean, String],
-			default: false
-		},
-		showSwitch: {
-			// 是否显示Switch
-			type: [Boolean, String],
-			default: false
-		},
-		switchChecked: {
-			// Switch是否被选中
-			type: [Boolean, String],
-			default: false
-		},
-		badgeText: {
-			// badge内容
-			type: String,
-			default: ''
-		},
-		badgeType: {
-			// badge类型
-			type: String,
-			default: 'success'
-		},
-		rightText: {
-			// 右侧文字内容
-			type: String,
-			default: ''
-		},
-		thumb: {
-			// 缩略图
-			type: String,
-			default: ''
-		},
-		showExtraIcon: {
-			// 是否显示扩展图标
-			type: [Boolean, String],
-			default: false
-		},
-		extraIcon: {
-			type: Object,
-			default() {
-				return {
-					type: 'contact',
-					color: '#000000',
-					size: 20
-				};
-			}
-		}
-	},
-	inject: ['list'],
-	data() {
-		return {
-			isFirstChild: false
-		};
-	},
-	mounted() {
-		if (!this.list.firstChildAppend) {
-			this.list.firstChildAppend = true;
-			this.isFirstChild = true;
-		}
-	},
-	methods: {
-		onClick() {
-			this.$emit('click');
-		},
-		onSwitchChange(e) {
-			this.$emit('switchChange', e.detail);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
-
-.uni-list-item {
-	font-size: $uni-font-size-lg;
-	position: relative;
-	flex-direction: column;
-	justify-content: space-between;
-}
-
-.uni-list-item--disabled {
-	opacity: 0.3;
-}
-
-.uni-list-item--hover {
-	background-color: $uni-bg-color-hover;
-}
-
-.uni-list-item__container {
-	line-height: 48rpx;
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	padding: $list-item-pd;
-	padding-left: 0;
-	flex: 1;
-	position: relative;
-	justify-content: space-between;
-	align-items: center;
-	/* #ifdef APP-PLUS */
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 0.5px;
-	/* #endif */
-}
-
-.uni-list-item--first {
-	border-top-width: 0px;
-}
-
-/* #ifndef APP-NVUE */
-.uni-list-item__container:after {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-}
-
-.uni-list-item--first:after {
-	height: 0px;
-}
-
-/* #endif */
-
-.uni-list-item__content {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex: 1;
-	overflow: hidden;
-	flex-direction: column;
-	color: #3b4144;
-}
-
-.uni-list-item__content-title {
-	font-size: $uni-font-size-base;
-	color: #3b4144;
-	overflow: hidden;
-}
-
-.uni-list-item__content-note {
-	margin-top: 6rpx;
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-	overflow: hidden;
-}
-
-.uni-list-item__extra {
-	// width: 25%;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: flex-end;
-	align-items: center;
-}
-
-.uni-list-item__icon {
-	display: flex;
-	margin-right: 18rpx;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	
-	margin-left: 20rpx;
-}
-
-.uni-list-item__icon-img {
-	// height: $uni-img-size-base;
-	// width: $uni-img-size-base;
-	height: 38rpx;
-	width: 38rpx;
-}
-
-.uni-list-item__extra-text {
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-}
-</style>
--- a/components/uni-list/uni-list.vue
+++ b/components/uni-list/uni-list.vue
@@ -1,75 +0,0 @@
-<template>
-	<!-- #ifndef APP-NVUE -->
-	<view class="uni-list">
-		<slot />
-	</view>
-	<!-- #endif -->
-	<!-- #ifdef APP-NVUE -->
-	<list class="uni-list" :enableBackToTop="enableBackToTop" loadmoreoffset="15" :scroll-y="scrollY" @loadmore="loadMore">
-		<slot />
-	</list>
-	<!-- #endif -->
-</template>
-
-<script>
-	/**
-	 * List 列表
-	 * @description 列表组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
-	 */
-	export default {
-		name: 'UniList',
-		'mp-weixin': {
-			options: {
-				multipleSlots: false
-			}
-		},
-		props: {
-			enableBackToTop: {
-				type: [Boolean, String],
-				default: false
-			},
-			scrollY: {
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		provide() {
-			return {
-				list: this
-			}
-		},
-		created() {
-			this.firstChildAppend = false
-		},
-		methods: {
-			loadMore(e) {
-				this.$emit("scrolltolower");
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-list {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		background-color: $uni-bg-color;
-		position: relative;
-		flex-direction: column;
-		// border-bottom-color: $uni-border-color;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list:before {
-		height: 0;
-	}
-
-	.uni-list:after {
-		height: 0;
-	}
-
-	/* #endif */
-</style>
--- a/components/uni-list/uni-refresh.vue
+++ b/components/uni-list/uni-refresh.vue
@@ -1,65 +0,0 @@
-<template>
-    <!-- #ifdef APP-NVUE -->
-    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
-        <slot />
-    </refresh>
-    <!-- #endif -->
-    <!-- #ifndef APP-NVUE -->
-    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
-        <slot />
-    </view>
-    <!-- #endif -->
-</template>
-
-<script>
-    export default {
-        name: 'UniRefresh',
-        props: {
-            display: {
-                type: [String],
-                default: "hide"
-            }
-        },
-        data() {
-            return {
-                pulling: false
-            }
-        },
-        computed: {
-            isShow() {
-                if (this.display === "show" || this.pulling === true) {
-                    return true;
-                }
-                return false;
-            }
-        },
-        created() {},
-        methods: {
-            onchange(value) {
-                this.pulling = value;
-            },
-            onrefresh(e) {
-                this.$emit("refresh", e);
-            },
-            onpullingdown(e) {
-                // #ifdef APP-NVUE
-                this.$emit("pullingdown", e);
-                // #endif
-                // #ifndef APP-NVUE
-                var detail = {
-                    viewHeight: 90,
-                    pullingDistance: e.height
-                }
-                this.$emit("pullingdown", detail);
-                // #endif
-            }
-        }
-    }
-</script>
-
-<style>
-    .uni-refresh {
-        height: 0;
-        overflow: hidden;
-    }
-</style>
--- a/components/uni-list/uni-refresh.wxs
+++ b/components/uni-list/uni-refresh.wxs
@@ -1,87 +0,0 @@
-var pullDown = {
-    threshold: 95,
-    maxHeight: 200,
-    callRefresh: 'onrefresh',
-    callPullingDown: 'onpullingdown',
-    refreshSelector: '.uni-refresh'
-};
-
-function ready(newValue, oldValue, ownerInstance, instance) {
-    var state = instance.getState()
-    state.canPullDown = newValue;
-    // console.log(newValue);
-}
-
-function touchStart(e, instance) {
-    var state = instance.getState();
-    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
-    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
-    if (!state.canPullDown) {
-        return
-    }
-
-    // console.log("touchStart");
-
-    state.height = 0;
-    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    state.refreshInstance.setStyle({
-        'height': 0
-    });
-    state.refreshInstance.callMethod("onchange", true);
-}
-
-function touchMove(e, ownerInstance) {
-    var instance = e.instance;
-    var state = instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    var oldHeight = state.height;
-    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    var height = endY - state.touchStartY;
-    if (height > pullDown.maxHeight) {
-        return;
-    }
-
-    var refreshInstance = state.refreshInstance;
-    refreshInstance.setStyle({
-        'height': height + 'px'
-    });
-
-    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
-    state.height = height;
-    refreshInstance.callMethod(pullDown.callPullingDown, {
-        height: height
-    });
-}
-
-function touchEnd(e, ownerInstance) {
-    var state = e.instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    state.refreshInstance.callMethod("onchange", false);
-
-    var refreshInstance = state.refreshInstance;
-    if (state.height > pullDown.threshold) {
-        refreshInstance.callMethod(pullDown.callRefresh);
-        return;
-    }
-
-    refreshInstance.setStyle({
-        'height': 0
-    });
-}
-
-function propObserver(newValue, oldValue, instance) {
-    pullDown = newValue;
-}
-
-module.exports = {
-    touchmove: touchMove,
-    touchstart: touchStart,
-    touchend: touchEnd,
-    propObserver: propObserver
-}
--- a/components/uni-notice-bar/uni-notice-bar.vue
+++ b/components/uni-notice-bar/uni-notice-bar.vue
@@ -1,395 +0,0 @@
-<template>
-	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
-		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" @click="close">
-			<uni-icons type="closeempty" :color="color" size="12" />
-		</view>
-		<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
-			<uni-icons type="sound" :color="color" size="14" />
-		</view>
-		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY -->
-		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closeempty" :color="color"
-		 size="12" @click="close" />
-		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color"
-		 size="14" />
-		<!-- #endif -->
-		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
-			<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
-				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
-				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
-			</view>
-		</view>
-		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more" @click="clickMore">
-			<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
-			<uni-icons type="arrowright" :color="moreColor" size="14" />
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	// #ifdef APP-NVUE
-	const dom = weex.requireModule('dom');
-	const animation = weex.requireModule('animation');
-	// #endif
-
-	/**
-	 * NoticeBar 自定义导航栏
-	 * @description 通告栏组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
-	 * @property {Number} speed 文字滚动的速度，默认100px/秒
-	 * @property {String} text 显示文字
-	 * @property {String} backgroundColor 背景颜色
-	 * @property {String} color 文字颜色
-	 * @property {String} moreColor 查看更多文字的颜色
-	 * @property {String} moreText 设置“查看更多”的文本
-	 * @property {Boolean} single = [true|false] 是否单行
-	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
-	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
-	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
-	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
-	 * @event {Function} click 点击 NoticeBar 触发事件
-	 * @event {Function} close 关闭 NoticeBar 触发事件
-	 * @event {Function} getmore 点击”查看更多“时触发事件
-	 */
-
-	export default {
-		name: 'UniNoticeBar',
-		components: {
-			uniIcons
-		},
-		props: {
-			text: {
-				type: String,
-				default: ''
-			},
-			moreText: {
-				type: String,
-				default: ''
-			},
-			backgroundColor: {
-				type: String,
-				default: '#fffbe8'
-			},
-			speed: {
-				// 默认1s滚动100px
-				type: Number,
-				default: 100
-			},
-			color: {
-				type: String,
-				default: '#de8c17'
-			},
-			moreColor: {
-				type: String,
-				default: '#999999'
-			},
-			single: {
-				// 是否单行
-				type: [Boolean, String],
-				default: false
-			},
-			scrollable: {
-				// 是否滚动，添加后控制单行效果取消
-				type: [Boolean, String],
-				default: false
-			},
-			showIcon: {
-				// 是否显示左侧icon
-				type: [Boolean, String],
-				default: false
-			},
-			showGetMore: {
-				// 是否显示右侧查看更多
-				type: [Boolean, String],
-				default: false
-			},
-			showClose: {
-				// 是否显示左侧关闭按钮
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		data() {
-			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			return {
-				textWidth: 0,
-				boxWidth: 0,
-				wrapWidth: '',
-				webviewHide: false,
-				// #ifdef APP-NVUE
-				stopAnimation: false,
-				// #endif
-				elId: elId,
-				elIdBox: elIdBox,
-				show: true,
-				animationDuration: 'none',
-				animationPlayState: 'paused',
-				animationDelay: '0s'
-			}
-		},
-		mounted() {
-			// #ifdef APP-PLUS
-			var pages = getCurrentPages();
-			var page = pages[pages.length - 1];
-			var currentWebview = page.$getAppWebview();
-			currentWebview.addEventListener('hide',()=>{
-				this.webviewHide = true
-			})
-			currentWebview.addEventListener('show',()=>{
-				this.webviewHide = false
-			})
-			// #endif
-			this.$nextTick(() => {
-				this.initSize()
-			})
-		},
-		// #ifdef APP-NVUE
-		beforeDestroy() {
-			this.stopAnimation = true
-		},
-		// #endif
-		methods: {
-			initSize() {
-				if (this.scrollable) {
-					// #ifndef APP-NVUE
-					let query = [],
-						boxWidth = 0,
-						textWidth = 0;
-					let textQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elId}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.textWidth = ret[0].width
-								resolve()
-							})
-					})
-					let boxQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elIdBox}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.boxWidth = ret[0].width
-								resolve()
-							})
-					})
-					query.push(textQuery)
-					query.push(boxQuery)
-					Promise.all(query).then(() => {
-						this.animationDuration = `${this.textWidth / this.speed}s`
-						this.animationDelay = `-${this.boxWidth / this.speed}s`
-						setTimeout(() => {
-							this.animationPlayState = 'running'
-						}, 1000)
-					})
-					// #endif
-					// #ifdef APP-NVUE
-					dom.getComponentRect(this.$refs['animationEle'], (res) => {
-						let winWidth = uni.getSystemInfoSync().windowWidth
-						this.textWidth = res.size.width
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${winWidth}px)`
-							},
-							duration: 0,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								animation.transition(this.$refs['animationEle'], {
-									styles: {
-										transform: `translateY(-${this.textWidth}px)`
-									},
-									timingFunction: 'linear',
-									duration: (this.textWidth - winWidth) / this.speed * 1000,
-									delay: 1000
-								}, () => {
-									if (!this.stopAnimation) {
-										this.loopAnimation()
-									}
-								});
-							}
-						});
-					})
-					// #endif
-				}
-				// #ifdef APP-NVUE
-				if (!this.scrollable && (this.single || this.moreText)) {
-					dom.getComponentRect(this.$refs['textBox'], (res) => {
-						this.wrapWidth = res.size.width
-					})
-				}
-				// #endif
-			},
-			loopAnimation() {
-				// #ifdef APP-NVUE
-				animation.transition(this.$refs['animationEle'], {
-					styles: {
-						transform: `translateY(0px)`
-					},
-					duration: 0
-				}, () => {
-					if (!this.stopAnimation) {
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${this.textWidth}px)`
-							},
-							duration: this.textWidth / this.speed * 1000,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								this.loopAnimation()
-							}
-						});
-					}
-				});
-				// #endif
-			},
-			clickMore() {
-				this.$emit('getmore')
-			},
-			close() {
-				this.show = false;
-				this.$emit('close')
-			},
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-	.uni-noticebar {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding: 6px 12px;
-		margin-bottom: 10px;
-	}
-
-	.uni-noticebar-close {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar-icon {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar__content-wrapper {
-		flex: 1;
-		flex-direction: column;
-		overflow: hidden;
-	}
-
-	.uni-noticebar__content-wrapper--single {
-		/* #ifndef APP-NVUE */
-		line-height: 18px;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-wrapper--single,
-	.uni-noticebar__content-wrapper--scrollable {
-		flex-direction: row;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-noticebar__content-wrapper--scrollable {
-		position: relative;
-		height: 18px;
-	}
-	/* #endif */
-
-	.uni-noticebar__content--scrollable {
-		/* #ifdef APP-NVUE */
-		flex: 0;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		flex: 1;
-		display: block;
-		overflow: hidden;
-		/* #endif */
-	}
-
-	.uni-noticebar__content--single {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex: none;
-		width: 100%;
-		justify-content: center;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text {
-		font-size: 14px;
-		line-height: 18px;
-		/* #ifndef APP-NVUE */
-		word-break: break-all;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text--single {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		display: block;
-		width: 100%;
-		white-space: nowrap;
-		/* #endif */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.uni-noticebar__content-text--scrollable {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		padding-left: 750rpx;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		position: absolute;
-		display: block;
-		height: 18px;
-		line-height: 18px;
-		white-space: nowrap;
-		padding-left: 100%;
-		animation: notice 10s 0s linear infinite both;
-		animation-play-state: paused;
-		/* #endif */
-	}
-
-	.uni-noticebar__more {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: nowrap;
-		align-items: center;
-		padding-left: 5px;
-	}
-
-	.uni-noticebar__more-text {
-		font-size: 14px;
-	}
-
-	@keyframes notice {
-		100% {
-			transform: translate3d(-100%, 0, 0);
-		}
-	}
-</style>
--- a/components/uni-popup/message.js
+++ b/components/uni-popup/message.js
@@ -1,29 +0,0 @@
-export default {
-	created() {
-		if (this.type === 'message') {
-			// 获取自组件对象
-			this.maskShow = false
-			this.children = null
-		}
-	},
-	created() {
-		if (this.type === 'message') {
-			// 不显示遮罩
-			this.maskShow = false 
-			// 获取子组件对象
-			this.childrenMsg = null
-		}
-	},
-	methods: {
-		customOpen() {
-			if (this.childrenMsg) {
-				this.childrenMsg.open()
-			}
-		},
-		customClose() {
-			if (this.childrenMsg) {
-				this.childrenMsg.close()
-			}
-		}
-	}
-}
--- a/components/uni-popup/popup.js
+++ b/components/uni-popup/popup.js
@@ -1,24 +0,0 @@
-import message from './message.js';
-// 定义 type 类型:弹出类型：top/bottom/center
-const config = {
-	// 顶部弹出
-	top:'top',
-	// 底部弹出
-	bottom:'bottom',
-	// 居中弹出
-	center:'center',
-	// 消息提示
-	message:'top',
-	// 对话框
-	dialog:'center',
-	// 分享
-	share:'bottom',
-}
-export default {
-	data(){
-		return {
-			config:config
-		}
-	},
-	mixins: [message],
-}
--- a/components/uni-popup/uni-popup-dialog.vue
+++ b/components/uni-popup/uni-popup-dialog.vue
@@ -1,243 +0,0 @@
-<template>
-	<view class="uni-popup-dialog">
-		<view class="uni-dialog-title">
-			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{title}}</text>
-		</view>
-		<view class="uni-dialog-content">
-			<text class="uni-dialog-content-text" v-if="mode === 'base'">{{content}}</text>
-			<input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus" >
-		</view>
-		<view class="uni-dialog-button-group">
-			<view class="uni-dialog-button" @click="close">
-				<text class="uni-dialog-button-text">取消</text>
-			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
-				<text class="uni-dialog-button-text uni-button-color">确定</text>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	/**
-	 * PopUp 弹出层-对话框样式
-	 * @description 弹出层-对话框样式
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} value input 模式下的默认值
-	 * @property {String} placeholder input 模式下输入提示
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} mode = [base|input] 模式、
-	 * 	@value base 基础对话框
-	 * 	@value input 可输入对话框
-	 * @property {String} content 对话框内容
-	 * @property {Boolean} beforeClose 是否拦截取消事件
-	 * @event {Function} confirm 点击确认按钮触发
-	 * @event {Function} close 点击取消按钮触发
-	 */
-
-	export default {
-		name: "uniPopupDialog",
-		props: {
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			placeholder: {
-				type: [String, Number],
-				default: '请输入内容'
-			},
-			/**
-			 * 对话框主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'error'
-			},
-			/**
-			 * 对话框模式 base/input
-			 */
-			mode: {
-				type: String,
-				default: 'base'
-			},
-			/**
-			 * 对话框标题
-			 */
-			title: {
-				type: String,
-				default: '提示'
-			},
-			/**
-			 * 对话框内容
-			 */
-			content: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 拦截取消事件 ，如果拦截取消事件，必须监听close事件，执行 done()
-			 */
-			beforeClose: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				dialogType: 'error',
-				focus: false,
-				val: ""
-			}
-		},
-		inject: ['popup'],
-		watch: {
-			type(val) {
-				this.dialogType = val
-			},
-			mode(val) {
-				if (val === 'input') {
-					this.dialogType = 'info'
-				}
-			},
-			value(val) {
-				this.val = val
-			}
-		},
-		created() {
-			// 对话框遮罩不可点击
-			this.popup.mkclick = false
-			if (this.mode === 'input') {
-				this.dialogType = 'info'
-				this.val = this.value
-			} else {
-				this.dialogType = this.type
-			}
-		},
-		mounted() {
-			this.focus = true
-		},
-		methods: {
-			/**
-			 * 点击确认按钮
-			 */
-			onOk() {
-				this.$emit('confirm', () => {
-					this.popup.close()
-					if (this.mode === 'input') this.val = this.value
-				}, this.mode === 'input' ? this.val : '')
-			},
-			/**
-			 * 点击取消按钮
-			 */
-			close() {
-				if (this.beforeClose) {
-					this.$emit('close', () => {
-						this.popup.close()
-					})
-					return
-				}
-				this.popup.close()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-popup-dialog {
-		width: 300px;
-		border-radius: 15px;
-		background-color: #fff;
-	}
-
-	.uni-dialog-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 15px;
-		padding-bottom: 5px;
-	}
-
-	.uni-dialog-title-text {
-		font-size: 16px;
-		font-weight: 500;
-	}
-
-	.uni-dialog-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 5px 15px 15px 15px;
-	}
-
-	.uni-dialog-content-text {
-		font-size: 14px;
-		color: #6e6e6e;
-	}
-
-	.uni-dialog-button-group {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		border-top-color: #f5f5f5;
-		border-top-style: solid;
-		border-top-width: 1px;
-	}
-
-	.uni-dialog-button {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		height: 45px;
-	}
-
-	.uni-border-left {
-		border-left-color: #f0f0f0;
-		border-left-style: solid;
-		border-left-width: 1px;
-	}
-
-	.uni-dialog-button-text {
-		font-size: 14px;
-	}
-
-	.uni-button-color {
-		color: $uni-color-primary;
-	}
-
-	.uni-dialog-input {
-		flex: 1;
-		font-size: 14px;
-	}
-
-	.uni-popup__success {
-		color: $uni-color-success;
-	}
-
-	.uni-popup__warn {
-		color: $uni-color-warning;
-	}
-
-	.uni-popup__error {
-		color: $uni-color-error;
-	}
-
-	.uni-popup__info {
-		color: #909399;
-	}
-</style>
--- a/components/uni-popup/uni-popup-message.vue
+++ b/components/uni-popup/uni-popup-message.vue
@@ -1,116 +0,0 @@
-<template>
-	<view class="uni-popup-message" :class="'uni-popup__'+[type]">
-		<text class="uni-popup-message-text" :class="'uni-popup__'+[type]+'-text'">{{message}}</text>
-	</view>
-</template>
-
-<script>
-	
-	/**
-	 * PopUp 弹出层-消息提示
-	 * @description 弹出层-消息提示
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} message 消息提示文字
-	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
-	 */
-	
-	export default {
-		name: 'UniPopupMessage',
-		props: {
-			/**
-			 * 主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'success'
-			},
-			/**
-			 * 消息文字
-			 */
-			message: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 显示时间，设置为 0 则不会自动关闭
-			 */
-			duration: {
-				type: Number,
-				default: 3000
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {}
-		},
-		created() {
-			this.popup.childrenMsg = this
-		},
-		methods: {
-			open() {
-				if (this.duration === 0) return
-				clearTimeout(this.popuptimer)
-				this.popuptimer = setTimeout(() => {
-					this.popup.close()
-				}, this.duration)
-			},
-			close() {
-				clearTimeout(this.popuptimer)
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-message {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		background-color: #e1f3d8;
-		padding: 10px 15px;
-		border-color: #eee;
-		border-style: solid;
-		border-width: 1px;
-	}
-	.uni-popup-message-text {
-		font-size: 14px;
-		padding: 0;
-	}
-
-	.uni-popup__success {
-		background-color: #e1f3d8;
-	}
-
-	.uni-popup__success-text {
-		color: #67C23A;
-	}
-
-	.uni-popup__warn {
-		background-color: #faecd8;
-	}
-
-	.uni-popup__warn-text {
-		color: #E6A23C;
-	}
-
-	.uni-popup__error {
-		background-color: #fde2e2;
-	}
-
-	.uni-popup__error-text {
-		color: #F56C6C;
-	}
-
-	.uni-popup__info {
-		background-color: #F2F6FC;
-	}
-
-	.uni-popup__info-text {
-		color: #909399;
-	}
-</style>
--- a/components/uni-popup/uni-popup-share.vue
+++ b/components/uni-popup/uni-popup-share.vue
@@ -1,165 +0,0 @@
-<template>
-	<view class="uni-popup-share">
-		<view class="uni-share-title"><text class="uni-share-title-text">{{title}}</text></view>
-		<view class="uni-share-content">
-			<view class="uni-share-content-box">
-				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
-					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
-					<text class="uni-share-text">{{item.text}}</text>
-				</view>
-
-			</view>
-		</view>
-		<view class="uni-share-button-box">
-			<button class="uni-share-button" @click="close">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniPopupShare',
-		props: {
-			title: {
-				type: String,
-				default: '分享到'
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {
-				bottomData: [{
-						text: '微信',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-2.png',
-						name: 'wx'
-					},
-					{
-						text: '支付宝',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-8.png',
-						name: 'wx'
-					},
-					{
-						text: 'QQ',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/gird-3.png',
-						name: 'qq'
-					},
-					{
-						text: '新浪',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-1.png',
-						name: 'sina'
-					},
-					{
-						text: '百度',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-7.png',
-						name: 'copy'
-					},
-					{
-						text: '其他',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-5.png',
-						name: 'more'
-					}
-				]
-			}
-		},
-		created() {},
-		methods: {
-			/**
-			 * 选择内容
-			 */
-			select(item, index) {
-				this.$emit('select', {
-					item,
-					index
-				}, () => {
-					this.popup.close()
-				})
-			},
-			/**
-			 * 关闭窗口
-			 */
-			close() {
-				this.popup.close()
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-share {
-		background-color: #fff;
-	}
-	.uni-share-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		height: 40px;
-	}
-	.uni-share-title-text {
-		font-size: 14px;
-		color: #666;
-	}
-	.uni-share-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 10px;
-	}
-	
-	.uni-share-content-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: wrap;
-		width: 360px;
-	}
-	
-	.uni-share-content-item {
-		width: 90px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		padding: 10px 0;
-		align-items: center;
-	}
-	
-	.uni-share-content-item:active {
-		background-color: #f5f5f5;
-	}
-	
-	.uni-share-image {
-		width: 30px;
-		height: 30px;
-	}
-	
-	.uni-share-text {
-		margin-top: 10px;
-		font-size: 14px;
-		color: #3B4144;
-	}
-	
-	.uni-share-button-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		padding: 10px 15px;
-	}
-	
-	.uni-share-button {
-		flex: 1;
-		border-radius: 50px;
-		color: #666;
-		font-size: 16px;
-	}
-	
-	.uni-share-button::after {
-		border-radius: 50px;
-	}
-</style>
--- a/components/uni-popup/uni-popup.vue
+++ b/components/uni-popup/uni-popup.vue
@@ -1,294 +0,0 @@
-<template>
-	<view v-if="showPopup" class="uni-popup" :class="[popupstyle]" @touchmove.stop.prevent="clear">
-		<uni-transition v-if="maskShow" :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans"
-		 @click="onTap" />
-		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
-			<view class="uni-popup__wrapper-box" @click.stop="clear">
-				<slot />
-			</view>
-		</uni-transition>
-	</view>
-</template>
-
-<script>
-	import uniTransition from '../uni-transition/uni-transition.vue'
-	import popup from './popup.js'
-	/**
-	 * PopUp 弹出层
-	 * @description 弹出层组件，为了解决遮罩弹层的问题
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [top|center|bottom] 弹出方式
-	 * 	@value top 顶部弹出
-	 * 	@value center 中间弹出
-	 * 	@value bottom 底部弹出
-	 * 	@value message 消息提示
-	 * 	@value dialog 对话框
-	 * 	@value share 底部分享示例
-	 * @property {Boolean} animation = [ture|false] 是否开启动画
-	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
-	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
-	 */
-
-	export default {
-		name: 'UniPopup',
-		components: {
-			uniTransition
-		},
-		props: {
-			// 开启动画
-			animation: {
-				type: Boolean,
-				default: true
-			},
-			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-			// message: 消息提示 ; dialog : 对话框
-			type: {
-				type: String,
-				default: 'center'
-			},
-			// maskClick
-			maskClick: {
-				type: Boolean,
-				default: true
-			}
-		},
-		provide() {
-			return {
-				popup: this
-			}
-		},
-		mixins: [popup],
-		watch: {
-			/**
-			 * 监听type类型
-			 */
-			type: {
-				handler: function(newVal) {
-					this[this.config[newVal]]()
-				},
-				immediate: true
-			},
-			/**
-			 * 监听遮罩是否可点击
-			 * @param {Object} val
-			 */
-			maskClick(val) {
-				this.mkclick = val
-			}
-		},
-		data() {
-			return {
-				duration: 300,
-				ani: [],
-				showPopup: false,
-				showTrans: false,
-				maskClass: {
-					'position': 'fixed',
-					'bottom': 0,
-					'top': 0,
-					'left': 0,
-					'right': 0,
-					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
-				},
-				transClass: {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				},
-				maskShow: true,
-				mkclick: true,
-				popupstyle: 'top'
-			}
-		},
-		created() {
-			this.mkclick = this.maskClick
-			if (this.animation) {
-				this.duration = 300
-			} else {
-				this.duration = 0
-			}
-		},
-		methods: {
-			clear(e) {
-				// TODO nvue 取消冒泡
-				e.stopPropagation()
-			},
-			open() {
-				this.showPopup = true
-				this.$nextTick(() => {
-					new Promise(resolve => {
-						clearTimeout(this.timer)
-						this.timer = setTimeout(() => {
-							this.showTrans = true
-							// fixed by mehaotian 兼容 app 端
-							this.$nextTick(() => {
-								resolve();
-							})
-						}, 50);
-					}).then(res => {
-						// 自定义打开事件
-						clearTimeout(this.msgtimer)
-						this.msgtimer = setTimeout(() => {
-							this.customOpen && this.customOpen()
-						}, 100)
-						this.$emit('change', {
-							show: true,
-							type: this.type
-						})
-					})
-				})
-			},
-			close(type) {
-				this.showTrans = false
-				this.$nextTick(() => {
-					this.$emit('change', {
-						show: false,
-						type: this.type
-					})
-					clearTimeout(this.timer)
-					// 自定义关闭事件
-					this.customOpen && this.customClose()
-					this.timer = setTimeout(() => {
-						this.showPopup = false
-					}, 300)
-				})
-			},
-			onTap() {
-				if (!this.mkclick) return
-				this.close()
-			},
-			/**
-			 * 顶部弹出样式处理
-			 */
-			top() {
-				this.popupstyle = 'top'
-				this.ani = ['slide-top']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				}
-			},
-			/**
-			 * 底部弹出样式处理
-			 */
-			bottom() {
-				this.popupstyle = 'bottom'
-				this.ani = ['slide-bottom']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-					'bottom': 0
-				}
-			},
-			/**
-			 * 中间弹出样式处理
-			 */
-			center() {
-				this.popupstyle = 'center'
-				this.ani = ['zoom-out', 'fade']
-				this.transClass = {
-					'position': 'fixed',
-					/* #ifndef APP-NVUE */
-					'display': 'flex',
-					'flexDirection': 'column',
-					/* #endif */
-					'bottom': 0,
-					'left': 0,
-					'right': 0,
-					'top': 0,
-					'justifyContent': 'center',
-					'alignItems': 'center'
-				}
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup {
-		position: fixed;
-		/* #ifndef APP-NVUE */
-		z-index: 99;
-		/* #endif */
-	}
-
-	.uni-popup__mask {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		opacity: 0;
-	}
-
-	.mask-ani {
-		transition-property: opacity;
-		transition-duration: 0.2s;
-	}
-
-	.uni-top-mask {
-		opacity: 1;
-	}
-
-	.uni-bottom-mask {
-		opacity: 1;
-	}
-
-	.uni-center-mask {
-		opacity: 1;
-	}
-
-	.uni-popup__wrapper {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-	}
-
-	.top {
-		/* #ifdef H5 */
-		top: var(--window-top);
-		/* #endif */
-		/* #ifndef H5 */
-		top: 0;
-		/* #endif */
-	}
-
-	.bottom {
-		bottom: 0;
-	}
-
-	.uni-popup__wrapper-box {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: relative;
-		/* iphonex 等安全区设置，底部安全区适配 */
-		/* #ifndef APP-NVUE */
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-	}
-
-	.content-ani {
-		// transition: transform 0.3s;
-		transition-property: transform, opacity;
-		transition-duration: 0.2s;
-	}
-
-
-	.uni-top-content {
-		transform: translateY(0);
-	}
-
-	.uni-bottom-content {
-		transform: translateY(0);
-	}
-
-	.uni-center-content {
-		transform: scale(1);
-		opacity: 1;
-	}
-</style>
--- a/components/uni-section/uni-section.vue
+++ b/components/uni-section/uni-section.vue
@@ -1,135 +0,0 @@
-<template>
-	<view class="uni-section" nvue>
-		<view v-if="type" class="uni-section__head">
-			<view :class="type" class="uni-section__head-tag" />
-		</view>
-		<view class="uni-section__content">
-			<text :class="{'distraction':!subTitle}" class="uni-section__content-title">{{ title }}</text>
-			<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
-		</view>
-		<slot />
-	</view>
-</template>
-
-<script>
-
-	/**
-	 * Section 标题栏
-	 * @description 标题栏
-	 * @property {String} type = [line|circle] 标题装饰类型
-	 * 	@value line 竖线
-	 * 	@value circle 圆形
-	 * @property {String} title 主标题
-	 * @property {String} subTitle 副标题
-	 */
-
-	export default {
-		name: 'UniTitle',
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			subTitle: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {}
-		},
-		watch: {
-			title(newVal) {
-				if (uni.report && newVal !== '') {
-					uni.report('title', newVal)
-				}
-			}
-		},
-		methods: {
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-section {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		margin-top: 10px;
-		flex-direction: row;
-		align-items: center;
-		padding: 0 10px;
-		height: 50px;
-		background-color: $uni-bg-color-grey;
-		/* #ifdef APP-NVUE */
-		border-bottom-color: $uni-border-color;
-		border-bottom-style: solid;
-		border-bottom-width: 0.5px;
-		/* #endif */
-		font-weight: normal;
-	}
-	/* #ifndef APP-NVUE */
-	.uni-section:after {
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: $uni-border-color;
-	}
-	/* #endif */
-
-	.uni-section__head {
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		margin-right: 10px;
-	}
-
-	.line {
-		height: 15px;
-		background-color: $uni-text-color-disable;
-		border-radius: 5px;
-		width: 3px;
-	}
-
-	.circle {
-		width: 8px;
-		height: 8px;
-		border-top-right-radius: 50px;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		border-bottom-right-radius: 50px;
-		background-color: $uni-text-color-disable;
-	}
-
-	.uni-section__content {
-		flex: 1;
-		color: $uni-text-color;
-	}
-
-	.uni-section__content-title {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
-	}
-
-	.distraction {
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-section__content-sub {
-		font-size: $uni-font-size-sm;
-		color: $uni-text-color-grey;
-	}
-</style>
--- a/components/uni-status-bar/uni-status-bar.vue
+++ b/components/uni-status-bar/uni-status-bar.vue
@@ -1,25 +0,0 @@
-<template>
-	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
-		<slot />
-	</view>
-</template>
-
-<script>
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
-	export default {
-		name: 'UniStatusBar',
-		data() {
-			return {
-				statusBarHeight: statusBarHeight
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-status-bar {
-		width: 750rpx;
-		height: 20px;
-		// height: var(--status-bar-height);
-	}
-</style>
--- a/components/uni-steps/uni-steps.vue
+++ b/components/uni-steps/uni-steps.vue
@@ -1,253 +0,0 @@
-<template>
-	<view class="uni-steps">
-		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
-			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
-				<view v-for="(item,index) in options" :key="index" :class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
-					<text v-if="direction=='column'" :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
-				</view>
-			</view>
-			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
-				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']" v-for="(item,index) in options"
-				 :key="index">
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
-					 :style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']" v-if="index === active">
-						<uni-icons :color="activeColor" type="checkbox-filled" size="14"></uni-icons>
-					</view>
-					<view :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']" v-else :style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
-					 :style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}"></view>
-					<!-- <view v-if="index==0 && direction!='column'" class="address">北京市</view>
-					<view v-if="options.length-1 == index && direction!='column'" class="address">太原市</view> -->
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	export default {
-		name: 'UniSteps',
-		components: {
-			uniIcons
-		},
-		props: {
-			direction: {
-				// 排列方向 row column
-				type: String,
-				default: 'row'
-			},
-			activeColor: {
-				// 激活状态颜色
-				type: String,
-				default: '#1aad19'
-			},
-			deactiveColor: {
-				// 未激活状态颜色
-				type: String,
-				default: '#999999'
-			},
-			active: {
-				// 当前步骤
-				type: Number,
-				default: 0
-			},
-			options: {
-				type: Array,
-				default () {
-					return []
-				}
-			} // 数据
-		},
-		data() {
-			return {}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-steps {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		flex: 1;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__column {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row-reverse;
-	}
-
-	.uni-steps__row-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-	}
-
-	.uni-steps__row-text {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.uni-steps__column-text {
-		padding: 6px 0px;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-		// border-bottom-color: $uni-border-color;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row-title {
-		font-size: 24rpx;
-		line-height: 16px;
-		text-align: center;
-	}
-
-	.uni-steps__column-title {
-		font-size: 24rpx;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-desc {
-		font-size: 12px;
-		line-height: 14px;
-		text-align: center;
-	}
-
-	.uni-steps__column-desc {
-		font-size: $uni-font-size-sm;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-container {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		width: 30px;
-		flex-direction: column;
-	}
-
-	.uni-steps__row-line-item {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-		height: 14px;
-		line-height: 14px;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		.address{
-			position: absolute;
-			top: 40rpx;
-			left: 60rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
-
-	.uni-steps__column-line-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-steps__row-line {
-		flex: 1;
-		height: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__column-line {
-		width: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__row-line--after {
-		transform: translateX(1px);
-	}
-
-	.uni-steps__column-line--after {
-		flex: 1;
-		transform: translate(0px, 1px);
-	}
-
-	.uni-steps__row-line--before {
-		transform: translateX(-1px);
-	}
-
-	.uni-steps__column-line--before {
-		height: 6px;
-		transform: translate(0px, -1px);
-	}
-
-	.uni-steps__row-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 0px 3px;
-	}
-
-	.uni-steps__column-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 4px 0px 5px 0px;
-	}
-
-	.uni-steps__row-check {
-		margin: 0px 6px;
-	}
-
-	.uni-steps__column-check {
-		height: 14px;
-		line-height: 14px;
-		margin: 2px 0px;
-	}
-</style>
--- a/components/uni-swiper-dot/uni-swiper-dot.vue
+++ b/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -1,184 +0,0 @@
-<template>
-	<view class="uni-swiper__warp">
-		<slot />
-		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
-			<view v-for="(item,index) in info" :style="{
-        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/3 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
-		</view>
-		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
-			<view v-for="(item,index) in info" :style="{
-        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item" />
-		</view>
-		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
-			<view v-for="(item,index) in info" :class="[index === current&&'uni-swiper__dots-long']" :style="{
-		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item " />
-		</view>
-		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
-			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
-		</view>
-		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
-			<view v-for="(item,index) in info" :style="{
-        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniSwiperDot',
-		props: {
-			info: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			current: {
-				type: Number,
-				default: 0
-			},
-			dotsStyles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 类型 ：default(默认) indexes long nav
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			// 只在 nav 模式下生效，变量名称
-			field: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				dots: {
-					width: 8,
-					height: 8,
-					bottom: 10,
-					color: '#fff',
-					backgroundColor: 'rgba(0, 0, 0, .3)',
-					border: '1px rgba(0, 0, 0, .3) solid',
-					selectedBackgroundColor: '#333',
-					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
-				}
-			}
-		},
-		watch: {
-			dotsStyles(newVal) {
-				this.dots = Object.assign(this.dots, this.dotsStyles)
-			},
-			mode(newVal) {
-				if (newVal === 'indexes') {
-					this.dots.width = 20
-					this.dots.height = 20
-				} else {
-					this.dots.width = 8
-					this.dots.height = 8
-				}
-			}
-
-		},
-		created() {
-			if (this.mode === 'indexes') {
-				this.dots.width = 20
-				this.dots.height = 20
-			}
-			this.dots = Object.assign(this.dots, this.dotsStyles)
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-swiper__warp {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.uni-swiper__dots-box {
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-item {
-		width: 8px;
-		border-radius: 100px;
-		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
-		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
-	}
-	
-	.uni-swiper__dots-item:first-child {
-		margin: 0;
-	}
-
-	.uni-swiper__dots-default {
-		border-radius: 100px;
-	}
-
-	.uni-swiper__dots-long {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-bar {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-nav {
-		bottom: 0px;
-		height: 40px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		background-color: rgba(0, 0, 0, 0.2);
-	}
-
-	.uni-swiper__dots-nav-item {
-		/* overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; */
-		font-size: $uni-font-size-base;
-		color: #fff;
-		margin: 0 15px;
-	}
-
-	.uni-swiper__dots-indexes {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex: 1;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-indexes-text {
-		color: #fff;
-		font-size: $uni-font-size-sm;
-	}
-</style>
--- a/components/uni-tag/uni-tag.vue
+++ b/components/uni-tag/uni-tag.vue
@@ -1,230 +0,0 @@
-<template>
-	<view :class="[
-      'uni-tag--' + type,
-      disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
-      inverted === true || inverted === 'true' ? type + '-uni-tag--inverted' : '',
-      circle === true || circle === 'true' ? 'uni-tag--circle' : '',
-      mark === true || mark === 'true' ? 'uni-tag--mark' : '',
-      'uni-tag--' + size
-    ]"
-	 @click="onClick()" class="uni-tag" v-if="text">
-		<text :class="[type === 'default' ? 'uni-tag--default':'uni-tag-text',inverted === true || inverted === 'true' ? 'uni-tag-text--'+type : '',size === 'small' ? 'uni-tag-text--small':'' ]">{{ text }}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Tag 标签
-	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
-	 * @property {String} text 标签内容
-	 * @property {String} size = [normal|small] 大小尺寸
-	 * 	@value normal 正常
-	 * 	@value small 小尺寸
-	 * @property {String} type = [default|primary|success｜warning｜error｜royal]  颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * 	@value royal 紫色
-	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
-	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
-	 * @property {Boolean} circle = [true|false] 是否为圆角
-	 * @event {Function} click 点击 Tag 触发事件
-	 */
-
-	export default {
-		name: "UniTag",
-		props: {
-			type: {
-				// 标签类型default、primary、success、warning、error、royal
-				type: String,
-				default: "default"
-			},
-			size: {
-				// 标签大小 normal, small
-				type: String,
-				default: "normal"
-			},
-			// 标签内容
-			text: {
-				type: String,
-				default: ""
-			},
-			disabled: {
-				// 是否为禁用状态
-				type: [Boolean, String],
-				default: false
-			},
-			inverted: {
-				// 是否为空心
-				type: [Boolean, String],
-				default: false
-			},
-			circle: {
-				// 是否为圆角样式
-				type: [Boolean, String],
-				default: false
-			},
-			mark: {
-				// 是否为标记样式
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		methods: {
-			onClick() {
-				if (this.disabled === true || this.disabled === "true") {
-					return;
-				}
-				this.$emit("click");
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$tag-pd: 0px 16px;
-	$tag-small-pd: 0px 8px;
-
-	.uni-tag {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding: $tag-pd;
-		height: 30px;
-		line-height: 30px;
-		justify-content: center;
-		color: $uni-text-color;
-		border-radius: $uni-border-radius-base;
-		background-color: $uni-bg-color-grey;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-
-	.uni-tag--circle {
-		border-radius: 15px;
-	}
-
-	.uni-tag--mark {
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-top-right-radius: 15px;
-		border-bottom-right-radius: 15px;
-	}
-
-	.uni-tag--disabled {
-		opacity: 0.5;
-	}
-
-	.uni-tag--small {
-		height: 20px;
-		padding: $tag-small-pd;
-		line-height: 20px;
-		font-size: $uni-font-size-sm;
-	}
-
-	.uni-tag--default {
-		color: $uni-text-color;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--small {
-		font-size: $uni-font-size-sm !important;
-	}
-
-	.uni-tag-text {
-		color: $uni-text-color-inverse;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--primary {
-		color: $uni-color-primary !important;
-	}
-
-	.uni-tag-text--success {
-		color: $uni-color-success !important;
-	}
-
-	.uni-tag-text--warning {
-		color: $uni-color-warning !important;
-	}
-
-	.uni-tag-text--error {
-		color: $uni-color-error !important;
-	}
-
-	.uni-tag--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.primary-uni-tag--inverted {
-		color: $uni-color-primary;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.uni-tag--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.success-uni-tag--inverted {
-		color: $uni-color-success;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.uni-tag--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.warning-uni-tag--inverted {
-		color: $uni-color-warning;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.uni-tag--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.error-uni-tag--inverted {
-		color: $uni-color-error;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.uni-tag--inverted {
-		color: $uni-text-color;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-</style>
--- a/components/uni-transition/uni-transition.vue
+++ b/components/uni-transition/uni-transition.vue
@@ -1,279 +0,0 @@
-<template>
-	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject"
-	 @click="change">
-		 <slot></slot>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const animation = uni.requireNativePlugin('animation');
-	// #endif
-	/**
-	 * Transition 过渡动画
-	 * @description 简单过渡动画组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
-	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
-     * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
-     *  @value fade 渐隐渐出过渡
-     *  @value slide-top 由上至下过渡
-     *  @value slide-right 由右至左过渡
-     *  @value slide-bottom 由下至上过渡
-     *  @value slide-left 由左至右过渡
-     *  @value zoom-in 由小到大过渡
-     *  @value zoom-out 由大到小过渡
-	 * @property {Number} duration 过渡动画持续时间
-	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
-	 */
-	export default {
-		name: 'uniTransition',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			modeClass: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			duration: {
-				type: Number,
-				default: 300
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				isShow: false,
-				transform: '',
-				ani: { in: '',
-					active: ''
-				}
-			};
-		},
-		watch: {
-			show: {
-				handler(newVal) {
-					if (newVal) {
-						this.open()
-					} else {
-						this.close()
-					}
-				},
-				immediate: true
-			}
-		},
-		computed: {
-			stylesObject() {
-				let styles = {
-					...this.styles,
-					'transition-duration': this.duration / 1000 + 's'
-				}
-				let transfrom = ''
-				for (let i in styles) {
-					let line = this.toLine(i)
-					transfrom += line + ':' + styles[i] + ';'
-				}
-				return transfrom
-			}
-		},
-		created() {
-			// this.timer = null
-			// this.nextTick = (time = 50) => new Promise(resolve => {
-			// 	clearTimeout(this.timer)
-			// 	this.timer = setTimeout(resolve, time)
-			// 	return this.timer
-			// });
-		},
-		methods: {
-			change() {
-				this.$emit('click', {
-					detail: this.isShow
-				})
-			},
-			open() {
-				clearTimeout(this.timer)
-				this.isShow = true
-				this.transform = ''
-				this.ani.in = ''
-				for (let i in this.getTranfrom(false)) {
-					if (i === 'opacity') {
-						this.ani.in = 'fade-in'
-					} else {
-						this.transform += `${this.getTranfrom(false)[i]} `
-					}
-				}
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this._animation(true)
-					}, 50)
-				})
-
-			},
-			close(type) {
-				clearTimeout(this.timer)
-				this._animation(false)
-			},
-			_animation(type) {
-				let styles = this.getTranfrom(type)
-				// #ifdef APP-NVUE
-				if(!this.$refs['ani']) return
-				animation.transition(this.$refs['ani'].ref, {
-					styles,
-					duration: this.duration, //ms
-					timingFunction: 'ease',
-					needLayout: false,
-					delay: 0 //ms
-				}, () => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-				// #endif
-				// #ifndef APP-NVUE
-				this.transform = ''
-				for (let i in styles) {
-					if (i === 'opacity') {
-						this.ani.in = `fade-${type?'out':'in'}`
-					} else {
-						this.transform += `${styles[i]} `
-					}
-				}
-				this.timer = setTimeout(() => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-
-				}, this.duration)
-				// #endif
-
-			},
-			getTranfrom(type) {
-				let styles = {
-					transform: ''
-				}
-				this.modeClass.forEach((mode) => {
-					switch (mode) {
-						case 'fade':
-							styles.opacity = type ? 1 : 0
-							break;
-						case 'slide-top':
-							styles.transform += `translateY(${type?'0':'-100%'}) `
-							break;
-						case 'slide-right':
-							styles.transform += `translateX(${type?'0':'100%'}) `
-							break;
-						case 'slide-bottom':
-							styles.transform += `translateY(${type?'0':'100%'}) `
-							break;
-						case 'slide-left':
-							styles.transform += `translateX(${type?'0':'-100%'}) `
-							break;
-						case 'zoom-in':
-							styles.transform += `scale(${type?1:0.8}) `
-							break;
-						case 'zoom-out':
-							styles.transform += `scale(${type?1:1.2}) `
-							break;
-					}
-				})
-				return styles
-			},
-			_modeClassArr(type) {
-				let mode = this.modeClass
-				if (typeof(mode) !== "string") {
-					let modestr = ''
-					mode.forEach((item) => {
-						modestr += (item + '-' + type + ',')
-					})
-					return modestr.substr(0, modestr.length - 1)
-				} else {
-					return mode + '-' + type
-				}
-			},
-			// getEl(el) {
-			// 	console.log(el || el.ref || null);
-			// 	return el || el.ref || null
-			// },
-			toLine(name) {
-				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-transition {
-		transition-timing-function: ease;
-		transition-duration: 0.3s;
-		transition-property: transform, opacity;
-	}
-
-	.fade-in {
-		opacity: 0;
-	}
-
-	.fade-active {
-		opacity: 1;
-	}
-
-	.slide-top-in {
-		/* transition-property: transform, opacity; */
-		transform: translateY(-100%);
-	}
-
-	.slide-top-active {
-		transform: translateY(0);
-		/* opacity: 1; */
-	}
-
-	.slide-right-in {
-		transform: translateX(100%);
-	}
-
-	.slide-right-active {
-		transform: translateX(0);
-	}
-
-	.slide-bottom-in {
-		transform: translateY(100%);
-	}
-
-	.slide-bottom-active {
-		transform: translateY(0);
-	}
-
-	.slide-left-in {
-		transform: translateX(-100%);
-	}
-
-	.slide-left-active {
-		transform: translateX(0);
-		opacity: 1;
-	}
-
-	.zoom-in-in {
-		transform: scale(0.8);
-	}
-
-	.zoom-out-active {
-		transform: scale(1);
-	}
-
-	.zoom-out-in {
-		transform: scale(1.2);
-	}
-</style>
--- a/components/verification/verification.vue
+++ b/components/verification/verification.vue
@@ -1,39 +1,87 @@
 <template>
  <view>
-    <view v-if="!hid" class="flex-row-center" :style="{ top: scHight }" style="width: 750rpx; position: fixed; z-index: 100; left: 0">
-      <view class="flex-column-center" style="background-color: #fcfcfc; padding: 30rpx; border-radius: 10rpx">
-        <movable-area class="flex" style="width: 100%" animation="false" :style="{ height: originalHeight }">
-          <movable-view scale-value="1" animation="false" damping="5000" :x="moveX" :style="{
+    <view
+      v-if="!hid"
+      class="flex-row-center"
+      :style="{ top: scHight }"
+      style="width: 750rpx; position: fixed; z-index: 100; left: 0"
+    >
+      <view
+        class="flex-column-center"
+        style="background-color: #fcfcfc; padding: 30rpx; border-radius: 10rpx"
+      >
+        <movable-area
+          class="flex"
+          style="width: 100%"
+          animation="false"
+          :style="{ height: originalHeight }"
+        >
+          <movable-view
+            scale-value="1"
+            animation="false"
+            damping="5000"
+            :x="moveX"
+            :style="{
              height: sliderHeight,
              width: sliderWidth,
              'z-index': 101,
-            }" direction="horizontal">
-            <image :src="imgbk" class="image" mode="aspectFit" :style="{
+            }"
+            direction="horizontal"
+          >
+            <image
+              :src="imgbk"
+              class="image"
+              mode="aspectFit"
+              :style="{
                height: sliderHeight,
                width: sliderWidth,
                'margin-top': imgbKH,
-              }"></image>
+              }"
+            ></image>
          </movable-view>
-          <image :src="img" mode="aspectFit" :style="{ height: originalHeight, width: originalWidth }" style="border-radius: 10rpx"></image>
+          <image
+            :src="img"
+            mode="aspectFit"
+            :style="{ height: originalHeight, width: originalWidth }"
+            style="border-radius: 10rpx"
+          ></image>
        </movable-area>

-        <movable-area class="flex-row-start" style="
+        <movable-area
+          class="flex-row-start"
+          style="
            width: 100%;
            background-color: #efefef;
            height: 80rpx;
            border-radius: 40rpx;
            margin-top: 30rpx;
-          ">
-          <movable-view scale-value="1" animation="false" damping="50" :x="movePv" class="flex-row-center" style="
+          "
+        >
+          <movable-view
+            scale-value="1"
+            animation="false"
+            damping="50"
+            :x="movePv"
+            class="flex-row-center"
+            style="
              border-radius: 50%;
              height: 100rpx;
              width: 100rpx;
              background-color: #ffffff;
              border: 2rpx solid #e3e3e3;
              margin-top: -13rpx;
-            " direction="horizontal" @change="moveChange" @touchend="end">
-            <view :class="endLoad ? 'cuIcon-right' : 'cuIcon-loading turn-load'" class="loadIcon" style="">
-            </view>
+            "
+            direction="horizontal"
+            @change="moveChange"
+            @touchend="end"
+          >
+            <u-icon
+              :color="mainColor"
+              size="40"
+              v-if="endLoad"
+              name="arrow-right"
+            ></u-icon>
+            <u-icon :color="mainColor" size="40" v-else name="reload"></u-icon>
          </movable-view>

          <text style="padding-left: 140rpx" :style="{ color: col }">{{
@@ -41,22 +89,27 @@
          }}</text>
        </movable-area>
        <view class="flex-row-around padding-top" style="width: 100%">
-          <view @click="hide" class="cuIcon-close" style="font-size: 50rpx; color: #e25915">
-          </view>
+          <u-icon
+            @click="hide"
+            :color="mainColor"
+            size="40"
+            name="close"
+          ></u-icon>

          <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
-          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1">Lili-FRAMEWORK</text>
+          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1"
+            >Lili-FRAMEWORK</text
+          >
        </view>
      </view>
    </view>
-
  </view>
 </template>

 <script>
 import api from "@/config/api.js";
 import storage from "@/utils/storage.js";
-
+import uuid from "@/utils/uuid.modified.js";
 const phone = uni.getSystemInfoSync();
 const l = phone.screenWidth / 750;
 export default {
@@ -65,12 +118,6 @@ export default {
    // 可自行调整
    this.scHight = phone.screenHeight / 2 - 200 + "px";
    this.getCode();
-    // 监听是否要重新验证
-    uni.$on("vert", (data) => {
-      this.vsr = data;
-      this.vsrtx = "点击进行验证";
-      this.getCode();
-    });
  },
  props: {
    height: {
@@ -96,6 +143,7 @@ export default {
  },
  data() {
    return {
+      mainColor: this.$mainColor,
      flage: false,
      key: "", //key
      vsrtx: "点击进行验证", //按钮提示语
@@ -136,12 +184,21 @@ export default {
        this.hid = !this.hid;
      }
    },
+    error() {
+      this.vsr = false;
+      this.hid = false;
+      this.moveX = 0;
+      this.moveCode = 0;
+    },
    // 获取验证图片
    getCode() {
      this.col = "#b3afae";
      this.hasImg = "图片加载中...";
+      if (!storage.getUuid()) {
+        storage.setUuid(uuid.v1());
+      }
      uni.request({
-        url: api.common + "/slider/" + this.business,
+        url: api.common + "/common/slider/" + this.business,
        header: {
          uuid: storage.getUuid(),
        },
@@ -176,7 +233,7 @@ export default {
        method: "POST",
        url:
          api.common +
-          "/slider/" +
+          "/common/slider/" +
          this.business +
          "?xPos=" +
          parseInt(this.moveCode * this.tl),
@@ -249,10 +306,6 @@ export default {
 .border-index {
  border: 1rpx solid $main-color;
 }
-.loadIcon {
-  color: $main-color;
-  font-size: 40rpx;
-}

 .status_bar {
  height: var(--status-bar-height);
@@ -311,30 +364,6 @@ export default {
  width: 750rpx;
 }

-.border-bom {
-  border-bottom: 0.5rpx solid #dddddd;
-}
-
-.border-red {
-  border-bottom: 1rpx solid #d33e18;
-}
-
-.border-bom-big {
-  border-bottom: 8rpx solid #dddddd;
-}
-
-.border-bom-white {
-  border-bottom: 2rpx solid #ffffff;
-}
-
-.border-bom-green {
-  border-bottom: 4rpx solid #f8f9bd;
-}
-
-.border-bom-index {
-  border-bottom: 4rpx solid #27d9b3;
-}
-
 .padding-left {
  padding-left: 20rpx;
 }
@@ -472,16 +501,10 @@ export default {
  bottom: 70rpx;
 }

-
-
-
-
 .moneycolor {
  color: #ea5002;
 }

-
-
 .margin-top {
  margin-top: 20rpx;
 }
@@ -498,14 +521,10 @@ export default {
  margin-left: 20rpx;
 }

-
-
 .margin-right {
  margin-right: 20rpx;
 }

-
-
 .main-color {
  color: #07d188;
 }
--- a/components/verify-code/verify-code.vue
+++ b/components/verify-code/verify-code.vue
@@ -0,0 +1,278 @@
+<template>
+	<view class="xt__verify-code">
+		<!-- 输入框 -->
+		<input
+			id="xt__input"
+			:value="code"
+			class="xt__input"
+			:focus="isFocus"
+			:password="isPassword"
+			:type="inputType"
+			:maxlength="size"
+			@input="input"
+			@focus="inputFocus"
+			@blur="inputBlur"
+		/>
+
+		<!-- 光标 -->
+		<view
+			id="xt__cursor"
+			v-if="cursorVisible && type !== 'middle'"
+			class="xt__cursor"
+			:style="{ left: codeCursorLeft[code.length] + 'px', height: cursorHeight + 'px', backgroundColor: cursorColor }"
+		></view>
+
+		<!-- 输入框 - 组 -->
+		<view id="xt__input-ground" class="xt__input-ground">
+			<template v-for="(item, index) in size">
+				<view
+					:key="index"
+					:style="{ borderColor: code.length === index && cursorVisible ? boxActiveColor : boxNormalColor }"
+					:class="['xt__box', `xt__box-${type + ''}`, `xt__box::after`]"
+				>
+					<view :style="{ borderColor: boxActiveColor }" class="xt__middle-line" v-if="type === 'middle' && !code[index]"></view>
+					<text class="xt__code-text">{{ code[index] | codeFormat(isPassword) }}</text>
+				</view>
+			</template>
+		</view>
+	</view>
+</template>
+<script>
+/**
+ * @description 输入验证码组件
+ * @property {string} type = [box|middle|bottom] - 显示类型 默认：box -eg:bottom
+ * @property {string} inputType = [text|number] - 输入框类型 默认：number -eg:number
+ * @property {number} size = [4|6] - 支持的验证码数量 默认：6 -eg:6
+ * @property {boolean} isFocus - 是否立即聚焦 默认：true
+ * @property {boolean} isPassword - 是否以密码形式显示 默认false -eg:false
+ * @property {string} cursorColor - 光标颜色 默认：#cccccc
+ * @property {string} boxNormalColor - 光标未聚焦到的框的颜色 默认：#cccccc
+ * @property {string} boxActiveColor - 光标聚焦到的框的颜色 默认：#000000
+ * @event {Function(data)} confirm - 输入完成
+ */
+export default {
+	name: 'xt-verify-code',
+	props: {
+		value: {
+			type: String,
+			default: () => ''
+		},
+		type: {
+			type: String,
+			default: () => 'box'
+		},
+		inputType: {
+			type: String,
+			default: () => 'number'
+		},
+		size: {
+			type: Number,
+			default: () => 6
+		},
+		isFocus: {
+			type: Boolean,
+			default: () => true
+		},
+		isPassword: {
+			type: Boolean,
+			default: () => false
+		},
+		cursorColor: {
+			type: String,
+			default: () => '#cccccc'
+		},
+		boxNormalColor: {
+			type: String,
+			default: () => '#cccccc'
+		},
+		boxActiveColor: {
+			type: String,
+			default: () => '#000000'
+		}
+	},
+	model: {
+		prop: 'value',
+		event: 'input'
+	},
+	data() {
+		return {
+			cursorVisible: false,
+			cursorHeight: 35,
+			code: '', // 输入的验证码
+			codeCursorLeft: [] // 向左移动的距离数组
+		};
+	},
+	created() {
+		this.cursorVisible = this.isFocus;
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		/**
+		 * @description 初始化
+		 */
+		init() {
+			this.getCodeCursorLeft();
+			this.setCursorHeight();
+		},
+		/**
+		 * @description 获取元素节点
+		 * @param {string} elm - 节点的id、class 相当于 document.querySelect的参数 -eg: #id
+		 * @param {string} type = [single|array] - 单个元素获取多个元素 默认是单个元素
+		 * @param {Function} callback - 回调函数
+		 */
+		getElement(elm, type = 'single', callback) {
+			uni
+				.createSelectorQuery()
+				.in(this)
+				[type === 'array' ? 'selectAll' : 'select'](elm)
+				.boundingClientRect()
+				.exec(data => {
+					callback(data[0]);
+				});
+		},
+		/**
+		 * @description 计算光标的高度
+		 */
+		setCursorHeight() {
+			this.getElement('.xt__box', 'single', boxElm => {
+				this.cursorHeight = boxElm.height * 0.6;
+			});
+		},
+		/**
+		 * @description 获取光标在每一个box的left位置
+		 */
+		getCodeCursorLeft() {
+			// 获取父级框的位置信息
+			this.getElement('#xt__input-ground', 'single', parentElm => {
+				const parentLeft = parentElm.left;
+				// 获取各个box信息
+				this.getElement('.xt__box', 'array', elms => {
+					this.codeCursorLeft = [];
+					elms.forEach(elm => {
+						this.codeCursorLeft.push(elm.left - parentLeft + elm.width / 2);
+					});
+				});
+			});
+		},
+
+		// 输入框输入变化的回调
+		input(e) {
+			const value = e.detail.value;
+			this.cursorVisible = value.length !== this.size;
+			this.$emit('input', value);
+			this.inputSuccess(value);
+		},
+
+		// 输入完成回调
+		inputSuccess(value) {
+			if (value.length === this.size) {
+				this.$emit('confirm', value);
+			}
+		},
+		// 输入聚焦
+		inputFocus() {
+			this.cursorVisible = this.code.length !== this.size;
+		},
+		// 输入失去焦点
+		inputBlur() {
+			this.cursorVisible = false;
+		}
+	},
+	watch: {
+		value(val) {
+			this.code = val;
+		}
+	},
+	filters: {
+		codeFormat(val, isPassword) {
+			let value = '';
+			if (val) {
+				value = isPassword ? '*' : val;
+			}
+			return value;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.xt__verify-code {
+	position: relative;
+	width: 100%;
+	box-sizing: border-box;
+
+	.xt__input {
+		height: 100%;
+		width: 200%;
+		position: absolute;
+		left: -100%;
+		z-index: 1;
+	}
+	.xt__cursor {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		display: inline-block;
+		width: 2px;
+		animation-name: cursor;
+		animation-duration: 0.8s;
+		animation-iteration-count: infinite;
+	}
+
+	.xt__input-ground {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		box-sizing: border-box;
+		.xt__box {
+			position: relative;
+			display: inline-block;
+			width: 76rpx;
+			height: 112rpx;
+			&-bottom {
+				border-bottom-width: 2px;
+				border-bottom-style: solid;
+			}
+
+			&-box {
+				border-width: 2px;
+				border-style: solid;
+			}
+
+			&-middle {
+				border: none;
+			}
+
+			.xt__middle-line {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				width: 50%;
+				transform: translate(-50%, -50%);
+				border-bottom-width: 2px;
+				border-bottom-style: solid;
+			}
+
+			.xt__code-text {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				font-size:52rpx;
+				transform: translate(-50%, -50%);
+			}
+		}
+	}
+}
+
+@keyframes cursor {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+</style>
--- a/config/api.js
+++ b/config/api.js
@@ -4,8 +4,12 @@
 */
 // 开发环境
 const dev = {
-  common: "https://common-api.pickmall.cn",
-  buyer: "https://buyer-api.pickmall.cn",
+  // common: "https://common-api.pickmall.cn",
+  // buyer: "https://buyer-api.pickmall.cn",
+  
+        common: "http://192.168.111:8890",
+        buyer: "http://192.168.111:8888",
+
 };
 // 生产环境
 const prod = {
--- a/config/config.js
+++ b/config/config.js
@@ -1,7 +1,8 @@
-const name = "lilishop";
+const name = "lilishop"; //全局商城name
+const schemeName = 'lilishop' //唤醒app需要的schemeName
 export default {
  name: name,
-  schemeLink: `${name}://`, //唤起app地址
+  schemeLink: `${schemeName}://`, //唤起app地址
  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
  appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
@@ -9,5 +10,7 @@ export default {
  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
  scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
  iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
-  logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png" //logo地址
+  logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
+  customerServiceMobile:"13161366885", //客服电话
+  customerServiceEmail:"lili@lili.com" //客服邮箱 
 }; 
--- a/js_sdk/lili-pay/wx-pay.js
+++ b/js_sdk/lili-pay/wx-pay.js
@@ -1,7 +1,18 @@
+/**
+ * 微信小程序支付
+ * 此处针对于微信小程序开发的支付插件
+ * 第一次支付成功后会跳出订阅的消息 如果用户拒绝或同意都会跳转到支付成功页面
+ * 如果点击订阅 会将状态写进缓存 之后不再提醒。
+ * 
+ * @param {sn,price}
+ */
+
 import { initiatePay } from "@/api/trade";
+import { getWeChatMpMessage } from "@/api/message.js";
 class LiLiWXPay {
  constructor(...payList) {
    this.data = payList[0];
+    console.log(payList);
    // 调用支付
    this.pay = () => {
      uni.showLoading({
@@ -32,13 +43,7 @@ class LiLiWXPay {
              icon: "none",
              title: "支付成功!",
            });
-            // 之后成功后跳转到支付成功页面
-            uni.redirectTo({
-              url:
-                "/pages/cart/payment/success?paymentMethod=WECHAT" +
-                "&payPrice=" +
-                this.data.price,
-            });
+            sendMessage(payList[0].price);
          },
          fail: (e) => {
            this.exception = e;
@@ -59,4 +64,53 @@ class LiLiWXPay {
  }
 }

+function sendMessage(price) {
+  //判断用户是否已经进行了订阅
+  if (!uni.getStorageSync("acceptSubscribeMessage")) {
+    //订阅消息
+    getWeChatMpMessage().then((res) => {
+      var message = res.data.result;
+      var templateid = message.map((item) => item.code);
+      uni.requestSubscribeMessage({
+        tmplIds: templateid,
+        success: (res) => {
+          for (let key in res) {
+            // 表示用户拒绝订阅该信息
+            if (res[key] == "reject") {
+              this.checked = false;
+            } else {
+              uni.setStorageSync("acceptSubscribeMessage", res);
+            }
+          }
+        },
+        fail: (res) => {
+          uni.removeStorageSync("acceptSubscribeMessage");
+          this.checked = false;
+        },
+        complete: () => {
+          /**
+           * 已经支付成功
+           */
+          uni.redirectTo({
+            url:
+              "/pages/cart/payment/success?paymentMethod=WECHAT" +
+              "&payPrice=" +
+              price,
+          });
+        },
+      });
+    });
+  } else {
+    /**
+     * 已经支付成功
+     */
+    uni.redirectTo({
+      url:
+        "/pages/cart/payment/success?paymentMethod=WECHAT" +
+        "&payPrice=" +
+        price,
+    });
+  }
+}
+
 export default LiLiWXPay;
--- a/lib/wa-permission/permission.js
+++ b/lib/wa-permission/permission.js
@@ -1,274 +0,0 @@
-/**
- * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
- */
-
-var isIos;
-// #ifdef APP-PLUS
-isIos = plus.os.name == "iOS";
-// #endif
-
-// 判断推送权限是否开启
-function judgeIosPermissionPush() {
-  var result = false;
-  var UIApplication = plus.ios.import("UIApplication");
-  var app = UIApplication.sharedApplication();
-  var enabledTypes = 0;
-  if (app.currentUserNotificationSettings) {
-    var settings = app.currentUserNotificationSettings();
-    enabledTypes = settings.plusGetAttribute("types");
-    console.log("enabledTypes1:" + enabledTypes);
-    if (enabledTypes == 0) {
-      console.log("推送权限没有开启");
-    } else {
-      result = true;
-      console.log("已经开启推送功能!");
-    }
-    plus.ios.deleteObject(settings);
-  } else {
-    enabledTypes = app.enabledRemoteNotificationTypes();
-    if (enabledTypes == 0) {
-      console.log("推送权限没有开启!");
-    } else {
-      result = true;
-      console.log("已经开启推送功能!");
-    }
-    console.log("enabledTypes2:" + enabledTypes);
-  }
-  plus.ios.deleteObject(app);
-  plus.ios.deleteObject(UIApplication);
-  return result;
-}
-
-// 判断定位权限是否开启
-function judgeIosPermissionLocation() {
-  var result = false;
-  var cllocationManger = plus.ios.import("CLLocationManager");
-  var status = cllocationManger.authorizationStatus();
-  result = status != 2;
-  console.log("定位权限开启：" + result);
-  // 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
-  var enable = cllocationManger.locationServicesEnabled();
-  var status = cllocationManger.authorizationStatus();
-  console.log("enable:" + enable);
-  console.log("status:" + status);
-  if (enable && status != 2) {
-    result = true;
-    console.log("手机定位服务已开启且已授予定位权限");
-  } else {
-    console.log("手机系统的定位没有打开或未给予定位权限");
-  }
-  plus.ios.deleteObject(cllocationManger);
-  return result;
-}
-
-// 判断麦克风权限是否开启
-function judgeIosPermissionRecord() {
-  var result = false;
-  var avaudiosession = plus.ios.import("AVAudioSession");
-  var avaudio = avaudiosession.sharedInstance();
-  var permissionStatus = avaudio.recordPermission();
-  console.log("permissionStatus:" + permissionStatus);
-  if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
-    console.log("麦克风权限没有开启");
-  } else {
-    result = true;
-    console.log("麦克风权限已经开启");
-  }
-  plus.ios.deleteObject(avaudiosession);
-  return result;
-}
-
-// 判断相机权限是否开启
-function judgeIosPermissionCamera() {
-  var result = false;
-  var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
-  var authStatus = AVCaptureDevice.authorizationStatusForMediaType("vide");
-  console.log("authStatus:" + authStatus);
-  if (authStatus == 3) {
-    result = true;
-    console.log("相机权限已经开启");
-  } else {
-    console.log("相机权限没有开启");
-  }
-  plus.ios.deleteObject(AVCaptureDevice);
-  return result;
-}
-
-// 判断相册权限是否开启
-function judgeIosPermissionPhotoLibrary() {
-  var result = false;
-  var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
-  var authStatus = PHPhotoLibrary.authorizationStatus();
-  console.log("authStatus:" + authStatus);
-  if (authStatus == 3) {
-    result = true;
-    console.log("相册权限已经开启");
-  } else {
-    console.log("相册权限没有开启");
-  }
-  plus.ios.deleteObject(PHPhotoLibrary);
-  return result;
-}
-
-// 判断通讯录权限是否开启
-function judgeIosPermissionContact() {
-  var result = false;
-  var CNContactStore = plus.ios.import("CNContactStore");
-  var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
-  if (cnAuthStatus == 3) {
-    result = true;
-    console.log("通讯录权限已经开启");
-  } else {
-    console.log("通讯录权限没有开启");
-  }
-  plus.ios.deleteObject(CNContactStore);
-  return result;
-}
-
-// 判断日历权限是否开启
-function judgeIosPermissionCalendar() {
-  var result = false;
-  var EKEventStore = plus.ios.import("EKEventStore");
-  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
-  if (ekAuthStatus == 3) {
-    result = true;
-    console.log("日历权限已经开启");
-  } else {
-    console.log("日历权限没有开启");
-  }
-  plus.ios.deleteObject(EKEventStore);
-  return result;
-}
-
-// 判断备忘录权限是否开启
-function judgeIosPermissionMemo() {
-  var result = false;
-  var EKEventStore = plus.ios.import("EKEventStore");
-  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
-  if (ekAuthStatus == 3) {
-    result = true;
-    console.log("备忘录权限已经开启");
-  } else {
-    console.log("备忘录权限没有开启");
-  }
-  plus.ios.deleteObject(EKEventStore);
-  return result;
-}
-
-// Android权限查询
-function requestAndroidPermission(permissionID) {
-  return new Promise((resolve, reject) => {
-    plus.android.requestPermissions(
-      [permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
-      function (resultObj) {
-        var result = 0;
-        for (var i = 0; i < resultObj.granted.length; i++) {
-          var grantedPermission = resultObj.granted[i];
-          console.log("已获取的权限：" + grantedPermission);
-          result = 1;
-        }
-        for (var i = 0; i < resultObj.deniedPresent.length; i++) {
-          var deniedPresentPermission = resultObj.deniedPresent[i];
-          console.log("拒绝本次申请的权限：" + deniedPresentPermission);
-          result = 0;
-        }
-        for (var i = 0; i < resultObj.deniedAlways.length; i++) {
-          var deniedAlwaysPermission = resultObj.deniedAlways[i];
-          console.log("永久拒绝申请的权限：" + deniedAlwaysPermission);
-          result = -1;
-        }
-        resolve(result);
-        // 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
-        // if (result != 1) {
-        // gotoAppPermissionSetting()
-        // }
-      },
-      function (error) {
-        console.log("申请权限错误：" + error.code + " = " + error.message);
-        resolve({
-          code: error.code,
-          message: error.message,
-        });
-      }
-    );
-  });
-}
-
-// 使用一个方法，根据参数判断权限
-function judgeIosPermission(permissionID) {
-  if (permissionID == "location") {
-    return judgeIosPermissionLocation();
-  } else if (permissionID == "camera") {
-    return judgeIosPermissionCamera();
-  } else if (permissionID == "photoLibrary") {
-    return judgeIosPermissionPhotoLibrary();
-  } else if (permissionID == "record") {
-    return judgeIosPermissionRecord();
-  } else if (permissionID == "push") {
-    return judgeIosPermissionPush();
-  } else if (permissionID == "contact") {
-    return judgeIosPermissionContact();
-  } else if (permissionID == "calendar") {
-    return judgeIosPermissionCalendar();
-  } else if (permissionID == "memo") {
-    return judgeIosPermissionMemo();
-  }
-  return false;
-}
-
-// 跳转到**应用**的权限页面
-function gotoAppPermissionSetting() {
-  if (isIos) {
-    var UIApplication = plus.ios.import("UIApplication");
-    var application2 = UIApplication.sharedApplication();
-    var NSURL2 = plus.ios.import("NSURL");
-    // var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
-    var setting2 = NSURL2.URLWithString("app-settings:");
-    application2.openURL(setting2);
-
-    plus.ios.deleteObject(setting2);
-    plus.ios.deleteObject(NSURL2);
-    plus.ios.deleteObject(application2);
-  } else {
-    // console.log(plus.device.vendor);
-    var Intent = plus.android.importClass("android.content.Intent");
-    var Settings = plus.android.importClass("android.provider.Settings");
-    var Uri = plus.android.importClass("android.net.Uri");
-    var mainActivity = plus.android.runtimeMainActivity();
-    var intent = new Intent();
-    intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-    var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
-    intent.setData(uri);
-    mainActivity.startActivity(intent);
-  }
-}
-
-// 检查系统的设备服务是否开启
-// var checkSystemEnableLocation = async function () {
-function checkSystemEnableLocation() {
-  if (isIos) {
-    var result = false;
-    var cllocationManger = plus.ios.import("CLLocationManager");
-    var result = cllocationManger.locationServicesEnabled();
-    console.log("系统定位开启:" + result);
-    plus.ios.deleteObject(cllocationManger);
-    return result;
-  } else {
-    var context = plus.android.importClass("android.content.Context");
-    var locationManager = plus.android.importClass(
-      "android.location.LocationManager"
-    );
-    var main = plus.android.runtimeMainActivity();
-    var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-    var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
-    console.log("系统定位开启:" + result);
-    return result;
-  }
-}
-
-module.exports = {
-  judgeIosPermission: judgeIosPermission,
-  requestAndroidPermission: requestAndroidPermission,
-  checkSystemEnableLocation: checkSystemEnableLocation,
-  gotoAppPermissionSetting: gotoAppPermissionSetting,
-};
--- a/main.js
+++ b/main.js
@@ -4,41 +4,46 @@ import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
 import store from "./store";

+
+/**
+ * 仅在h5中显示唤醒app功能
+ * 在h5页面手动挂载
+ * 
+ */
 // #ifdef H5
-// 在h5页面手动挂载 h5唤醒app插件
 import airBtn from "@/components/m-airbtn/index.vue";
 let btn = Vue.component("airBtn", airBtn); //全局注册
 document.body.appendChild(new btn().$mount().$el);
 // #endif


+/**
+ * 全局filters
+ */

 Object.keys(filters).forEach((key) => {
  Vue.filter(key, filters[key]);
 });

-const msg = (title, duration = 1500, mask = false, icon = "none") => {
-  //统一提示方便全局修改
-  if (Boolean(title) === false) {
-    return;
-  }
-  uni.showToast({
-    title,
-    duration,
-    mask,
-    icon,
-  });
-};
-// 引入vuex
+// 引入Vuex
 Vue.prototype.$store = store;
 Vue.use(uView);
 Vue.config.productionTip = false;
+
+
+/**
+ * 注意！
+ * 此处将常用的颜色嵌入到原型链上面
+ * 颜色使用驼峰命名对应 uni.scss中全局颜色变量名
+ * 如需更换主题请修改此处以及uni.scss中的全局颜色
+ */
 // 主题色
 Vue.prototype.$mainColor = "#ff3c2a";
 // 高亮主题色
 Vue.prototype.$lightColor = "#ff6b35";
-// 可直接 this.$api调用
-Vue.prototype.$api = { msg };
+// 辅助高亮颜色
+Vue.prototype.$aiderLightColor = "#ff9f28";
+

 App.mpType = "app";

--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "lili商城",
    "appid" : "__UNI__C100675",
    "description" : "",
-    "versionName" : "4.0.21",
-    "versionCode" : 4000021,
+    "versionName" : "4.0.49",
+    "versionCode" : 4000049,
    "transformPx" : false,
    "app-plus" : {
        "compatible" : {
@@ -72,7 +72,8 @@
                    "NSPhotoLibraryAddUsageDescription" : "保存商品图片到本地",
                    "NSFaceIDUsageDescription" : "使用面部识别进行登录",
                    "NSCameraUsageDescription" : "需要用与扫描二维码和商品评论图片拍摄",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示"
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
+                    "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                },
                "urltypes" : "lilishop"
            },
@@ -178,7 +179,7 @@
    "mp-weixin" : {
        /* 小程序特有相关 */
        "usingComponents" : true,
-        "appid" : "",
+        "appid" : "wx6f10f29075dc1b0b",
        "optimization" : {
            "subPackages" : true
        },
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,42 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async-validator": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-    },
-    "popper.js": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-      "integrity": "sha1-GDfEdgr1TSuyC2b5wJuSmT2Exik="
-    },
-    "uview": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-      "integrity": "sha1-tASc8q1kE1430huAdCtjeoLl7yo=",
-      "requires": {
-        "async-validator": "^1.7.1",
-        "core-js": "^2.4.1",
-        "deepmerge": "^1.5.0",
-        "popper.js": "^0.6.4"
-      }
-    },
-    "xmldom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
-    }
-  }
-}
--- a/pages.json
+++ b/pages.json
@@ -10,7 +10,8 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh":true  
 			}
 		}, 
 		
@@ -18,9 +19,8 @@
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"navigationStyle": "custom",
-
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh":true    //实现下拉刷新样式

 			}
 		}, {
@@ -36,21 +36,22 @@
 				
 			}
 		},
-		{
-			"path": "pages/navigation/point/point-mall",
-			"style": {
-				"navigationBarTitleText": "积分商城",
-				"enablePullDownRefresh": true
-			}
-		},		
+				
 		{
 			"path": "pages/navigation/search/searchPage",
 			"style": {
 				"navigationBarTitleText": "搜索",
 				"navigationStyle": "custom",
+				
 				"app-plus": {
 					//app页面不显示滚动条
-					"scrollIndicator": "none"
+					"scrollIndicator": "none",
+					"bottom": "0",
+					"contentAdjust": "false",
+					"bounce": "none",
+					"safearea": {
+					"bottom": "none"
+					}
 				}
 			}
 		}, {
@@ -86,21 +87,14 @@
 					"style": {
 						"navigationBarTitleText": "我的足迹",
 						"enablePullDownRefresh": true,
-						"app-plus": {
-							"titleNView": {
-								"buttons": [{
-									"text": "编辑",
-									"fontSize": "14"
-
-								}]
-							}
-						}
+						"navigationStyle": "custom"
 					}
 				}, {
 					"path": "myCollect",
 					"style": {
 						"navigationBarTitleText": "收藏",
 						"enablePullDownRefresh": true, //下拉刷新
+						"navigationStyle": "custom",
 						"app-plus": {
 							"scrollIndicator": "none"
 						}
@@ -341,12 +335,29 @@
 		{
 			"root": "pages/product",
 			"pages": [{
-					"path": "shopPage",
-					"style": {
-						"navigationBarTitleText": "详情展示",
-						"navigationStyle": "custom"
-					}
-				},
+				"path": "shopPage",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},{
+				"path": "shopList",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},{
+				"path": "licencePhoto",
+				"style": {
+					"navigationBarTitleText": "营业执照"
+				}
+			},{
+				"path": "shopPageGoods",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},
 				{
 					"path": "goods",
 					"style": {
@@ -440,14 +451,7 @@

 		{
 			"root": "pages/promotion",
-			"pages": [{
-					"path": "sale",
-					"style": {
-						"navigationBarTitleText": "特惠推荐",
-						"navigationStyle": "custom"
-
-					}
-				}, {
+			"pages": [ {
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
@@ -464,25 +468,50 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
-						
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"
 						}
 					}
-				}, {
-					"path": "recommend",
-					"style": {
-						"navigationBarTitleText": "人气推荐",
-						"navigationStyle": "custom"
-
-					}
 				},{
 					"path": "lives",
 					"style": {
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black"

+					}
+				},{
+					"path": "bargain/list",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/log",
+					"style": {
+						"navigationBarTitleText": "砍价记录"
+					}
+				},{
+					"path": "point/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "point/pointList",
+					"style": {
+						"navigationBarTitleText": "积分商城"
+						
+
 					}
 				}

@@ -496,16 +525,8 @@
 					"style": {
 						"navigationBarTitleText": "我的优惠券",
 						"app-plus": {
-							"bounce": "coupon/none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
+							"bounce": "coupon/none"
+							
 						}
 					}
 				},
@@ -526,19 +547,8 @@
 					"path": "coupon/couponCenter",
 					"style": {
 						"navigationBarTitleText": "领券中心",
-						"enablePullDownRefresh": true,
-						"app-plus": {
-							"bounce": "none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
-						}
+						"enablePullDownRefresh": true
+						
 					}
 				},
 				{
@@ -731,13 +741,7 @@
 				"selectedIconPath": "static/tabbar/category-s.png",
 				"text": "分类"
 			},
-			
-			// {
-			// 	"pagePath": "pages/navigation/point/point-mall",
-			// 	"iconPath": "static/tabbar/point-mall.png",
-			// 	"selectedIconPath": "static/tabbar/point-mall-s.png",
-			// 	"text": "积分商城"
-			// },
+		
 			{
 				"pagePath": "pages/tabbar/cart/cartList",
 				"iconPath": "static/tabbar/cart.png",
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -28,7 +28,7 @@
                  <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
                  <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
                </view>
-                <view>有效期至：{{  item.endTime.split(" ")[0] }}</view>
+                <view v-if="item.endTime">有效期至：{{  item.endTime.split(" ")[0] }}</view>
              </view>
              <view class="receive" @click="receive(item)">
                <text>点击</text><br />
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -1,9 +1,22 @@
 <template>
  <div class="wrapper">
+    <u-tabs
+      :list="list"
+      :is-scroll="false"
+      :active-color="lightColor"
+      :current="current"
+      @change="
+        (i) => {
+          current = i;
+        }
+      "
+    >
+    </u-tabs>
+
    <div class="empty" v-if="couponsList.length <= 0">
      <u-empty text="暂无优惠券" mode="coupon"></u-empty>
    </div>
-    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index" v-if="item.memberCouponStatus == 'NEW'">
+    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index">
      <view class="left">
        <view class="wave-line">
          <view class="wave" v-for="(item, index) in 12" :key="index"></view>
@@ -19,29 +32,52 @@
        <view class="circle circle-bottom"></view>
      </view>
      <view class="right">
-        <view>
+        <view class="desc">
          <view v-if="item.scopeType">
            <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
            <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-            <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+            <view v-else
+              >{{
+                item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
+              }}使用</view
+            >
          </view>
-          <view>有效期至：{{item.endTime}}</view>
+          <view class="reason" v-if="item.reason">{{ item.reason }}</view>
+          <view class="end-time">有效期至:{{ item.endTime }}</view>
        </view>
-        <view class="receive" @click="clickWay(item)">
+        <view
+          class="receive"
+          v-if="current == 0 && !routerVal.selectedCoupon.includes(item.id)"
+          @click="clickWay(item)"
+        >
          <text>立即</text><br />
          <text>使用</text>
        </view>
-        <view class="bg-quan"> 券 </view>
+        <view class="used" v-else @click="clickWay(item)">
+          <text>取消</text><br />
+          <text>使用</text>
+        </view>
+        <view class="bg-quan">券</view>
      </view>
    </view>
  </div>
 </template>
 <script>
-import { useCoupon, getMemberCanUse } from "@/api/trade.js";
+import { useCoupon } from "@/api/trade.js";

 export default {
  data() {
    return {
+      lightColor: this.$lightColor,
+      current: 0,
+      list: [
+        {
+          name: "可用优惠券",
+        },
+        {
+          name: "不可用优惠券",
+        },
+      ],
      couponsList: [], //优惠券集合
      params: {
        //传参
@@ -55,43 +91,37 @@ export default {
      routerVal: "", //上级传参
    };
  },
-  /**
-   * 赋值
-   */
-  onLoad(val) {
-    this.routerVal = val;
-    this.params.scopeId = val.skuId;
-    this.params.storeId = val.storeId;
+  onLoad(options) {
+    this.routerVal = options;
  },
+  watch: {
+    current(val) {
+      console.log(this.$store.state.cantUseCoupons);
+      val == 0
+        ? (this.couponsList = this.$store.state.canUseCoupons)
+        : (this.couponsList = this.$store.state.cantUseCoupons);
+    },
+  },
+
  mounted() {
-    uni.getStorage({
-      key: "totalPrice",
-      success: (res) => {
-        this.params.totalPrice = res.data;
-        this.getCoupons();
-      },
-    });
+    this.init();
+    console.log(this.routerVal);
  },

  methods: {
    /**
-     * 获取优惠券数量
+     * 从vuex中拿取优惠券信息
     */
-    getCoupons() {
-      getMemberCanUse(this.params).then((res) => {
-        if (res.data.success) {
-          this.couponsList = res.data.result.records;
-        }
-      });
+    init() {
+      this.couponsList = this.$store.state.canUseCoupons;
    },
-
    /**
     * 领取优惠券
     */
    clickWay(coupon) {
      useCoupon({
        memberCouponId: coupon.id,
-        used: true,
+        used: !this.routerVal.selectedCoupon.includes(coupon.id),
        way: this.routerVal.way,
      }).then((res) => {
        if (res.data.success) {
@@ -109,6 +139,20 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.desc {
+  height: 220rpx;
+  flex: 2;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.end-time,
+.reason {
+  color: #999;
+  line-height: 1.5;
+  font-size: 24rpx;
+}
+
 .empty {
  margin-top: 20px;
  text-align: center;
@@ -187,14 +231,14 @@ export default {
    align-items: center;
    width: 450rpx;
    font-size: $font-sm;
-    height: 100%;
+    height: 220rpx;
    background-color: #ffffff;
    overflow: hidden;
    position: relative;
    > view:nth-child(1) {
      color: #666666;
      margin-left: 20rpx;
-      line-height: 3em;
+
      > view:nth-child(1) {
        color: #ff6262;
        font-size: 30rpx;
@@ -215,6 +259,20 @@ export default {
      z-index: 2;
    }

+    .used {
+      color: #ffffff;
+      background-color: black;
+      border-radius: 50%;
+      width: 86rpx;
+      height: 86rpx;
+      text-align: center;
+      margin-right: 30rpx;
+      vertical-align: middle;
+      padding-top: 8rpx;
+      position: relative;
+      z-index: 2;
+    }
+
    .bg-quan {
      width: 244rpx;
      height: 244rpx;
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -2,7 +2,8 @@
  <view class="b-content">
    <view class="navbar">
      <!-- 循环出头部tab栏 -->
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="handleTabClick(index)"><text :class="{ current: tabCurrentIndex === index }">{{
+      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="handleTabClick(index)"><text
+          :class="{ current: tabCurrentIndex === index }">{{
          item.text
        }}</text></view>
    </view>
@@ -11,8 +12,10 @@
        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
          <!-- 空白页 -->
          <u-empty mode="coupon" text="暂无优惠券了" v-if="navItem.wheterEmpty"></u-empty>
+
          <!-- 数据 -->
-          <view v-if="navItem.dataList && coupon" class="coupon-item" :class="{ 'coupon-used': navIndex != 0 }" v-for="(coupon, index) in navItem.dataList" :key="index">
+          <view v-if="navItem.dataList && coupon" class="coupon-item" :class="{ 'coupon-used': navIndex != 0 }"
+            v-for="(coupon, index) in navItem.dataList" :key="index">
            <view class="left">
              <view class="wave-line">
                <view class="wave" v-for="(item, index) in 12" :key="index"></view>
@@ -47,7 +50,7 @@
                <text class="text-2" v-if="coupon.used_status == 1">将过期</text>
              </view>
              <image class="no-icon" v-if="navIndex == 1" src="@/static/img/used.png"></image>
-              <image class="no-icon" v-if="navIndex == 2" src="@/pages/floor/imgs/overdue.png"></image>
+              <image class="no-icon" v-if="navIndex == 2" src="@/static/img/overdue.png"></image>
              <view class="receive" v-if="navIndex == 0" @click="useItNow(coupon)">
                <text>立即</text><br />
                <text>使用</text>
@@ -112,7 +115,9 @@ export default {
    };
  },

-  onLoad() {
+  onShow() {
+    this.navList[this.tabCurrentIndex].params.pageNumber = 1
+    this.navList[this.tabCurrentIndex].dataList = [];
    this.getData();
  },

@@ -142,7 +147,7 @@ export default {
      let index = this.tabCurrentIndex;
      getMemberCoupons(this.navList[index].params).then((res) => {
        uni.stopPullDownRefresh();
-        if (res.statusCode == 200) {
+        if (res.data.success) {
          let data = res.data.result.records;
          if (data.length == 0) {
            if (res.data.pageNumber == 1) {
@@ -183,13 +188,13 @@ export default {
     * 立即使用优惠券
     */
    useItNow(item) {
-      if (item.storeId) {
+      if (item.storeId && item.storeId!='platform') {
        uni.navigateTo({
          url: `/pages/product/shopPage?id=${item.storeId}`,
        });
      } else {
        uni.switchTab({
-          url: "/pages/tabbar/home/index",
+          url: "/pages/navigation/search/searchPage",
        });
      }
    },
@@ -220,7 +225,7 @@ $item-color: #fff;
 }

 .swiper-box {
-  height: calc(100% - 40px);
+  height: calc(100vh - 40px);
 }

 .list-scroll-content {
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -1,47 +1,46 @@
 <template>
-	<div class="wrapper">
-		<div class="box">
-			<div class="block block-1">
-				<image class="img" src="@/pages/cart/static/pay.png" />
-				<p class="ptips">收银台</p>
+  <div class="wrapper">
+    <div class="box">
+      <div class="block block-1">
+        <image class="img" src="@/pages/cart/static/pay.png" />
+        <p class="ptips">收银台</p>

-				<p class="ptips">剩余支付时间：
-					<u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa"
-						border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
-				</p>
-				<p class="ptips">
-					支付金额
-					<span>¥{{ cashierParams.price | unitPrice }}</span>
-				</p>
-			</div>
-		</div>
-		<div class="__pay_form__">
-		</div>
-		<div class="block-4" v-if="cashierParams.price > 0">
-			<div class="payItem">支付方式</div>
-			<div class="payItem" v-for="(item, index) in payList" :key="index">
-				<u-row class="row">
-					<div class="col1" @click="awaitPay(item, index)" size="100" style="text-align:left;">
-						<div v-if="item == 'ALIPAY'">
-							<u-icon class="method_icon" name="zhifubao-circle-fill" color="#008ffa" size="80"></u-icon>
-							<span class="method_name">支付宝</span>
-						</div>
-						<div v-if="item == 'WECHAT'">
-							<u-icon class="method_icon" name="weixin-circle-fill" color="#00c98b" size="80"></u-icon>
-							<span class="method_name">微信</span>
-						</div>
-						<div v-if="item == 'WALLET'">
-							<u-icon class="method_icon" name="red-packet-fill" color="#dd6161" size="80"></u-icon>
-							<span class="method_name">余额支付(当前余额：¥{{ walletValue | unitPrice }})</span>
-						</div>
-					</div>
-					<div class="col3" @click="awaitPay(item)" textAlign="right">
-						<u-icon size="26" color="#b1b1b1" name="arrow-right"></u-icon>
-					</div>
-				</u-row>
-			</div>
-		</div>
-	</div>
+        <p class="ptips">剩余支付时间：
+          <u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa" border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
+        </p>
+        <p class="ptips">
+          支付金额
+          <span>¥{{ cashierParams.price | unitPrice }}</span>
+        </p>
+      </div>
+    </div>
+    <div class="__pay_form__">
+    </div>
+    <div class="block-4" v-if="cashierParams.price > 0">
+      <div class="payItem">支付方式</div>
+      <div class="payItem" v-for="(item, index) in payList" :key="index">
+        <u-row class="row">
+          <div class="col1" @click="awaitPay(item, index)" size="100" style="text-align:left;">
+            <div v-if="item == 'ALIPAY'">
+              <u-icon class="method_icon" name="zhifubao-circle-fill" color="#008ffa" size="80"></u-icon>
+              <span class="method_name">支付宝</span>
+            </div>
+            <div v-if="item == 'WECHAT'">
+              <u-icon class="method_icon" name="weixin-circle-fill" color="#00c98b" size="80"></u-icon>
+              <span class="method_name">微信</span>
+            </div>
+            <div v-if="item == 'WALLET'">
+              <u-icon class="method_icon" name="red-packet-fill" color="#dd6161" size="80"></u-icon>
+              <span class="method_name">余额支付(当前余额：¥{{ walletValue | unitPrice }})</span>
+            </div>
+          </div>
+          <div class="col3" @click="awaitPay(item)" textAlign="right">
+            <u-icon size="26" color="#b1b1b1" name="arrow-right"></u-icon>
+          </div>
+        </u-row>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 	import * as API_Trade from "@/api/trade";
@@ -152,6 +151,8 @@
 				parms.clientType = this.paymentType;

 				API_Trade.getCashierData(parms).then((res) => {
+				
+					if(res.data.success){
 					this.cashierParams = res.data.result;

 					// #ifdef MP-WEIXIN
@@ -160,8 +161,6 @@
 					});
 					// #endif

-				
-
 					// #ifndef MP-WEIXIN
 				    if(this.routerVal.recharge_sn){
 					 this.payList = res.data.result.support.filter((item) => {
@@ -171,11 +170,33 @@
 					 else{
 						this.payList = res.data.result.support;
 					}
+					// #ifndef APP-PLUS
+					//判断是否微信浏览器
+					var ua = window.navigator.userAgent.toLowerCase();
+					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+					
+						this.payList = res.data.result.support.filter((item) => {
+							return item != "ALIPAY";
+						});
+						
+					}
+					// #endif
 					
 					// #endif
+					
+
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
 						(res.data.result.autoCancel - new Date().getTime()) / 1000;
+					}
+					else if(res.data.code == 32000){
+						setTimeout(()=>{
+							uni.redirectTo({
+							 url: `/pages/order/myOrder?status=0`
+						});
+						},500)
+						
+					}
 				});
 			},

@@ -239,7 +260,7 @@
 								 
 							},
 							fail: (e) => {
-								console.log(e);
+								console.log(this);
 								this.exception = e;
 								uni.showModal({
 									content: "支付失败,如果您已支付，请勿反复支付",
@@ -277,7 +298,7 @@
 								WeixinJSBridge.invoke(
 									"getBrandWCPayRequest",
 									response.result,
-									function(res) {
+									(res) => {
 										if (res.err_msg == "get_brand_wcpay_request:ok") {
 											// 使用以上方式判断前端返回,微信团队郑重提示：
 											//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
@@ -376,108 +397,108 @@
 	};
 </script>
 <style scoped lang="scss">
-	.method_icon {
-		vertical-align: middle;
-	}
+.method_icon {
+  vertical-align: middle;
+}

-	.method_name {
-		font-size: 28rpx;
-		color: #999;
-		padding-left: 24rpx;
-	}
+.method_name {
+  font-size: 28rpx;
+  color: #999;
+  padding-left: 24rpx;
+}

-	.row {
-		display: flex;
-		width: 100%;
-	}
+.row {
+  display: flex;
+  width: 100%;
+}

-	/deep/ .u-row {
-		width: 100% !important;
-		display: flex;
-		justify-content: space-between !important;
-	}
+/deep/ .u-row {
+  width: 100% !important;
+  display: flex;
+  justify-content: space-between !important;
+}

-	.method_name,
-	.col1 {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+.method_name,
+.col1 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

-	.col1 {
-		text-align: center;
-		flex: 99;
-	}
+.col1 {
+  text-align: center;
+  flex: 99;
+}

-	.col3 {
-		text-align: right;
-		flex: 1;
-	}
+.col3 {
+  text-align: right;
+  flex: 1;
+}

-	.payItem {
-		padding: 13px 25rpx;
-		border-top: 1px solid #f9f9f9;
+.payItem {
+  padding: 13px 25rpx;
+  border-top: 1px solid #f9f9f9;

-		line-height: 100rpx;
-		font-size: 36rpx;
-		color: #333;
-	}
+  line-height: 100rpx;
+  font-size: 36rpx;
+  color: #333;
+}

-	.ptips {
-		font-size: 32rpx;
-		margin: 20rpx 0;
-		color: #333;
+.ptips {
+  font-size: 32rpx;
+  margin: 20rpx 0;
+  color: #333;

-		>span {
-			font-size: 40rpx;
-			color: #df5a52;
-			margin-left: 10rpx;
-		}
-	}
+  > span {
+    font-size: 40rpx;
+    color: #df5a52;
+    margin-left: 10rpx;
+  }
+}

-	.img {
-		width: 392rpx !important;
-		height: 296rpx !important;
-	}
+.img {
+  width: 392rpx !important;
+  height: 296rpx !important;
+}

-	.wrapper {
-		min-height: 100vh;
-		height: auto;
-		background: #f9f9f9;
-	}
+.wrapper {
+  min-height: 100vh;
+  height: auto;
+  background: #f9f9f9;
+}

-	.block-4 {
-		background: #fff;
-		color: $u-tips-color;
+.block-4 {
+  background: #fff;
+  color: $u-tips-color;

-		>p {
-			padding: 8rpx;
-		}
-	}
+  > p {
+    padding: 8rpx;
+  }
+}

-	.box {
-		background: #fff;
-		padding: 40rpx 0;
-		//   justify-content: center; //这个是X轴居中
-		//   align-items: center; //这个是 Y轴居中
-	}
+.box {
+  background: #fff;
+  padding: 40rpx 0;
+  //   justify-content: center; //这个是X轴居中
+  //   align-items: center; //这个是 Y轴居中
+}

-	.block {
-		text-align: center;
-		display: block;
-		width: 100%;
+.block {
+  text-align: center;
+  display: block;
+  width: 100%;

-		image {
-			width: 200rpx;
-			height: 200rpx;
-		}
-	}
+  image {
+    width: 200rpx;
+    height: 200rpx;
+  }
+}

-	.block-1 {
-		margin-top: 80rpx;
-	}
+.block-1 {
+  margin-top: 80rpx;
+}

-	.btns {
-		margin: 0 20rpx;
-	}
+.btns {
+  margin: 0 20rpx;
+}
 </style>
--- a/pages/cart/payment/popup/goods.vue
+++ b/pages/cart/payment/popup/goods.vue
@@ -1,411 +0,0 @@
-<template>
-  <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode" :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
-      <!-- 商品 -->
-      <view class="goods-box bottom">
-        <view class="goods-header">
-          <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx" :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
-          </view>
-          <view class="goods-skus">
-
-            <!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span>
-                ￥
-                <span class="goods-price-promotionShow goods-price-bigshow" v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
-                <span></span>
-              </span>
-              <div class="promotion-box">
-                ￥
-                <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
-                <span></span>
-              </div>
-            </view>
-            <!-- 正常商品的价格 -->
-            <view class="goods-price" v-else>
-              ￥
-              <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
-              .{{ formatPrice(goodsDetail.price)[1] }}
-              <span></span>
-            </view>
-            <view class="goods-check-skus">
-              已选
-              <span class="goods-check-skus-name">
-                {{ selectName }}
-                <span>，{{ num }}个</span>
-              </span>
-            </view>
-          </view>
-        </view>
-        <!-- 商品信息 -->
-        <view class="goods-skus-box">
-          <!-- 规格 -->
-          <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
-            <view class="skus-view-list">
-              <view class="view-class-title">{{ spec.name }}</view>
-              <view :class="{ active: spec_val.id == currentSelceted[specIndex] }" class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
-            </view>
-          </view>
-          <!-- 数量 -->
-          <view class="goods-skus-number">
-            <view class="view-class-title">数量</view>
-            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width" :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
-            </u-number-box>
-          </view>
-        </view>
-        <!-- 按钮 -->
-        <view class="btns">
-          <view class="box-btn card" v-if="buyType !='PINTUAN'" @click="addToCartOrBuy('cart')">加入购物车</view>
-          <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
-        </view>
-      </view>
-    </u-popup>
-  </div>
-</template>
-<script>
-import * as API_trade from "@/api/trade.js";
-import setup from "./popup";
-export default {
-  data() {
-    return {
-      setup,
-      num: 1,
-      // 步进器的大小尺寸单位是 rpx
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
-      selectName: "", //选中商品的昵称
-      selectSkuList: "", //选中商铺sku,
-      selectedSpecImg: "", //选中的图片路径
-      buyType: "", //用于存储促销，拼团等活动类型
-      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
-      formatList: [],
-      currentSelceted: [],
-      skuList: "",
-      isMask:false, //是否显示遮罩层
-      isClose:false, //是否可以点击遮罩关闭
-    };
-  },
-  props: [
-    
-    "goodsDetail",
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-  ],
-  watch: {
-    buyType: {
-      handler(val) {
-        this.buyType = val;
-      },
-      immediate: true,
-    },
-    selectSkuList: {
-      handler(val, oldval) {
-        this.$emit("changed", val);
-      },
-      deep: true,
-    },
-  },
-
-  methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
-    closeMask() {
-      this.$emit("closeBuy", false);
-    },
-
-    /**点击规格 */
-    handleClickSpec(val, index, specValue) {
-      this.$set(this.currentSelceted, index, specValue.id);
-
-      let selectedSkuId = this.goodsSpec.find((i) => {
-        let matched = true;
-        let specValues = i.specValues.filter((j) => j.specName !== "images");
-
-        for (let n = 0; n < specValues.length; n++) {
-          if (specValues[n].specValueId !== this.currentSelceted[n]) {
-            matched = false;
-            return;
-          }
-        }
-        if (matched) {
-          return i;
-        }
-      });
-
-      this.selectSkuList = {
-        spec: {
-          specName: val.name,
-          specValue: specValue.value,
-        },
-        data: this.goodsDetail,
-      };
-      this.selectName = specValue.value;
-
-      this.$emit("handleClickSku", selectedSkuId.skuId,this.goodsDetail.id);
-    },
-
-    /**
-     * 添加到购物车或购买
-     */
-    addToCartOrBuy(val) {
-      if (!this.selectSkuList) {
-        uni.showToast({
-          title: "请选择规格商品",
-          icon: "none",
-        });
-        return;
-      }
-      let data = {
-        skuId: this.goodsDetail.id,
-        num: this.num,
-      };
-
-      if (val == "cart") {
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.showToast({
-              title: "商品已添加到购物车",
-              icon: "none",
-            });
-
-            this.$emit("queryCart");
-            this.closeMask();
-          } else {
-            uni.showToast({
-              title: res.data.message,
-              duration: 2000,
-              icon: "none",
-            });
-            return false;
-          }
-        });
-      } else {
-        // 判断是否拼团商品
-        if (this.buyType) {
-          data.cartType = "PINTUAN";
-        } else {
-          data.cartType = "BUY_NOW";
-        }
-
-       
-
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.navigateTo({
-              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
-                this.addr.id || ''
-              }&parentOrder=${encodeURIComponent(
-                JSON.stringify(this.parentOrder)
-              )}`,
-            });
-          }
-        });
-      }
-    },
-    formatSku(list) {
-      // 格式化数据
-
-      let arr = [{}];
-      list.forEach((item, index) => {
-        item.specValues.forEach((spec, specIndex) => {
-          let id = spec.specNameId;
-          let name = spec.specName;
-          let values = {
-            id: spec.specValueId,
-            value: spec.specValue,
-            quantity: item.quantity,
-          };
-          if (name === "images") {
-            return;
-          }
-
-          arr.forEach((arrItem, arrIndex) => {
-            if (
-              arrItem.name == name &&
-              arrItem.values &&
-              !arrItem.values.find((i) => i.id === values.id)
-            ) {
-              arrItem.values.push(values);
-            }
-
-            let keys = arr.map((key) => {
-              return key.name;
-            });
-            if (!keys.includes(name)) {
-              arr.push({
-                id: id,
-                name: name,
-                values: [values],
-              });
-            }
-          });
-        });
-      });
-
-      arr.shift();
-      this.formatList = arr;
-
-      list.forEach((item) => {
-        if (item.skuId === this.goodsDetail.id) {
-          item.specValues
-            .filter((i) => i.specName !== "images")
-            .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValueId;
-
-              this.selectName = value.specValue;
-
-              this.selectSkuList = {
-                spec: value,
-                data: this.goodsDetail,
-              };
-            });
-        }
-      });
-
-      this.skuList = list;
-    },
-  },
-
-  mounted() {
-    this.formatSku(this.goodsSpec);
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "./popup.scss";
-
-.buy {
-  background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-.card {
-  background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-/deep/.u-icon-plus,
-.u-icon-minus,
-.u-icon-disabled {
-  height: 30rpx !important;
-  background: #fff !important;
-}
-
-.goods-skus-number {
-  justify-content: space-between;
-  display: flex;
-}
-
-/deep/ .uni-scroll-view {
-  overflow: hidden !important;
-}
-
-.active {
-  background: $jd-light-color !important;
-  border: 2rpx solid $jd-color;
-  font-weight: bold;
-  color: $jd-color !important;
-  box-sizing: border-box;
-}
-
-.goods-skus-box {
-  overflow-y: auto;
-  height: 610rpx;
-  // #ifdef MP-WEIXIN
-  height: 570rpx;
-  // #endif
-  margin-bottom: 10rpx;
-}
-
-.goods-skus-view {
-  overflow: hidden;
-
-  .skus-view-list {
-    > .skus-view-item {
-      flex: 1;
-      padding: 0 36rpx;
-
-      overflow: hidden;
-      height: 60rpx;
-      line-height: 60rpx;
-      float: left;
-      text-align: center;
-      margin-left: 24rpx;
-      margin-bottom: 20rpx;
-      font-size: 22rpx;
-      color: #262626;
-      background: #f2f2f2;
-      border-radius: 30rpx;
-    }
-  }
-}
-
-.goods-header {
-  height: 200rpx;
-  display: flex;
-  align-items: center;
-  margin-bottom: 36rpx;
-}
-
-.goods-box {
-  padding: 50rpx 36rpx 0 36rpx;
-}
-
-.goods-skus {
-  padding: 0 20rpx;
-}
-
-.goods-price {
-  color: $jd-color;
-  line-height: 80rpx;
-  display: flex;
-}
-.promotion-box {
-  line-height: 1;
-  display: flex;
-  align-items: center;
-  text-decoration: line-through;
-  color: #999;
-  margin-left: 10rpx;
-  /deep/ span {
-    font-size: 30rpx;
-  }
-}
-.promotion {
-  font-size: 30rpx;
-}
-.goods-price-promotionShow {
-  font-size: 48rpx;
-}
-.goods-check-skus {
-  font-size: 24rpx;
-  color: #999;
-  > .goods-check-skus-name {
-    margin-left: 4rpx;
-  }
-  > span {
-    color: #333;
-  }
-}
-</style>
--- a/pages/cart/payment/shareOrderGoods.vue
+++ b/pages/cart/payment/shareOrderGoods.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="wrapper">
+  <view class="wrapper" v-if="flage">
    <div class='goods' v-if="selectedGoods">
      <image class="goods-image" :src="selectedGoods.thumbnail" alt="">
        <p class="goodsName">{{selectedGoods.goodsName}}</p>
@@ -67,11 +67,12 @@ import { getGoods } from "@/api/goods.js";
 import { getPinTuanShare } from "@/api/order";
 import shares from "@/components/m-share/index";
 import storage from "@/utils/storage.js";
-import popupGoods from "./popup/goods"; //购物车商品的模块
+import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块

 export default {
  data() {
    return {
+      flage: false, //判断接口是否正常请求
      addr: {
        id: "",
      },
@@ -138,7 +139,8 @@ export default {
    // 实例化本页面
    async init(sn, sku) {
      let res = await getPinTuanShare(sn, sku);
-      if (res.data.success) {
+      if (res.data.success && res.data.result.promotionGoods) {
+        this.flage = true;
        this.data = res.data.result;
        this.selectedGoods = res.data.result.promotionGoods;
        let endTime = Date.parse(
@@ -170,21 +172,30 @@ export default {
        } else {
          this.isMaster = false;
          // 获取商品详情
-          this.getGoodsDetail(this.routers.sku, this.routers.goodsId);
+          this.getGoodsDetail({
+            id: this.routers.sku,
+            goodsId: this.routers.goodsId,
+          });
        }

        // 获取当前商品是否已经购买
        if (storage.getUserInfo().id) {
-         
          let isBuy = res.data.result.pintuanMemberVOS.filter((item) => {
            return item.memberId == storage.getUserInfo().id;
          });
          isBuy.length != 0 ? (this.isBuy = true) : (this.isBuy = false);
        }
+      } else {
+        uni.showToast({
+          title: "当前拼团单有误！请联系管理员重试",
+          duration: 2000,
+          icon: "none",
+        });
      }
    },
    // 获取商品详情
-    getGoodsDetail(id, goodsId) {
+    getGoodsDetail(val) {
+      let { id, goodsId } = val;
      uni.showLoading({
        title: "加载中",
        mask: true,
--- a/pages/cart/payment/success.vue
+++ b/pages/cart/payment/success.vue
@@ -7,70 +7,40 @@
      <div class="pay-btns">
        <div v-show="!from" @click="checkOrder">查看{{this.orderType == "RECHARGE" ? '余额' : '订单'}}</div>
        <div @click="navigateTo('/pages/tabbar/home/index', 'switch')">回到首页</div>
-
      </div>
    </div>
    <div class="pay-box">
      <div class="pay-tag-box">
        <h2>订单支付成功!</h2>
-
        <div class="pay-item">
          <div>
            支付方式：
          </div>
          <div>{{paymentMethod | paymentTypeFilter}}</div>
        </div>
-
-      </div>
-      <!-- #ifdef MP-WEIXIN -->
-      <div class="subscribe flex">
-        <div>订阅订单状态</div>
-        <div>
-          <u-switch size="50" :disabled="checked" :active-color="activeColor" @change="changeStatus" v-model="checked"></u-switch>
-        </div>
-      </div>
-      <!-- #endif -->
-    </div>
-    <div class="goods-recommend">--商品推荐--</div>
-    <div class="goods-list">
-      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
-        <div class="goods-img">
-          <u-image :src="item.thumbnail" mode="aspectFill" height="350rpx" width="100%">
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-        </div>
-        <div class="goods-desc">
-          <div class="goods-title">
-            {{ item.goodsName }}
-          </div>
-          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
-          </div>
-        </div>
      </div>
    </div>
+    <goodsRecommend />
  </div>

 </template>
 <script>
-import { getGoodsList } from "@/api/goods.js";
-import { getWeChatMpMessage } from "@/api/message.js";
-
+import goodsRecommend from "@/components/m-goods-recommend";
 export default {
  data() {
    return {
      checked: false,
      paymentMethod: "",
+
      from: "",
      payPrice: 0,
      goodsList: [],
      activeColor: this.$mainColor,
-      params: {
-        pageSize: 12,
-        pageNumber: 1,
-      },
    };
  },
+  components: {
+    goodsRecommend,
+  },
  filters: {
    paymentTypeFilter(val) {
      switch (val) {
@@ -90,8 +60,7 @@ export default {
    this.from = options.from || "";
    this.payPrice = options.payPrice || 0;
    this.orderType = options.orderType;
-    //搜索商品
-    this.initGoods();
+    // this.sendMessage()
  },
  methods: {
    checkOrder() {
@@ -102,8 +71,8 @@ export default {
       */
      if (this.orderType == "RECHARGE") {
        uni.reLaunch({
-           url: `/pages/mine/deposit/operation`
-        })
+          url: `/pages/mine/deposit/operation`,
+        });
      } else {
        this.navigateTo("/pages/order/myOrder?status=0");
      }
@@ -113,39 +82,6 @@ export default {
        this.sendMessage();
      }
    },
-    async initGoods() {
-      let goodsList = await getGoodsList(this.params);
-      this.goodsList.push(...goodsList.data.result.content);
-    },
-    sendMessage() {
-      //订阅消息
-      //#ifdef MP-WEIXIN
-      getWeChatMpMessage().then((res) => {
-        var message = res.data.result;
-        var templateid = message.map((item) => item.code);
-        uni.requestSubscribeMessage({
-          tmplIds: templateid,
-          success: (res) => {
-            for (let key in res) {
-              if (res[key] == "reject") {
-                this.checked = false;
-              }
-            }
-          },
-          fail: (res) => {
-            uni.removeStorageSync("acceptSubscribeMessage");
-            this.checked = false;
-          },
-        });
-      });
-      //#endif
-    },
-
-    handleClick(item) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
-      });
-    },

    navigateTo(url, type) {
      if (type === "switch") {
@@ -233,84 +169,4 @@ export default {
  background: #fff;
  border-top-right-radius: 100rpx;
 }
-
-/**商品代码 */
-$w_94: 94%;
-
-.goods-recommend {
-  background: #f7f7f7;
-  height: 100rpx;
-  line-height: 100rpx;
-  text-align: center;
-  font-size: 30rpx;
-  font-weight: bold;
-}
-
-.goods-list {
-  display: flex;
-
-  flex-wrap: wrap;
-  background: #f7f7f7;
-}
-
-.goods-item {
-  width: 50%;
-  margin-bottom: 10px;
-  border-radius: 0.4em;
-  overflow: hidden;
-}
-
-.goods-img {
-  position: relative;
-  margin: 0 auto;
-  // width: 158px;
-  width: $w_94;
-  height: 350rpx;
-  border-top-left-radius: 20rpx;
-  border-top-right-radius: 20rpx;
-
-  overflow: hidden;
-
-  > img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.goods-desc {
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-  width: $w_94;
-  background: #fff;
-  padding: 8rpx 0 8rpx 8rpx;
-  margin: 0 auto;
-
-  > .goods-title {
-    font-size: 12px;
-    height: 70rpx;
-    display: -webkit-box;
-    font-weight: 500;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  > .goods-bottom {
-    display: flex;
-    font-weight: bold;
-
-    > .goods-price {
-      line-height: 2;
-      color: $main-color;
-    }
-  }
-}
-
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -28,7 +28,8 @@
        <div class="saveBtn" @click="save">保存</div>
      </u-form>

-      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4"></m-city>
+      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
+      </m-city>

      <uniMap v-if="mapFlage" @close="closeMap" @callback="callBackAddress" />
    </div>
@@ -149,15 +150,7 @@ export default {
            delete this.form.___path;
            addAddress(this.form).then((res) => {
              if (res.data.success) {
-                if (this.routerVal.type == "order") {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/address?way=${this.routerVal.way}`,
-                  });
-                } else {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/addressManage`,
-                  });
-                }
+                uni.navigateBack();
              }
            });
          } else {
@@ -198,8 +191,8 @@ export default {
            return _child.id == item.id;
          });

-          this.form.lat = _town[0].center.split(",")[0];
-          this.form.lon = _town[0].center.split(",")[1];
+          this.form.lat = _town[0].center.split(",")[1];
+          this.form.lon = _town[0].center.split(",")[0];
        }
      });
    },
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -1,7 +1,7 @@
 <template>
  <view class="address">

-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
+    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
    <view class="list" v-else>
      <view class="item c-content" v-for="(item, index) in addressList" :key="index">
        <view class="basic" @click="selectAddressData(item)">
@@ -50,7 +50,6 @@ export default {
    return {
      addressList: [], //地址列表
      showAction: false, //是否显示下栏框
-      empty: false, //是否为空
      removeList: [
        {
          text: "确定",
@@ -67,7 +66,11 @@ export default {
      },
    };
  },
-
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
  onLoad: function (val) {
    this.routerVal = val;
  },
@@ -76,19 +79,12 @@ export default {
    this.getAddressList();
  },
  onHide() {},
-  onBackPress(e) {
-    uni.redirectTo({
-      url: "/pages/order/fillorder?way=" + this.routerVal.way,
-    });
-    return true;
-  },
-
  methods: {
    async selectAddressData(val) {
      await API_Trade.setAddressId(val.id, this.routerVal.way);

-      uni.redirectTo({
-        url: `/pages/order/fillorder?way=${this.routerVal.way}`,
+      uni.navigateBack({
+        delta: 1,
      });
    },
    //获取地址列表
@@ -99,18 +95,11 @@ export default {
        this.params.pageNumber,
        this.params.pageSize
      ).then((res) => {
-      
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
-          res.data.result.records.forEach((item) => {
-            item.consigneeAddressPath = item.consigneeAddressPath.split(",");
-          });
-
-          this.$set(this, "addressList", res.data.result.records);
-
-         
-        }
+        res.data.result.records.forEach((item) => {
+          item.consigneeAddressPath = item.consigneeAddressPath.split(",");
+        });
+        this.addressList = res.data.result.records;
+        console.log(this.addressList);

        uni.hideLoading();
      });
@@ -139,7 +128,6 @@ export default {
    },
    //新建。编辑地址
    addAddress(id) {
- 
      if (id) {
        uni.navigateTo({
          url:
@@ -177,5 +165,5 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -1,7 +1,7 @@
 <template>
  <view class="address">
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
-    <view class="list" v-else>
+    <u-empty class="empty" v-if="this.addressList == 0" text="暂无收货地址" mode="address"></u-empty>
+    <view class="list" >
      <view class="item c-content" v-for="(item, index) in addressList" :key="index">
        <view class="basic">
          <text>{{ item.name }}</text>
@@ -50,7 +50,7 @@ export default {
    return {
      addressList: [], //地址列表
      showAction: false, //是否显示下栏框
-      empty: false, //是否为空
+  
      removeList: [
        {
          text: "确定",
@@ -60,7 +60,7 @@ export default {
        text: "确定要删除该收货人信息吗？",
      },
      removeId: "", //删除的地址id
-      routerVal: "", 
+      routerVal: "",
      params: {
        pageNumber: 1,
        pageSize: 1000,
@@ -77,10 +77,16 @@ export default {
  onLoad: function (val) {
    this.routerVal = val;
  },
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
  /**
   * 进入页面检测当前账户是否登录
   */
  onShow() {
+    let that = this;
    if (this.$options.filters.isLogin("auth")) {
      this.getAddressList();
    } else {
@@ -90,9 +96,7 @@ export default {
        confirmColor: this.$lightColor,
        success: function (res) {
          if (res.confirm) {
-            uni.navigateTo({
-              url: "/pages/passport/login",
-            });
+            that.$options.filters.navigateToLogin();
          } else if (res.cancel) {
            uni.navigateBack();
          }
@@ -108,14 +112,11 @@ export default {
        this.params.pageNumber,
        this.params.pageSize
      ).then((res) => {
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
-          res.data.result.records.forEach((item) => {
-            item.consigneeAddressPath = item.consigneeAddressPath.split(",");
-          });
-          this.addressList = res.data.result.records;
-        }
+        res.data.result.records.forEach((item) => {
+          item.consigneeAddressPath = item.consigneeAddressPath.split(",");
+        });
+        this.addressList = res.data.result.records;
+
        uni.hideLoading();
      });
    },
@@ -169,5 +170,5 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>
--- a/pages/mine/deposit/operation.vue
+++ b/pages/mine/deposit/operation.vue
@@ -26,9 +26,19 @@ export default {
      walletNum: 0,
    };
  },
-  async mounted() {
-    let result = await getUserWallet(); //预存款
-    this.walletNum = result.data.result.memberWallet;
+  async onShow() {
+    if (this.$options.filters.isLogin("auth")) {
+      let result = await getUserWallet(); //预存款
+      this.walletNum = result.data.result.memberWallet;
+    } else {
+      uni.showToast({
+        icon: "none",
+        duration: 3000,
+        title: "请先登录！",
+      });
+
+      this.$options.filters.navigateToLogin("redirectTo");
+    }
  },
  methods: {
    back() {
--- a/pages/mine/deposit/withdrawal.vue
+++ b/pages/mine/deposit/withdrawal.vue
@@ -12,6 +12,10 @@
          <view @click="handleAll" :style="{ color: $mainColor }">全部</view>
          <view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view>
        </view>
+
+      </view>
+      <view class="tips">
+        最低提现金额为1.00元
      </view>
    </view>

@@ -19,7 +23,7 @@
  </view>
 </template>
 <script>
-import { getUserWallet,withdrawalApply } from "@/api/members";
+import { getUserWallet, withdrawalApply } from "@/api/members";
 export default {
  data() {
    return {
@@ -67,4 +71,8 @@ export default {
 </script>
 <style lang="scss" scoped>
@import "./style.scss";
+.tips {
+  font-size: 24rpx;
+  color: #999;
+}
 </style>
--- a/pages/mine/distribution/auth.vue
+++ b/pages/mine/distribution/auth.vue
@@ -8,10 +8,16 @@
            <u-input v-model="ruleForm.name" placeholder="请输入您的真实姓名" />
          </u-form-item>
          <u-form-item label="身份证" prop="idNumber">
-            <u-input
-              v-model="ruleForm.idNumber"
-              placeholder="请输入身份证号码"
-            />
+            <u-input v-model="ruleForm.idNumber" placeholder="请输入身份证号码" />
+          </u-form-item>
+          <u-form-item label="银行开户行" prop="settlementBankBranchName">
+            <u-input v-model="ruleForm.settlementBankBranchName" type="text" placeholder="请输入银行开户行" />
+          </u-form-item>
+          <u-form-item label="银行开户名" prop="settlementBankAccountName">
+            <u-input v-model="ruleForm.settlementBankAccountName" type="text" placeholder="请输入银行开户名" />
+          </u-form-item>
+          <u-form-item label="银行账号" prop="settlementBankAccountNum">
+            <u-input v-model="ruleForm.settlementBankAccountNum" type="text" placeholder="请输入银行账号" />
          </u-form-item>
          <!-- <u-form-item label="身份证正面照" prop="name">
            <u-upload></u-upload>
@@ -23,7 +29,7 @@
            <u-upload></u-upload>
          </u-form-item> -->
        </u-form>
-        <u-button  :customStyle="{'background':$lightColor,'color':'#fff' }"  @click="submit">提交</u-button>
+        <u-button :customStyle="{'background':$lightColor,'color':'#fff' }" @click="submit">提交</u-button>
      </view>
    </view>

@@ -35,12 +41,16 @@
 </template>
 <script>
 import { applyDistribution } from "@/api/goods";
+import { checkBankno } from "@/utils/Foundation";
 export default {
  data() {
    return {
      ruleForm: {
        name: "",
        idNumber: "",
+        settlementBankBranchName: "", // 银行开户行
+        settlementBankAccountName: "", //银行开户名
+        settlementBankAccountNum: "", //银行账号
      },
      rules: {
        name: [
@@ -62,6 +72,50 @@ export default {
            trigger: ["change", "blur"],
          },
        ],
+        // 银行开户行
+        settlementBankBranchName: [
+          {
+            required: true,
+            message: "银行开户行",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.chinese(value);
+            },
+            message: "银行开户行不正确",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ], //银行开户名
+        settlementBankAccountName: [
+          {
+            required: true,
+            message: "银行开户名",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+        ],
+        //银行账号
+        settlementBankAccountNum: [
+          {
+            required: true,
+            message: "银行账号不正确",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return checkBankno(value);
+            },
+            message: "银行账号不正确",
+          },
+        ],
        idNumber: [
          {
            required: true,
@@ -96,16 +150,14 @@ export default {
                icon: "none",
              });

-              setTimeout(()=>{
-                 uni.navigateBack();
-              },500)
-             
-            }
-            else{
+              setTimeout(() => {
+                uni.navigateBack();
+              }, 500);
+            } else {
              uni.showToast({
                title: res.data.message,
                duration: 2000,
-                icon:"none"
+                icon: "none",
              });
            }
          });
--- a/pages/mine/distribution/history.vue
+++ b/pages/mine/distribution/history.vue
@@ -1,6 +1,12 @@
 <template>
  <view class="log-list">
-    <view class="log-way" v-for="(item, index) in datas" :key="index">
+    <!-- 提现记录 -->
+    <view
+      class="log-way"
+      v-if="cashLogData.length != 0"
+      v-for="(item, index) in cashLogData"
+      :key="index"
+    >
      <view class="log-item">
        <view class="log-item-view">
          <view class="title">{{
@@ -18,10 +24,33 @@
        </view>
      </view>
    </view>
+    <!-- 分销业绩 -->
+    <view
+      class="log-way"
+      v-if="achievementData.length != 0"
+      v-for="(item, index) in achievementData"
+      :key="index"
+    >
+      <view class="log-item">
+        <view class="log-item-view">
+          <view class="title">{{ item.goodsName }}</view>
+          <view class="price">提成金额：+{{ item.rebate | unitPrice }}</view>
+        </view>
+        <view class="log-item-view">
+          <view>创建时间：{{ item.createTime }}</view>
+          <view>店铺：{{ item.storeName }}</view>
+        </view>
+        <view class="log-item-footer">
+          <view>会员名称：{{ item.memberName }}</view>
+          <view>订单金额：{{ item.flowPrice | unitPrice }}</view>
+        </view>
+        <view class="log-item-footers">
+          <view>订单号：{{ item.orderSn }}</view>
+        </view>
+      </view>
+    </view>
    <view class="empty" v-if="empty">
      <u-loadmore :status="status" :icon-type="iconType" bg-color="#f7f7f7" />
-
-      <!-- <u-empty   text="暂无更多提现历史" mode="order"></u-empty> -->
    </view>
  </view>
 </template>
@@ -30,7 +59,8 @@ import { cashLog, distributionOrderList } from "@/api/goods";
 export default {
  data() {
    return {
-      datas: "", //数据集合
+      cashLogData: [], //提现记录数据集合
+      achievementData: [], //分销业绩数据合集,
      status: "loadmore",
      iconType: "flower",
      empty: false,
@@ -42,9 +72,6 @@ export default {
      type: 0,
      routers: "",
      achParams: {
-        distributionId: (this.routers && this.routers.id) || "", //分销商id
-        distributionName: (this.routers && this.routers.name) || "", //分销商名称
-        distributionOrderStatus: "", //分销商订单状态
        pageNumber: 1,
        pageSize: 10,
      },
@@ -58,20 +85,30 @@ export default {
      title: title, //这是修改后的导航栏文字
    });
    this.routers = option;
-
+    this.type = option.type;
    option.type == 0 ? this.achievement() : this.history();
  },
  mounted() {},
  onReachBottom() {
    this.status = "loading";
-    this.params.pageNumber++;
-
-    this.type == 1 ? this.history() : this.achievement();
+    this.type == 0 ? this.achParams.pageNumber++ : this.params.pageNumber++;
+    this.type == 0 ? this.achievement() : this.history();
  },
  methods: {
    // 业绩
    achievement() {
-      distributionOrderList(this.achParams).then((res) => {});
+      uni.showLoading({
+        title: "加载中",
+      });
+      distributionOrderList(this.achParams).then((res) => {
+        if (res.data.success && res.data.result.records.length >= 1) {
+          this.achievementData.push(...res.data.result.records);
+        } else {
+          this.status = "nomore";
+          this.empty = true;
+        }
+        uni.hideLoading();
+      });
    },
    // 初始化提现历史
    history() {
@@ -80,7 +117,7 @@ export default {
      });
      cashLog(this.params).then((res) => {
        if (res.data.success && res.data.result.records.length >= 1) {
-          this.datas = res.data.result.records;
+          this.cashLogData.push(...res.data.result.records);
        } else {
          this.status = "nomore";
          this.empty = true;
@@ -118,6 +155,19 @@ export default {
 .log-item-view {
  padding: 8rpx 32rpx;
  display: flex;
+  font-size: 13px;
  justify-content: space-between;
 }
-</style>
+.log-item-footer {
+  padding: 8rpx 32rpx;
+  display: flex;
+  font-size: 13px;
+  justify-content: space-between;
+}
+.log-item-footers {
+  padding: 8rpx 32rpx;
+  display: flex;
+  font-size: 13px;
+  justify-content: space-between;
+}
+</style>
--- a/pages/mine/distribution/home.vue
+++ b/pages/mine/distribution/home.vue
@@ -82,7 +82,7 @@ export default {
      });
    },
  },
-  mounted() {
+  onShow() {
    this.init();
  },
 };
@@ -90,21 +90,15 @@ export default {

 <style lang="scss" scoped>
 .nav {
-  //   height: 176rpx;
  background: #fff;
  align-items: center;
  display: flex;
-  //   border-radius: 20rpx;
-  //   transform: translateY(-20rpx);
-  //   box-shadow: 4rpx 10rpx 22rpx rgba(0, 0, 0, 0.1);
  flex-wrap: wrap;
 }
 .nav-list {
  color: #fff;
  padding: 40rpx 0;
  background: $aider-light-color;
-  //   border-bottom-left-radius: 100rpx;
-  //   border-bottom-right-radius: 100rpx;
 }
 .total {
  padding: 10rpx 0;
--- a/pages/mine/distribution/list.vue
+++ b/pages/mine/distribution/list.vue
@@ -1,7 +1,7 @@
 <template>
  <view class="wrapper">
-    <!-- 筛选弹出层 -->
-    <u-popup width="90%" v-model="popup" mode="right">
+    <!-- 筛选弹出层 TODO后续版本更新 -->
+    <!-- <u-popup width="90%" v-model="popup" mode="right">
      <view class="screen-title">商品筛选</view>

      <view class="screen-view">
@@ -54,7 +54,7 @@
        <view class="screen-clear"> 重置 </view>
        <view class="screen-submit"> 确定 </view>
      </view>
-    </u-popup>
+    </u-popup> -->

    <!-- 导航栏 -->
    <view class="nav">
@@ -66,44 +66,50 @@
    <!-- 商品列表 -->

    <view class="goods-list">
-      <view class="goods-item" v-for="(item, index) in goodsList" :key="index">
-        <view class="goods-item-img" @click="handleNavgationGoods(item)">
-          <u-image width="176rpx" height="176rpx" :src="item.thumbnail"></u-image>
-        </view>
-        <view class="goods-item-desc">
-          <!-- 商品描述 -->
-          <view class="-item-title" @click="handleNavgationGoods(item)">
-            {{ item.goodsName }}
+      <u-swipe-action v-for="(item, index) in goodsList" :disabled="!params.checked" :show="item.___selected" @open="openAction(item)" :index="index" :options="options" bg-color="#fff"
+        ref="swiperAction" :key="item.id" @click="changeActionTab(item)">
+
+        <div class="goods-item">
+          <view class="goods-item-img" @click="handleNavgationGoods(item)">
+            <u-image width="176rpx" height="176rpx" :src="item.thumbnail"></u-image>
          </view>
-          <!-- 商品金额 -->
-          <view class="-item-price" @click="handleNavgationGoods(item)">
-            佣金:
-            <span> ￥{{ item.commission | unitPrice }}</span>
-          </view>
-          <!-- 比率佣金 -->
-          <view class="-item-bottom">
-            <view class="-item-bootom-money" @click="handleNavgationGoods(item)">
-              <!-- <view class="-item-bl">
+          <view class="goods-item-desc">
+            <!-- 商品描述 -->
+            <view class="-item-title" @click="handleNavgationGoods(item)">
+              {{ item.goodsName }}
+            </view>
+            <!-- 商品金额 -->
+            <view class="-item-price" @click="handleNavgationGoods(item)">
+              佣金:
+              <span> ￥{{ item.commission | unitPrice }}</span>
+            </view>
+            <!-- 比率佣金 -->
+            <view class="-item-bottom">
+              <view class="-item-bootom-money" @click="handleNavgationGoods(item)">
+                <!-- <view class="-item-bl">
                比率:
                <span>{{ "5.00%" }}</span>
              </view> -->
-              <view class="-item-yj">
-                <span>￥{{ item.price | unitPrice }}</span>
+                <view class="-item-yj">
+                  <span>￥{{ item.price | unitPrice }}</span>
+                </view>
+              </view>
+              <view>
+                <view class="click" v-if="!params.checked" @click="handleClickGoods(item)">立即选取</view>
+                <view class="click" v-if="params.checked" @click="handleLink(item)">分销商品</view>
              </view>
            </view>
-            <view>
-              <view class="click" v-if="!params.checked" @click="handleClickGoods(item)">立即选取</view>
-              <view class="click" v-if="params.checked" @click="handleLink(item)">分销商品</view>
-            </view>
          </view>
-        </view>
-      </view>
+        </div>
+      </u-swipe-action>
+
      <view class="empty">
        <!-- <u-empty v-if="empty" text="没有分销商品了" mode="list"></u-empty> -->
      </view>
    </view>
    <canvas class="canvas-hide" canvas-id="qrcode" />
    <drawCanvas ref="drawCanvas" v-if="showFlag" :res="res" />
+    <u-modal v-model="deleteShow" :confirm-style="{'color':lightColor}" @confirm="delectConfirm" show-cancel-button :content="deleteContent" :async-close="true"></u-modal>

  </view>
 </template>
@@ -118,6 +124,17 @@ import drawCanvas from "@/components/m-canvas";
 export default {
  data() {
    return {
+      lightColor: this.$lightColor,
+      deleteContent: "解绑该商品？", //删除显示的信息
+      // 商品栏右侧滑动按钮
+      options: [
+        {
+          text: "解绑",
+          style: {
+            backgroundColor: this.$lightColor, //高亮颜色
+          },
+        },
+      ],
      showFlag: false, //分销分享开关
      empty: false,
      popup: false, //弹出层开关
@@ -147,6 +164,8 @@ export default {
      },

      routers: "",
+      deleteShow: false, //删除模态框
+      goodsVal: false, //分销商铺信息
    };
  },
  components: {
@@ -155,17 +174,55 @@ export default {
  onLoad(options) {
    this.routers = options;
  },
-  watch: {
-    showFlag(val) {},
-  },
+  watch: {},
  onShow() {
    this.goodsList = [];
    this.init();
  },
  methods: {
+    /**
+     * 滑动删除
+     */
+    changeActionTab(val) {
+      this.deleteShow = true;
+      this.goodsVal = val;
+    },
+
+    /**
+     * 点击解绑商品
+     */
+    delectConfirm() {
+      checkedDistributionGoods({ id: this.goodsVal.id, checked: false }).then(
+        (res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "此商品解绑成功",
+              duration: 2000,
+            });
+            this.deleteShow = false;
+            this.goodsList = [];
+            this.init();
+          }
+        }
+      );
+    },
+
+    /**
+     * 左滑打开删除
+     */
+    openAction(val) {
+      this.goodsList.forEach((item) => {
+        this.$set(item, "___selected", false);
+      });
+      this.$set(val, "___selected", true);
+    },
+
+    /**
+     * 查看图片
+     */
    handleNavgationGoods(val) {
      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.id}`,
+        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`,
      });
    },

@@ -214,12 +271,7 @@ export default {

    // 选择商品
    handleClickGoods(val) {
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      checkedDistributionGoods(val.id).then((res) => {
-        uni.hideLoading();
+      checkedDistributionGoods({ id: val.id, checked: true }).then((res) => {
        if (res.data.success) {
          uni.showToast({
            title: "已添加到我的选品库",
@@ -236,13 +288,11 @@ export default {
    },

    init() {
-      uni.showLoading({
-        title: "加载中",
-      });
      distributionGoods(this.params).then((res) => {
-        uni.hideLoading();
-
        if (res.data.success && res.data.result.records.length >= 1) {
+          res.data.result.records.forEach((item) => {
+            this.$set(item, "___selected", false);
+          });
          this.goodsList.push(...res.data.result.records);
        }
        if (this.goodsList.length == 0) {
@@ -404,7 +454,7 @@ export default {
      overflow: hidden;
    }
    > .-item-price {
-      color: $jd-color;
+      color: $price-color;
      > span {
        font-size: 36rpx;
      }
--- a/pages/mine/help/tips.vue
+++ b/pages/mine/help/tips.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="wrapper">
-    <div v-html="res.content"></div>
+    <u-parse v-html="res.content"></u-parse>

  </div>
 </template>
--- a/pages/mine/msgTips/packageMsg/logisticsDetail.vue
+++ b/pages/mine/msgTips/packageMsg/logisticsDetail.vue
@@ -30,11 +30,8 @@
 </template>

 <script>
-import uniSteps from "@/components/uni-steps/uni-steps.vue";
 import { getExpress } from "@/api/trade.js";
-
 export default {
-  components: { uniSteps },
  data() {
    return {
      express: "",
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -1,421 +1,440 @@
-<template>
-  <view class="content">
-    <view class="navbar">
-      <!-- 循环出顶部nav栏 -->
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="tabClick(index)">
-        <text :class="{current: tabCurrentIndex === index}">{{item.text}}</text>
-      </view>
-    </view>
-    <view class="swiper-box">
-      <!-- 显示商品栏 -->
-      <view v-if="tabCurrentIndex == 0" class="tab-content">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
-          <!-- 空白页 -->
-          <u-empty text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
-           <!-- 商品展示数据 -->
-          <u-swipe-action @open="openLeftChange(item,index,'goods')" :show="item.selected" btn-width="180" :options="LeftOptions" v-else v-for="(item,index) in goodList"
-            @click="clickGoodsSwiperAction(item,index)" :index="index" :key="index">
-            <view class="goods" @click="goGoodsDetail(item)">
-              <u-image width="131rpx" height="131rpx" :src="item.image" mode="aspectFit">
-                <u-loading slot="loading"></u-loading>
-              </u-image>
-              <view class="goods-intro">
-                <view>{{item.goodsName}}</view>
-                <view class="goods-sn">{{item.goods_sn}}</view>
-                <view>￥{{item.price | unitPrice}}</view>
-              </view>
-            </view>
-          </u-swipe-action>
-
-          <uni-load-more :status="goodsLoad"></uni-load-more>
-        </scroll-view>
-      </view>
-      <!-- 显示收藏的店铺栏 -->
-      <view v-else class="tab-content">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
-          <!-- 空白页 -->
-          <u-empty text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
-          <!-- 店铺展示数据 -->
-          <u-swipe-action @open="openLeftChange(item,'store')" :show="item.selected" btn-width="180" :options="LeftOptions" v-else v-for="(item,index) in storeList" :key="index"
-            @click="clickstoreSwiperAction(item)">
-            <view class="store" @click="gostoreMainPage(item.storeId)">
-              <view class="intro">
-                <view class="store-logo">
-                  <u-image width="102rpx" height="102rpx" :src="item.logo" :alt="item.storeName" mode="aspectFit">
-                    <u-loading slot="loading"></u-loading>
-                  </u-image>
-                </view>
-                <view class="store-name">
-                  <view>{{item.storeName}}</view>
-                  <u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated" text="自营" mode="plain" shape="circle" />
-                </view>
-                <view class="store-collect">
-                  <view>进店逛逛</view>
-                </view>
-              </view>
-            </view>
-          </u-swipe-action>
-          <uni-load-more :status="storeLoad"></uni-load-more>
-        </scroll-view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import {
-  getGoodsCollection,
-  deleteGoodsCollection,
-  deleteStoreCollection,
-} from "@/api/members.js";
-export default {
-  data() {
-    return {
-      // 商品左滑侧边栏
-      LeftOptions: [
-        {
-          text: "取消",
-          style: {
-            backgroundColor: this.$lightColor,
-          },
-        },
-      ],
-      tabCurrentIndex: 0, //tab的下标默认为0，也就是说会默认请求商品
-      navList: [
-        //tab显示数据
-        {
-          text: "商品(0)",
-          loadingType: "more",
-          params: {
-            pageNumber: 1,
-            pageSize: 10,
-          },
-        },
-        {
-          text: "店铺(0)",
-          loadingType: "more",
-          params: {
-            pageNumber: 1,
-            pageSize: 10,
-          },
-        },
-      ],
-      goodsLoad: "more", //商品加载
-      storeLoad: "more", //店铺加载
-      goodsEmpty: false, //商品数据是否为空
-      storeEmpty: false, //店铺数据是否为空
-      goodList: [], //商品集合
-      storeList: [], //店铺集合
-    };
-  },
-  onLoad() {
-    this.getGoodList();
-    this.getstoreList();
-  },
-
-  methods: {
-    /**
-     * 打开商品左侧取消收藏
-     */
-    openLeftChange(val, type) {
-      const { goodList, storeList } = this;
-      let way;
-      type == "goods" ? (way = goodList) : (way = storeList);
-      way.forEach((item) => {
-        this.$set(item, "selected", false);
-      });
-      this.$set(val, "selected", false);
-      val.selected = true;
-    },
-
-    /**
-     * 点击商品左侧取消收藏
-     */
-    clickGoodsSwiperAction(val) {
-      deleteGoodsCollection(val.skuId).then((res) => {
-      
-        if (res.statusCode == 200) {
-          this.storeList = [];
-          this.goodList = [];
-          this.getGoodList();
-        }
-      });
-    },
-
-    /**
-     * 点击店铺左侧取消收藏
-     */
-    clickstoreSwiperAction(val) {
-      deleteStoreCollection(val.storeId).then((res) => {
-        if (res.statusCode == 200) {
-          this.storeList = [];
-          this.getstoreList();
-        }
-      });
-    },
-
-    /**
-     * 顶部tab点击
-     */
-    tabClick(index) {
-      this.tabCurrentIndex = index;
-  
-    },
-
-    /**
-     * 查看商品详情
-     */
-    goGoodsDetail(val) {
-      //商品详情
-      uni.navigateTo({
-        url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
-      });
-    },
-
-    /**
-     * 查看店铺详情
-     */
-    gostoreMainPage(id) {
-      //店铺主页
-      uni.navigateTo({
-        url: "/pages/product/shopPage?id=" + id,
-      });
-    },
-
-    /**
-     * 获取商品集合
-     */
-    getGoodList() {
-      uni.showLoading({
-        title: "加载中",
-      });
-      getGoodsCollection(this.navList[0].params, "GOODS").then((res) => {
-        uni.hideLoading();
-        uni.stopPullDownRefresh();
-        if (res.data.success) {
-          let data = res.data.result;
-          data.selected = false;
-          this.navList[0].text = `商品(${data.total})`;
-          if (data.total == 0) {
-            this.goodsEmpty = true;
-          } else if (data.total < 10) {
-            this.goodsLoad = "noMore";
-            this.goodList.push(...data.records);
-          } else {
-            this.goodList.push(...data.records);
-            if (data.total.length < 10) this.goodsLoad = "noMore";
-          }
-        }
-      });
-    },
-
-    /**
-     * 获取店铺集合
-     */
-    getstoreList() {
-      uni.showLoading({
-        title: "加载中",
-      });
-      getGoodsCollection(this.navList[1].params, "store").then((res) => {
-        uni.hideLoading();
-        uni.stopPullDownRefresh();
-        if (res.data.success) {
-          let data = res.data.result;
-          data.selected = false;
-          this.navList[1].text = `店铺(${data.total})`;
-          if (data.total == 0) {
-            this.storeEmpty = true;
-          } else if (data.total < 10) {
-            this.storeLoad = "noMore";
-            this.storeList.push(...data.records);
-          } else {
-            this.storeList.push(...data.records);
-            if (data.total.length < 10) this.storeLoad = "noMore";
-          }
-        }
-      });
-    },
-
-    /**
-     * 底部加载更多
-     */
-    loadMore() {
-      if (this.tabCurrentIndex == 0) {
-        this.navList[0].params.pageNumber++;
-        this.getGoodList();
-      } else {
-        this.navList[1].params.pageNumber++;
-        this.getstoreList();
-      }
-    },
-  },
-
-  /**
-   * 下拉刷新时
-   */
-  onPullDownRefresh() {
-    if (this.tabCurrentIndex == 0) {
-      this.navList[0].params.pageNumber = 1;
-      this.goodList = [];
-      this.getGoodList();
-    } else {
-      this.navList[1].params.pageNumber = 1;
-      this.storeList = [];
-      this.getstoreList();
-    }
-  },
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-  background: $page-color-base;
-  height: 100%;
-}
-.content {
-  width: 100%;
-  overflow: hidden;
-}
-.swiper-box {
-  overflow-y: auto;
-}
-
-.list-scroll-content {
-  height: 100%;
-  width: 100%;
-}
-
-/deep/ .u-swipe-content {
-  overflow: hidden;
-}
-.goods {
-  background-color: #fff;
-  border-bottom: 1px solid $border-color-light;
-  height: 190rpx;
-  display: flex;
-  align-items: center;
-  padding: 30rpx 20rpx;
-  margin-top: 20rpx;
-  image {
-    width: 131rpx;
-    height: 131rpx;
-    border-radius: 10rpx;
-  }
-  .goods-intro {
-    flex: 1;
-    font-size: $font-base;
-    line-height: 48rpx;
-    margin-left: 30rpx;
-
-    view:nth-child(1) {
-      line-height: 1.4em;
-      font-size: 24rpx;
-      max-height: 2.8em; //height是line-height的整数倍，防止文字显示不全
-      overflow: hidden;
-      color: #666;
-    }
-    view:nth-child(2) {
-      color: #cccccc;
-      font-size: 24rpx;
-    }
-    view:nth-child(3) {
-      color: $light-color;
-    }
-  }
-  button {
-    color: $main-color;
-    height: 50rpx;
-    width: 120rpx;
-    font-size: $font-sm;
-    padding: 0;
-    line-height: 50rpx;
-    background-color: #ffffff;
-    margin-top: 80rpx;
-    &::after {
-      border-color: $main-color;
-    }
-  }
-}
-.store {
-  background-color: #fff;
-  border: 1px solid $border-color-light;
-  border-radius: 16rpx;
-  margin: 20rpx 10rpx;
-  .intro {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 30rpx 0 40rpx;
-    height: 170rpx;
-
-    .store-logo {
-      width: 102rpx;
-      height: 102rpx;
-      border-radius: 50%;
-      overflow: hidden;
-      image {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-      }
-    }
-    .store-name {
-      flex: 1;
-      margin-left: 30rpx;
-      line-height: 2em;
-      :first-child {
-        font-size: $font-base;
-      }
-      :last-child {
-        font-size: $font-sm;
-        color: #999;
-      }
-    }
-    .store-collect {
-      border-left: 1px solid $border-color-light;
-      padding-left: 20rpx;
-      text-align: center;
-      :last-child {
-        color: #999;
-        font-size: $font-sm;
-      }
-    }
-  }
-}
-.navbar {
-  display: flex;
-  height: 40px;
-  padding: 0 5px;
-  background: #fff;
-  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-  position: relative;
-  z-index: 10;
-  .nav-item {
-    flex: 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    font-size: 26rpx;
-
-    text {
-      position: relative;
-    }
-    text.current {
-      color: $light-color;
-      font-weight: bold;
-      font-size: 28rpx;
-      &::after {
-        content: "";
-        position: absolute;
-        left: 20rpx;
-        bottom: -10rpx;
-        width: 30rpx;
-        height: 0;
-        border-bottom: 2px solid $light-color;
-      }
-    }
-  }
-}
-</style>
+<template>
+	<view class="content">
+		<u-navbar>
+			<u-tabs :active-color="lightColor"  class="slot-wrap" :list="navList" count="count" :is-scroll="true" :current="tabCurrentIndex" @change="tabClick"></u-tabs>
+		</u-navbar>
+		<view class="swiper-box">
+			<!-- 显示商品栏 -->
+			<view v-if="tabCurrentIndex == 0" class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<!-- 空白页 -->
+					<u-empty style="margin-top: 40rpx" text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
+					<!-- 商品展示数据 -->
+					<u-swipe-action @open="openLeftChange(item, index, 'goods')" :show="item.selected" btn-width="180"
+						:options="LeftOptions" v-else v-for="(item, index) in goodList"
+						@click="clickGoodsSwiperAction(item, index)" :index="index" :key="index">
+						<view class="goods" @click="goGoodsDetail(item)">
+							<u-image width="131rpx" height="131rpx" :src="item.image" mode="aspectFit">
+								<u-loading slot="loading"></u-loading>
+							</u-image>
+							<view class="goods-intro">
+								<view>{{ item.goodsName }}</view>
+								<view class="goods-sn">{{ item.goods_sn }}</view>
+								<view>￥{{ item.price | unitPrice }}</view>
+							</view>
+						</view>
+					</u-swipe-action>
+
+				</scroll-view>
+			</view>
+			<!-- 显示收藏的店铺栏 -->
+			<view v-else class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<!-- 空白页 -->
+					<u-empty style="margin-top: 40rpx" text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
+					<!-- 店铺展示数据 -->
+					<u-swipe-action @open="openLeftChange(item, 'store')" :show="item.selected" btn-width="180"
+						:options="LeftOptions" v-else v-for="(item, index) in storeList" :key="index"
+						@click="clickStoreSwiperAction(item)">
+						<view class="store" @click="goStoreMainPage(item.id)">
+							<view class="intro">
+								<view class="store-logo">
+									<u-image width="102rpx" height="102rpx" :src="item.storeLogo" :alt="item.storeName"
+										mode="aspectFit">
+										<u-loading slot="loading"></u-loading>
+									</u-image>
+								</view>
+								<view class="store-name">
+									<view>{{ item.storeName }}</view>
+									<u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated"
+										text="自营" mode="plain" shape="circle" />
+								</view>
+								<view class="store-collect">
+									<view>进店逛逛</view>
+								</view>
+							</view>
+						</view>
+					</u-swipe-action>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getGoodsCollection,
+		deleteGoodsCollection,
+		deleteStoreCollection,
+	} from "@/api/members.js";
+	export default {
+		data() {
+			return {
+        lightColor:this.$lightColor,
+				// 商品左滑侧边栏
+				LeftOptions: [{
+					text: "取消",
+					style: {
+						backgroundColor: this.$lightColor,
+					},
+				}, ],
+				tabCurrentIndex: 0, //tab的下标默认为0，也就是说会默认请求商品
+				navList: [
+					//tab显示数据
+					{
+						name: "商品(0)",
+					
+						params: {
+							pageNumber: 1,
+							pageSize: 10,
+						},
+					},
+					{
+						name: "店铺(0)",
+					
+						params: {
+							pageNumber: 1,
+							pageSize: 10,
+						},
+					},
+				],
+			
+				goodsEmpty: false, //商品数据是否为空
+				storeEmpty: false, //店铺数据是否为空
+				goodList: [], //商品集合
+				storeList: [], //店铺集合
+			};
+		},
+		onLoad() {
+			this.getGoodList();
+			this.getStoreList();
+		},
+		onReachBottom() {
+			if (this.tabCurrentIndex == 0) {
+				this.navList[0].params.pageNumber++;
+				this.getGoodList();
+			} else {
+				this.navList[1].params.pageNumber++;
+				this.getStoreList();
+			}
+		},
+
+		methods: {
+			/**
+			 * 打开商品左侧取消收藏
+			 */
+			openLeftChange(val, type) {
+				const {
+					goodList,
+					storeList
+				} = this;
+				let way;
+				type == "goods" ? (way = goodList) : (way = storeList);
+				way.forEach((item) => {
+					this.$set(item, "selected", false);
+				});
+				this.$set(val, "selected", false);
+				val.selected = true;
+			},
+
+			/**
+			 * 点击商品左侧取消收藏
+			 */
+			clickGoodsSwiperAction(val) {
+				deleteGoodsCollection(val.skuId).then((res) => {
+					if (res.statusCode == 200) {
+						this.storeList = [];
+						this.goodList = [];
+						this.getGoodList();
+					}
+				});
+			},
+
+			/**
+			 * 点击店铺左侧取消收藏
+			 */
+			clickStoreSwiperAction(val) {
+				deleteStoreCollection(val.storeId).then((res) => {
+					if (res.statusCode == 200) {
+						this.storeList = [];
+						this.getStoreList();
+					}
+				});
+			},
+
+			/**
+			 * 顶部tab点击
+			 */
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+
+			/**
+			 * 查看商品详情
+			 */
+			goGoodsDetail(val) {
+				//商品详情
+				uni.navigateTo({
+					url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
+				});
+			},
+
+			/**
+			 * 查看店铺详情
+			 */
+			goStoreMainPage(id) {
+				//店铺主页
+				uni.navigateTo({
+					url: "/pages/product/shopPage?id=" + id,
+				});
+			},
+
+			/**
+			 * 获取商品集合
+			 */
+			getGoodList() {
+				uni.showLoading({
+					title: "加载中",
+				});
+				getGoodsCollection(this.navList[0].params, "GOODS").then((res) => {
+					uni.hideLoading();
+					uni.stopPullDownRefresh();
+					if (res.data.success) {
+						let data = res.data.result;
+						data.selected = false;
+						  this.navList[0].name = `商品(${data.total})`;
+          
+						if (data.total == 0) {
+							this.goodsEmpty = true;
+						} else if (data.total < 10) {
+							this.goodsLoad = "noMore";
+							this.goodList.push(...data.records);
+						} else {
+							this.goodList.push(...data.records);
+							if (data.total.length < 10) this.goodsLoad = "noMore";
+						}
+					}
+				});
+			},
+
+			/**
+			 * 获取店铺集合
+			 */
+			getStoreList() {
+				uni.showLoading({
+					title: "加载中",
+				});
+				getGoodsCollection(this.navList[1].params, "store").then((res) => {
+					uni.hideLoading();
+					uni.stopPullDownRefresh();
+					if (res.data.success) {
+						let data = res.data.result;
+						data.selected = false;
+						 this.navList[1].name = `店铺(${data.total})`;
+						if (data.total == 0) {
+							this.storeEmpty = true;
+						} else if (data.total < 10) {
+						
+							this.storeList.push(...data.records);
+						} 
+					}
+				});
+			},
+		},
+
+		/**
+		 * 下拉刷新时
+		 */
+		onPullDownRefresh() {
+			if (this.tabCurrentIndex == 0) {
+				this.navList[0].params.pageNumber = 1;
+				this.goodList = [];
+				this.getGoodList();
+			} else {
+				this.navList[1].params.pageNumber = 1;
+				this.storeList = [];
+				this.getStoreList();
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+  .slot-wrap{
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    padding-right: 72rpx;
+  }
+
+	.content {
+		width: 100%;
+	}
+
+	.swiper-box {
+		overflow-y: auto;
+	}
+
+	.list-scroll-content {
+		height: 100%;
+		width: 100%;
+	}
+
+	/deep/ .u-swipe-content {
+		overflow: hidden;
+	}
+
+	.goods {
+		background-color: #fff;
+		border-bottom: 1px solid $border-color-light;
+		height: 190rpx;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 20rpx;
+		margin-top: 20rpx;
+
+		image {
+			width: 131rpx;
+			height: 131rpx;
+			border-radius: 10rpx;
+		}
+
+		.goods-intro {
+			flex: 1;
+			font-size: $font-base;
+			line-height: 48rpx;
+			margin-left: 30rpx;
+
+			view:nth-child(1) {
+				line-height: 1.4em;
+				font-size: 24rpx;
+				max-height: 2.8em; //height是line-height的整数倍，防止文字显示不全
+				overflow: hidden;
+				color: #666;
+			}
+
+			view:nth-child(2) {
+				color: #cccccc;
+				font-size: 24rpx;
+			}
+
+			view:nth-child(3) {
+				color: $light-color;
+			}
+		}
+
+		button {
+			color: $main-color;
+			height: 50rpx;
+			width: 120rpx;
+			font-size: $font-sm;
+			padding: 0;
+			line-height: 50rpx;
+			background-color: #ffffff;
+			margin-top: 80rpx;
+
+			&::after {
+				border-color: $main-color;
+			}
+		}
+	}
+
+	.store {
+		background-color: #fff;
+		border: 1px solid $border-color-light;
+		border-radius: 16rpx;
+		margin: 20rpx 10rpx;
+
+		.intro {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 30rpx 0 40rpx;
+			height: 170rpx;
+
+			.store-logo {
+				width: 102rpx;
+				height: 102rpx;
+				border-radius: 50%;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+				}
+			}
+
+			.store-name {
+				flex: 1;
+				margin-left: 30rpx;
+				line-height: 2em;
+
+				:first-child {
+					font-size: $font-base;
+				}
+
+				:last-child {
+					font-size: $font-sm;
+					color: #999;
+				}
+			}
+
+			.store-collect {
+				border-left: 1px solid $border-color-light;
+				padding-left: 20rpx;
+				text-align: center;
+
+				:last-child {
+					color: #999;
+					font-size: $font-sm;
+				}
+			}
+		}
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 26rpx;
+
+			text {
+				position: relative;
+			}
+
+			text.current {
+				color: $light-color;
+				font-weight: bold;
+				font-size: 28rpx;
+
+				&::after {
+					content: "";
+					position: absolute;
+					left: 20rpx;
+					bottom: -10rpx;
+					width: 30rpx;
+					height: 0;
+					border-bottom: 2px solid $light-color;
+				}
+			}
+		}
+	}
+</style>
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -1,13 +1,19 @@
 <template>
  <view class="myTracks">
+    <u-navbar title="我的足迹">
+      <div @click="changeRightBtn" slot="right" style="margin-right:32rpx">
+        {{edit}}
+      </div>
+    </u-navbar>
    <u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
    <div v-else>
-      <view  v-for="(item, index) in trackList" :key="index">
+      <view v-for="(item, index) in trackList" :key="index">
        <view class="myTracks-title" @click="navgaiteToStore(item)">{{item.storeName}}</view>
        <view class="myTracks-items">
          <view class="myTracks-item">
            <u-checkbox-group>
-              <u-checkbox v-model="item.___isDel" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx" @change="changeChecked(item)"></u-checkbox>
+              <u-checkbox v-model="item.___isDel" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx"
+                @change="changeChecked(item)"></u-checkbox>
            </u-checkbox-group>
            <view class="myTracks-item-img" @click.stop="navgaiteToDetail(item)">
              <image :src="item.thumbnail"></image>
@@ -29,17 +35,17 @@
      <uni-load-more :status="loadStatus"></uni-load-more>
    </div>
    <view v-if="editFlag">
-      <view class="myTracks-action-placeholder"></view>
      <view class="myTracks-action">
        <view class="myTracks-action-check">
          <u-checkbox-group>
-            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx" @change="checkedAllitem"></u-checkbox>
+            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx"
+              @change="checkedAllitem"></u-checkbox>
            全选
          </u-checkbox-group>
        </view>

        <view>
-          <u-button type="warning" plain="true" @click="delAllTracks" class="myTracks-action-btn">
+          <u-button type="warning"  @click="delAllTracks" class="myTracks-action-btn">
            删除
          </u-button>
        </view>
@@ -54,6 +60,7 @@ import { myTrackList, deleteHistoryListId } from "@/api/members.js";
 export default {
  data() {
    return {
+      edit: "编辑",
      editFlag: false, //是否编辑
      allChecked: false, //是否全选
      loadStatus: "more", //底部下拉加载状态
@@ -79,6 +86,10 @@ export default {
  onLoad() {
    this.getList();
  },
+  onPullDownRefresh() {
+    this.trackList = [];
+    this.getList();
+  },
  methods: {
    /**
     * 导航到店铺
@@ -159,11 +170,31 @@ export default {
    /**
     * 点击后判断是不是全选
     */
+    
    changeChecked(val) {
+      var opt = null;
      const isCheckedAll = this.trackList.every((key) => {
-        return key.___isDel == val.___isDel;
+        key.___isDel == val.___isDel;  
+        opt = key.___isDel;
+        return opt;
      });
-      this.allChecked = isCheckedAll;
+      if(opt){
+        this.allChecked = isCheckedAll;
+      }else{
+        this.allChecked = false;
+      }     
+    },
+
+    /**
+     * 右侧标签栏切换
+     */
+    changeRightBtn(e) {
+      if (!this.editFlag) {
+        this.edit = "完成";
+      } else {
+        this.edit = "编辑";
+      }
+      this.editFlag = !this.editFlag;
    },

    /**
@@ -202,18 +233,6 @@ export default {
      });
    },
  },
-
-  /**
-   * 右侧标签栏切换
-   */
-  onNavigationBarButtonTap(e) {
-    if (!this.editFlag) {
-      this.setStyle("完成");
-    } else {
-      this.setStyle("编辑");
-    }
-    this.editFlag = !this.editFlag;
-  },
 };
 </script>

@@ -286,6 +305,18 @@ export default {
  color: $light-color;
  padding: 10rpx 0 0 0;
 }
+.myTracks-action{
+  display: flex;
+  justify-content: space-between;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background: #fff;
+  height: 75rpx;
+  align-items: center;
+  padding: 0 32rpx;
+}

 .myTracks-action-btn {
  width: 130rpx;
@@ -298,9 +329,7 @@ export default {
  height: 20rpx;
 }

-.myTracks-action-placeholder {
-  height: 110rpx;
-}
+

 .myTracks-action-check {
  align-items: center;
--- a/pages/mine/point/myPoint.vue
+++ b/pages/mine/point/myPoint.vue
@@ -4,7 +4,7 @@
      <image src="/static/pointTrade/point_bg_1.png" mode=""></image>
      <image class="point-img" src="/static/pointTrade/tradehall.png" />
      <view class="position-point">
-        <view class="apply-point" @click="goIntro"><text>积分介绍</text></view>
+       

      </view>
    </view>
@@ -25,7 +25,7 @@
          <view>{{ item.content }}</view>
          <view>{{ item.createTime}}</view>
        </view>
-        <view><span>{{item.pointType == "1" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
+        <view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
      </view>
      <uni-load-more :status="count.loadStatus"></uni-load-more>
    </div>
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -1,7 +1,7 @@

 <template>
  <view class="edition-intro">
-    <image src="https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png" class="logo" />
+    <image :src="config.logo" class="logo" />
    <h1> {{config.name}}</h1>
    <view class='version'>
      <!-- #ifdef APP-PLUS -->
@@ -24,11 +24,11 @@
    </u-cell-group>

    <view class="intro">
-      <view>客服热线：13161366885</view>
-      <view style="margin:20rpx 0 0 0;">客服邮箱：lili@lili.com</view>
+      <view>{{config.customerServiceMobile ? `客服热线：${config.customerServiceMobile}` :  ``}}</view>
+      <view style="margin:20rpx 0 0 0;">{{config.customerServiceEmail ? `客服邮箱：${config.customerServiceEmail}` :  ``}}</view>

      <view>
-        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《lili商城用户协议》</view>
+        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《{{config.name}}用户协议》</view>
        <view>CopyRight @{{config.name}} </view>
      </view>
    </view>
@@ -54,6 +54,7 @@ export default {
    };
  },
  onLoad() {
+    // #ifdef APP-PLUS
    const platform = uni.getSystemInfoSync().platform;
    /**
     * 获取是否是安卓
@@ -72,6 +73,7 @@ export default {
        version: inf.version,
      };
    });
+    // #endif
  },

  methods: {
--- a/pages/mine/set/feedBack.vue
+++ b/pages/mine/set/feedBack.vue
@@ -2,7 +2,7 @@
  <div class="feedBack">
    <div class="feedBack-box">
      <h4>猜你想问</h4>
-      <div class="feedBack-item" @click="handleClick(index)" v-for="(item,index) in list" :key="index">
+      <div class="feedBack-item" :class="{'active':feedBack.type == item.value }" @click="handleClick(index)" v-for="(item,index) in list" :key="index">
        {{item.text}}
      </div>
    </div>
@@ -130,6 +130,10 @@ export default {
  margin: 0 auto;
  border-radius: 100px;
 }
+.active{
+  color: $light-color !important;
+  font-weight: bold;
+}
 .feedBack {
  padding-bottom: 100rpx;
 }
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -45,7 +45,7 @@ export default {
        face: storage.getUserInfo().face || "/static/missing-face.png", //默认头像
        regionId: [], //地址Id
        region: storage.getUserInfo().region || [], //地址
-        sex: storage.getUserInfo().sex || 1, //性别
+        sex: storage.getUserInfo().sex, //性别
        ___path: storage.getUserInfo().region,
      },
      birthday: storage.getUserInfo().birthday || "", //生日
@@ -98,23 +98,14 @@ export default {
     * 提交保存
     */
    submit() {
-      if (this.form.regionId.length != 0 && this.birthday) {
-        delete this.form.___path;
-        let params = JSON.parse(JSON.stringify(this.form));
-        saveUserInfo(params).then((res) => {
-       
-          if (res.statusCode == 200) {
-            storage.setUserInfo(res.data.result);
-            uni.navigateBack();
-          }
-        });
-      } else {
-        uni.showToast({
-          title: "请填写生日和城市!",
-          duration: 2000,
-          icon: "none",
-        });
-      }
+      delete this.form.___path;
+      let params = JSON.parse(JSON.stringify(this.form));
+      saveUserInfo(params).then((res) => {
+        if (res.statusCode == 200) {
+          storage.setUserInfo(res.data.result);
+          uni.navigateBack();
+        }
+      });
    },

    /**
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -9,17 +9,17 @@
    <u-form :model="codeForm" class="form" ref="validateCodeForm">
      <view v-if="!validateFlage">
        <u-form-item label-width="120" label="手机号" prop="mobile">
-          <u-input v-model="codeForm.mobile" placeholder="请输入您的手机号" />
+          <u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
        </u-form-item>

        <u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
-          <u-input v-model="codeForm.code" placeholder="请输入验证码" />
+          <u-input  v-model="codeForm.code" placeholder="请输入验证码" />
          <u-verification-code unique-key="page-edit" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
          <view @tap="getCode" class="text-tips">{{ tips }}</view>
        </u-form-item>

        <view class="submit" @click="validatePhone">验证</view>
-        <myVerification keep-running @send="verification" class="verification" ref="verification" business="LOGIN" />
+        <myVerification keep-running @send="verification" class="verification" ref="verification" business="FIND_USER" />
      </view>
      <view v-if="validateFlage">
        <u-form-item label-width="120" label="旧密码">
@@ -40,7 +40,7 @@

 <script>
 import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
-import storage from "@/utils/storage.js";
+
 import { md5 } from "@/utils/md5.js"; // md5
 import myVerification from "@/components/verification/verification.vue"; //验证
 import uuid from "@/utils/uuid.modified.js";
@@ -108,7 +108,7 @@ export default {
          uni.showLoading({
            title: "正在获取验证码",
          });
-          sendMobile(this.codeForm.mobile).then((res) => {
+          sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
            uni.hideLoading();
            // 这里此提示会被this.start()方法中的提示覆盖
            if (res.data.code == 200) {
@@ -161,8 +161,7 @@ export default {
        if (valid) {
          resetByMobile(this.codeForm).then((res) => {
            if (res.data.success) {
-              storage.setAccessToken(res.data.result.accessToken);
-              storage.setRefreshToken(res.data.result.refreshToken);
+              this.validateFlage = !this.validateFlage;
              // 登录成功
              uni.showToast({
                title: "验证成功!",
@@ -238,6 +237,9 @@ page {
  padding: 80rpx 0;
  border-radius: 20rpx;
 }
+.submit {
+  background: $light-color;
+}
 .box-tips {
  margin: 0 72rpx;
 }
--- a/pages/mine/set/securityCenter/securityCenter.vue
+++ b/pages/mine/set/securityCenter/securityCenter.vue
@@ -17,13 +17,10 @@ export default {
  methods: {
    navigateTo(url) {
      uni.navigateTo({
-        url: url + `?mobile=${this.mobile}`,
+        url: url,
      });
    },
  },
-  onLoad(option) {
-    this.mobile = option.mobile;
-  },
 };
 </script>

--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -1,7 +1,8 @@
 <template>
  <view class="container">
    <view class="person" @click="checkUserInfo()">
-      <u-image width=140 height="140" shape="circle" :src="userInfo.face || '/static/missing-face.png'" mode=""></u-image>
+      <u-image width=140 height="140" shape="circle" :src="userInfo.face || '/static/missing-face.png'" mode="">
+      </u-image>
      <view class="user-name">

        {{ userInfo.id ? userInfo.nickName || '' : '暂未登录'  }}
@@ -22,11 +23,13 @@
      <u-cell-item :title="`关于${config.name}`" @click="navigateTo('/pages/mine/set/editionIntro')"></u-cell-item>
    </u-cell-group>
    <view class="submit" @click="showModalDialog">{{userInfo.id ?'退出登录':'返回登录'}}</view>
-    <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true" :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"></u-modal>
+    <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true"
+      :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"></u-modal>
  </view>
 </template>

 <script>
+import { logout } from "@/api/login";
 import storage from "@/utils/storage.js";
 import config from "@/config/config";
 export default {
@@ -50,18 +53,20 @@ export default {
        url: url,
      });
    },
+    clear() {
+      storage.setAccessToken("");
+      storage.setRefreshToken("");
+      storage.setUserInfo({});
+      this.$options.filters.navigateToLogin("redirectTo");
+    },

    /**
     * 确认退出
     * 清除缓存重新登录
     */
-    confirm() {
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-      uni.redirectTo({
-        url: "/pages/passport/login",
-      });
+    async confirm() {
+      await logout();
+      this.clear();
    },

    /**
--- a/pages/mine/signIn.vue
+++ b/pages/mine/signIn.vue
@@ -1,26 +1,30 @@
 <template>
  <view class="sign-in">
-    <view class="signin-btn-con">
-      <div class="circle-box">
-        <div class="cricle" @click="signIn()">
-          <span v-if="!ifSign" :class="{ active: signFlag || ifSign }">签到</span>
-          <span v-else :class="{ active: signFlag || ifSign }" :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
+    <view class="date-card">
+      <div class="box">
+        <div class="circle-box">
+          <div class="cricle" @click="signIn()">
+            <span v-if="!ifSign" :class="{ active: signFlag || ifSign }">签到</span>
+            <span v-else :class="{ active: signFlag || ifSign }"
+              :style="ifSign ? 'transform: rotateY(0deg);' : ''">已签</span>
+          </div>
        </div>
+        <text class="tips">坚持每天连续签到可以获多重奖励哦</text>
      </div>
-      <text class="tips">坚持每天连续签到可以获多重奖励哦</text>
    </view>
    <div class="date-card">
      <view class="date-con">
        <view class="date-tit">
-          <u-row style="width: 100%;  justify-content: center;">
-            <div style="text-align: center; " class="text">{{ currentMonth }} {{ currentYear }}</div>
-          </u-row>
+          <div class="current-month">
+            <div class="day">每日记录<span> ({{ currentMonth }})</span></div>
+          </div>
        </view>
        <view class="week">
          <text v-for="item in weekArr" :key="item.id">{{ item }}</text>
        </view>
        <view class="date" v-for="obj in dataObj" :key="obj.id">
-          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''" :animation="item == currentDay ? animationData : ''">
+          <view class="item" v-for="item in obj" :key="item.id" :class="item == '' ? 'hide' : ''"
+            :animation="item == currentDay ? animationData : ''">
            <view class="just" :class="signArr.indexOf(item) != -1 ? 'active' : ''">
              <view class="top">{{ item }} </view>
              <view class="bottom">
@@ -36,7 +40,7 @@
              ">
              <view class="top">{{ item }}</view>
              <view class="bottom">
-                <u-icon name="checkmark" color="#ff9f28"></u-icon>
+                <u-icon name="checkmark" :color="aiderLightColor"></u-icon>
              </view>
            </view>
          </view>
@@ -50,16 +54,7 @@
        <text class="close" @click="close">×</text>
      </view>
      <view class="mask-con">
-        <view class="keep-sign">
-          本月已连续签到
-          <text>{{ continuity }}</text>
-          天
-        </view>
-        <u-icon size="120" style="margin: 50rpx 0" color="#ff9f28" name="checkmark"></u-icon>
-        <view class="mark">
-          <view>获得积分</view>
-          <text>{{ continuityPoint }}</text>
-        </view>
+        <u-icon size="120" style="margin: 50rpx 0" :color="aiderLightColor" name="checkmark"></u-icon>
        <text class="text">连续签到可获得额外奖励哦！</text>
      </view>
    </view>
@@ -71,8 +66,7 @@ import { sign, signTime } from "@/api/point.js";
 export default {
  data() {
    return {
-      continuity: 1, //本月连续签到天数
-      continuityPoint: 2, //获得的积分
+      aiderLightColor:this.$aiderLightColor,
      signFlag: false,
      animationData: {},
      maskFlag: false, //
@@ -115,7 +109,6 @@ export default {
    this.getDate();
  },
  methods: {
-
    /**
     * 补0
     */
@@ -126,7 +119,7 @@ export default {
        return "0" + val;
      }
    },
-  
+
    /**
     * 点击签到
     */
@@ -215,7 +208,6 @@ export default {
          Number(itemVal[1]) === Number(this.currentMonthIndex)
        ) {
          this.signArr.push(Number(itemVal[2]));
-         
        }
        if (
          Number(itemVal[0]) === Number(date.getFullYear()) &&
@@ -295,70 +287,79 @@ export default {
  },
 };
 </script>
-
+<style scoped>
+page {
+  background: #f7f7f7;
+}
+</style>
 <style lang="scss" scoped>
 .date-card {
-  padding: 0 40rpx;
+  padding: 0 32rpx;
+  margin: 32rpx 0;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);
 }
 .tips {
-  margin-top: 34rpx;
+  margin-top: 54rpx;
+  color: #999;
+  font-size: 24rpx;
+  letter-spacing: 1rpx;
 }
+
 .circle-box {
  width: 200rpx;
  height: 200rpx;
  border-radius: 50%;
-  margin-top: 60rpx;
-  background: #ff9f28;
+  background: $aider-light-color;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: $aider-light-color, $alpha: 1);
  display: flex;
  justify-content: center; //这个是X轴居中
  align-items: center; //这个是 Y轴居中
+ 
 }

 .cricle {
  width: 160rpx;
  height: 160rpx;
  border-radius: 50%;
-  background: #ff9f28;
+  background: $aider-light-color;
  text-align: center;
  line-height: 160rpx;
  color: #fff;
  font-size: 40rpx;
 }
-
-page {
-  background: #fff;
+.current-month {
+  width: 100%;
+  margin: 20rpx 0;
+}
+.box {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding:64rpx 32rpx;
+  background: #fff;
+  border-radius: 20rpx;
 }
-
 .sign-in {
  color: #333;
-  .signin-btn-con {
-    width: 100%;
-    height: 670rpx;
-    background-image: linear-gradient(180deg, #ff6b35, #ff9f28, #ffcc03);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text {
-      color: #fff;
-      font-size: 28rpx;
-      font-weight: 400;
-    }
-  }
-
  .date-con {
    background: #fff;
    min-height: 730rpx;
-    border-radius: 0.8em;
-    border: 1px solid #ededed;
+    border-radius: 20rpx;
    padding: 0 28rpx;
-    transform: translateY(-320rpx);
-    box-shadow: (1px 3px 5px rgba(0, 0, 0, 0.2));
  }
+  .day {
+    font-size: 36rpx;

+    > span {
+      font-size: 30rpx;
+      color: #999;
+      margin-left: 20rpx;
+    }
+  }
  .date-tit {
    display: flex;
    justify-content: space-between;
-    margin: 30rpx 0;
+    margin: 0 0 30rpx 0;
  }

  .week {
@@ -429,7 +430,7 @@ page {
        }

        .top {
-          color: #ff9f28;
+          color: $aider-light-color;
        }
      }

@@ -471,7 +472,7 @@ page {
      width: 540rpx;
      height: 130rpx;
      line-height: 130rpx;
-      background: #ff9f28;
+      background: $aider-light-color;
      color: #fff;
      font-size: 40rpx;
      font-weight: 500;
@@ -488,7 +489,7 @@ page {

    .mask-con {
      width: 540rpx;
-      height: 460rpx;
+      height: 380rpx;
      background: #fff;
      display: flex;
      flex-direction: column;
--- a/pages/navigation/search/search.scss
+++ b/pages/navigation/search/search.scss
@@ -1,7 +1,7 @@
 .sort-active {
  border: 1px solid $light-color;
  color: $light-color;
-  background: $jd-light-color !important;
+  background: $price-light-color !important;
 }

 .oldKeyList {
@@ -35,13 +35,6 @@
    }
  }
 }
-
-/deep/ .u-row {
-  // #ifdef MP-WEIXIN
-  padding: 0 5%;
-  // #endif
-}
-
 .status_bar {
  height: var(--status-bar-height);
  background: #fff !important;
@@ -62,6 +55,7 @@ page {
    padding: 30rpx;
    > .sort-item {
      > .sort-title {
+        margin: 20rpx 0;
        font-size: 26rpx;
        font-weight: bold;
      }
@@ -121,7 +115,7 @@ page {
  font-size: 24rpx;
 }
 .flex {
-  margin: 30rpx 0;
+ 
  flex-wrap: wrap;
  align-items: center;
  > .sort-brand-item {
@@ -138,47 +132,36 @@ page {
  height: 100vh;
  overflow: hidden;
 }
-.storeSellerBox {
-  // #ifndef MP-WEIXIN
-  padding: 16rpx !important;
-
-  // #endif
-}
-.goodsClass {
-  padding: 0 20rpx;
-
-  /deep/ .u-row {
-  }
-}

 .index-nav-arrow:last-child {
  margin-top: -22rpx;
 }
-
+.line1-store-name{
+  font-size: 24rpx;
+  color: #999;
+}
+.to-store{
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 10rpx;
+}
 .img {
  width: 26rpx;
  height: 26rpx;
 }
-.goodsRow {
-  /deep/ .u-row {
-    // #ifdef MP-WEIXIN
-    padding: 0%;
-    background: #fff;
-    // padding:  16rpx;
-    border-radius: 0.4em;
-    margin: 0 !important;
-
-    // #endif
-  }
-
+.goods-row {
  background: #fff;
-  border-radius: 0.4em;
-  margin: 20rpx 0;
-  // #ifdef MP-WEIXIN
-  margin: 10rpx 0;
-  // #endif
-  padding: 0 16rpx;
-  width: 100%;
+  padding: 16rpx; 
+
+  >.goods-col{
+    display: flex;
+    >.goods-img{
+      flex: 4;
+    }
+    >.goods-detail{
+      flex: 7;
+    }
+  }
 }

 .add1 {
@@ -192,21 +175,14 @@ page {
  border-bottom: 1px solid #eeeeee;
 }

-.logimg {
-  width: 40rpx;
-  height: 40rpx;
-  vertical-align: middle;
-}

 .clamp3 {
-  padding-top: 30rpx;
  margin-bottom: 10rpx;
  font-size: 28rpx;
  color: #333333;
-
  font-weight: 400;
  display: -webkit-box;
-  line-height: 40rpx;
+  height: 80rpx;
  -webkit-box-orient: vertical;

  -webkit-line-clamp: 2 !important;
@@ -217,25 +193,12 @@ page {
  }
 }

-.switchType1 {
-  width: 50%;
-  overflow: hidden;
-  text-align: center;

-  > .img {
-    width: 182rpx;
-    height: 200rpx;
-  }
-}
-.imgGoods {
-  width: 182rpx;
-  height: 200rpx;
-}
 view {
  display: block;
 }

-.storeSellerName {
+.store-seller-name {
  color: #666;
  overflow: hidden;

@@ -248,7 +211,7 @@ view {
  }
 }

-.countConfig {
+.count-config {
  padding: 10rpx 0;
  color: #666;
  display: flex;
@@ -635,16 +598,15 @@ view {
    overflow: hidden;
  }

-  .countConfig,
-  .storeSellerName {
+  .count-config,
+  .store-seller-name {
    font-size: $font-sm;
  }

-  .textHidden {
+  .text-hidden {
+    
    overflow: hidden;
-
    text-overflow: ellipsis;
-
    white-space: nowrap;
  }
 }
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -1,10 +1,9 @@
 <template>
  <view class="content">
    <u-navbar :background="navObj" :is-back="false">
-      <!-- mSearch组件 如果使用原样式，删除组件元素-->
-
-      <mSearch ref="mSearch" class="mSearch-input-box" @clickLeft="back" :mode="2" :placeholder="defaultKeyword" @search="doSearch(false)" @input="inputChange" @confirm="doSearch(false)"
-        @SwitchType="doSearchSwitch()" v-model="keyword" :isFocusVal="!isShowSeachGoods"></mSearch>
+      <mSearch ref="mSearch" class="mSearch-input-box" @clickLeft="back" :mode="2" :placeholder="defaultKeyword"
+        @search="doSearch(false)" @confirm="doSearch(false)" @SwitchType="doSearchSwitch()" v-model="keyword"
+        :isFocusVal="!isShowSeachGoods"></mSearch>
    </u-navbar>

    <view class="search-keyword" v-if="!isShowSeachGoods">
@@ -23,22 +22,19 @@
            <view class="u-tips">热门搜索</view>
          </view>
          <view class="keyword keywordBox">
-            <view class="wes" v-for="(keyword, index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">{{ keyword }}</view>
+            <view class="wes" v-for="(keyword, index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">
+              {{ keyword }}</view>
          </view>
-
        </view>
-
        <view class="keyword-block" v-if="oldKeywordList.length > 0">
          <view class="keyword-list-header">
            <view class="u-tips">搜索历史</view>
-
          </view>
          <div class="oldKeyList">
-
-            <div class="oldKeyItem" v-if="keyword" v-for="(keyword, index) in oldKeywordList" :key="index" @click="doSearch(keyword)">
+            <div class="oldKeyItem" v-if="keyword" v-for="(keyword, index) in oldKeywordList" :key="index"
+              @click="doSearch(keyword)">
              <span>{{ keyword }} </span>
            </div>
-
            <div @click="showMore" v-if=" oldKeywordIndex > loadIndex" class="oldKeyItem">展示更多</div>
          </div>
        </view>
@@ -54,11 +50,13 @@
          <text>销量</text>
          <view class="p-box">
            <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-up-1.png" v-if="params.sort === 'buyCount' && params.order === 'asc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-up-1.png"
+                v-if="params.sort === 'buyCount' && params.order === 'asc'" mode="aspectFit"></image>
              <image class="img" src="/static/index/arrow-up.png" v-else mode="aspectFit"></image>
            </view>
            <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-down.png" v-if="params.sort === 'buyCount' && params.order === 'desc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-down.png"
+                v-if="params.sort === 'buyCount' && params.order === 'desc'" mode="aspectFit"></image>
              <image class="img" src="/static/index/arrow-down-1.png" v-else mode="aspectFit"></image>
            </view>
          </view>
@@ -67,11 +65,13 @@
          <text>价格</text>
          <view class="p-box">
            <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-up-1.png" v-if="params.sort === 'price' && params.order === 'asc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-up-1.png"
+                v-if="params.sort === 'price' && params.order === 'asc'" mode="aspectFit"></image>
              <image class="img" src="/static/index/arrow-up.png" v-else mode="aspectFit"></image>
            </view>
            <view class="index-nav-arrow">
-              <image class="img" src="/static/index/arrow-down.png" v-if="params.sort === 'price' && params.order === 'desc'" mode="aspectFit"></image>
+              <image class="img" src="/static/index/arrow-down.png"
+                v-if="params.sort === 'price' && params.order === 'desc'" mode="aspectFit"></image>
              <image class="img" src="/static/index/arrow-down-1.png" v-else mode="aspectFit"></image>
            </view>
          </view>
@@ -80,53 +80,51 @@
      </view>
      <!-- 一行一个商品展示 -->
      <div v-if="isSWitch">
-        <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250" @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
-          <div class="goodsClass">
-            <u-row v-for="(item, index) in goodsList" :key="index" class="goodsRow">
-              <u-col :span="4" @click.native="navigateToDetailPage(item)" class="switchType1">
-                <u-image width="182rpx" height="200rpx" class="imgGoods" :src="item.thumbnail">
-                  <u-loading slot="loading"></u-loading>
-                </u-image>
-              </u-col>
-              <u-col :span="8" @click.native="navigateToDetailPage(item)" class="switchType2">
-                <div class="title clamp3" style="">{{ item.goodsName }}</div>
-                <view class="price-box">
-                  <div class="price" v-if="item.price!=undefined">
-                    ¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
-                      formatPrice(item.price )[1]
+        <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250"
+          @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
+          <div class="goods-class">
+            <div v-for="(item, index) in goodsList" :key="index" class="goods-row">
+              <div class="flex goods-col">
+                <div class="goods-img" @click="navigateToDetailPage(item)">
+                  <u-image width="230rpx" height="230rpx" :src="item.content.thumbnail">
+                    <u-loading slot="loading"></u-loading>
+                  </u-image>
+                </div>
+                <div class="goods-detail">
+                  <div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
+                  <view class="price-box" @click="navigateToDetailPage(item)">
+                    <div class="price" v-if="item.content.price!=undefined">
+                      ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+                      formatPrice(item.content.price )[1]
                    }}
+                    </div>
+                  </view>
+                  <div class="promotion" @click="navigateToDetailPage(item)">
+                    <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
+                      <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
+                      <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
+                      <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
+                    </div>
                  </div>
-                </view>
-                <div class="promotion">
-                  <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
+                  <div style="overflow: hidden" @click="navigateToDetailPage(item)" class="count-config">
+                    <span style="float: left; font-size: 22rpx">已售 {{ item.content.buyCount || '0' }}</span>
+                    <span style="float: right; font-size: 22rpx">{{ item.content.commentNum || '0' }}条评论</span>
+                  </div>
+                  <div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
+                    <div class="text-hidden">
+                      <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
+                        type="error" />
+                      <span class="line1-store-name">{{ item.content.storeName }}</span>
+                      <span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon></span>
+                    </div>
+                    <span>
+                      <u-icon name="arrow-right" color="#c5c5c5"></u-icon>
+                    </span>
+                  </div>
+                </div>
+              </div>

-                    <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
-                    <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
-                    <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
-                  </div>
-                </div>
-                <div style="overflow: hidden" class="countConfig">
-                  <span style="float: left; font-size: 22rpx">已售 {{ item.buyCount || '0' }}</span>
-                  <span style="float: right; font-size: 22rpx">{{ item.commentNum || '0' }}条评论</span>
-                </div>
-              </u-col>
-              <u-col :span="12" class="storeSellerBox">
-                <div class="storeSellerName" @click="clickTostore()">
-                  <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营" type="error" />
-
-                    <span style="
-                        color: #333333;
-                        font-size: 28rpx;
-                        padding-left: 17rpx;
-                      ">{{ item.storeName }}</span>
-                  </div>
-                  <span>
-                    <u-icon name="arrow-right" color="#c5c5c5"></u-icon>
-                  </span>
-                </div>
-              </u-col>
-            </u-row>
+            </div>
          </div>
          <uni-load-more :status="loadingType" @loadmore="loadmore()"></uni-load-more>
        </scroll-view>
@@ -148,39 +146,39 @@
          !isSWitch &&
          !(goodsList == [] || goodsList == '' || goodsList == null)
        ">
-        <scroll-view :style="{ height: goodsHeight }" scroll-anchoring enableBackToTop="true" @scrolltolower="loadmore()" scroll-with-animation scroll-y lower-threshold="250" class="scoll-page">
+        <scroll-view :style="{ height: goodsHeight }" scroll-anchoring enableBackToTop="true"
+          @scrolltolower="loadmore()" scroll-with-animation scroll-y lower-threshold="250" class="scoll-page">
          <view class="goods-list">
-            <view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navigateToDetailPage(item)">
-              <view class="image-wrapper">
-                <image :src="item.thumbnail" mode="aspectFill"></image>
+            <view v-for="(item, index) in goodsList" :key="index" class="goods-item">
+              <view class="image-wrapper" @click="navigateToDetailPage(item)">
+                <image :src="item.content.thumbnail" mode="aspectFill"></image>
              </view>
              <view class="goods-detail">
-                <div class="title clamp">{{ item.goodsName }}</div>
-                <view class="price-box">
-                  <div class="price" v-if="item.price!=undefined">
-
-                    ¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
-                      formatPrice(item.price )[1]
+                <div class="title clamp" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
+                <view class="price-box" @click="navigateToDetailPage(item)">
+                  <div class="price" v-if="item.content.price!=undefined">
+                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+                      formatPrice(item.content.price )[1]
                    }}
                  </div>
                </view>

-                <div class="promotion">
+                <div class="promotion" @click="navigateToDetailPage(item)">
                  <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
-
                    <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
                    <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
                    <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
                  </div>
                </div>
-                <div class="countConfig">
-                  <span>已售 {{ item.buyCount || "0" }}</span>
-                  <span>{{ item.commentNum || "0" }}条评论</span>
+                <div class="count-config" @click="navigateToDetailPage(item)">
+                  <span>已售 {{ item.content.buyCount || "0" }}</span>
+                  <span>{{ item.content.commentNum || "0" }}条评论</span>
                </div>
-                <div class="storeSellerName">
-                  <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营" type="error" />
-                    <span>{{ item.storeName || "暂无" }}</span>
+                <div class="store-seller-name" @click="navigateToStoreDetailPage(item)">
+                  <div class="text-hidden">
+                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
+                      type="error" />
+                    <span>{{ item.content.storeName || "暂无" }}</span>
                  </div>
                  <span>
                    <u-icon name="arrow-right"></u-icon>
@@ -201,7 +199,8 @@
          <view class="sort-item">
            <view class="sort-title"> 品牌 </view>
            <view class="flex" v-if="sortData.brands">
-              <view class="sort-brand-item" :key="brandsIndex" v-for="(brand, brandsIndex) in sortData.brands" @click="handleSort(brand, brandsIndex, 'brand')">
+              <view class="sort-brand-item" :key="brandsIndex" v-for="(brand, brandsIndex) in sortData.brands"
+                @click="handleSort(brand, brandsIndex, 'brand')">
                <view class="sort-radius" :class="{
                    'sort-active': brand.__selected,
                  }">
@@ -214,7 +213,9 @@
          <view class="sort-item">
            <view class="sort-title"> 全部分类 </view>
            <view class="flex" style="flex-wrap: wrap;" v-if="sortData.categories">
-              <view class="sort-brand-item" :key="categoriesIndex" v-for="(categoryId, categoriesIndex) in sortData.categories" @click="handleSort(categoryId, categoriesIndex, 'categoryId')">
+              <view class="sort-brand-item" :key="categoriesIndex"
+                v-for="(categoryId, categoriesIndex) in sortData.categories"
+                @click="handleSort(categoryId, categoriesIndex, 'categoryId')">
                <view class="sort-radius" :class="{
                    'sort-active': categoryId.__selected,
                  }">
@@ -248,7 +249,8 @@
          <view class="sort-item" :key="paramIndex" v-for="(param, paramIndex) in sortData.paramOptions">
            <view class="sort-title"> {{ param.key }} </view>
            <view class="flex" style="flex-warp:warp" v-if="param.values">
-              <view class="sort-brand-item" :key="i" v-for="(value, i) in param.values" @click="handleSort(value, i, 'prop', param)">
+              <view class="sort-brand-item" :key="i" v-for="(value, i) in param.values"
+                @click="handleSort(value, i, 'prop', param)">
                <view class="sort-radius" :class="{
                    'sort-active': value.__selected,
                  }">
@@ -266,6 +268,7 @@
        </view>
      </view>
    </u-popup>
+    <u-back-top :scroll-top="scrollTop"></u-back-top>
  </view>
 </template>

@@ -274,10 +277,11 @@ import { getGoodsList, getGoodsRelated } from "@/api/goods.js";

 import { getHotKeywords } from "@/api/home.js";
 import mSearch from "@/components/m-search-revision/m-search-revision.vue";
-
+import storage from "@/utils/storage";
 export default {
  data() {
    return {
+      scrollTop: 0,
      loadIndex: 10,
      oldKeywordIndex: "",
      selectedWay: {
@@ -317,8 +321,7 @@ export default {
        pageNumber: 1,
        pageSize: 10,
        // sort: 'grade_asc',
-        sort: "releaseTime",
-        order: "desc",
+      
        keyword: "",
      },
      minPrice: "",
@@ -336,10 +339,13 @@ export default {
      routerVal: "",
    };
  },
+  onPageScroll(e) {
+    console.log(e);
+    this.scrollTop = e.scrollTop;
+  },
  onLoad(val) {
-    // return false
    this.init();
-    this.initSortGoods();
+    //  this.initSortGoods();
    // 接收分类的数据

    this.routerVal = val;
@@ -347,7 +353,11 @@ export default {
    // 有值
    if (this.routerVal.category) {
      this.params.categoryId = this.routerVal.category;
+      this.sortParams.categoryId = this.routerVal.category;
      this.isShowSeachGoods = true;
+      this.$nextTick(()=>{
+          this.$refs.mSearch.isShowSeachGoods = true;
+      })
    }
    if (this.routerVal.keyword) {
      this.params.keyword = this.routerVal.keyword;
@@ -360,9 +370,28 @@ export default {
    this.loadData();
  },
  components: {
-    //引用mSearch组件，如不需要删除即可
    mSearch,
  },
+  watch: {
+    /**
+     * 将搜索的字和热词进行匹配,如果为热词则不改商品搜索关键字
+     */
+    keyword(val) {
+      if (val) {
+        if (val) {
+          this.defaultKeyword = val;
+        }
+      } else {
+        this.defaultKeyword = "请输入搜索商品";
+      }
+    },
+    sortPopup(val) {
+      if (val) {
+        this.selectedWay = { brand: [], categoryId: [], prop: [] };
+        console.log(this.selectedWay);
+      }
+    },
+  },

  onReachBottom() {
    this.params.pageNumber++;
@@ -437,19 +466,32 @@ export default {
    // 点击确定进行筛选
    sortConfim() {
      // 处理品牌（多选
-      this.params.brandId = [];
+      if (!this.params.brandId) {
+        this.params.brandId = [];
+      } else {
+        this.params.brandId = [this.params.brandId];
+      }
+
+      // 如果选中品牌 赋值
      this.selectedWay["brand"].forEach((item) => {
        if (item.__selected) {
          this.params.brandId.push(item.value);
        }
      });
-      this.params.brandId = this.params.brandId.join("@");
+
+      this.params.brandId = this.params.brandId.join("@") || "";
+
+      console.log(this.params.brandId);
      // 处理分类 (单选)
      if (this.selectedWay["categoryId"][0]) {
        this.params.categoryId = this.selectedWay["categoryId"][0].value;
      }
-      // 处理属性
-      this.params.prop = [];
+      if (!this.params.prop) {
+        this.params.prop = [];
+      } else {
+        this.params.prop = [this.params.prop];
+      }
+     
      this.selectedWay["prop"].forEach((item) => {
        if (item.__selected) {
          this.params.prop.push(`${item.parent}_${item.title}`);
@@ -464,19 +506,32 @@ export default {
      }

      this.goodsList = [];
+      
+      this.params.pageNumber = 1;
+      this.sortParams = this.params;
+
+     
      this.loadData();
      this.sortPopup = false;
    },

    // 重置
    repick() {
+      this.sortParams = {
+        pageNumber: 1,
+        pageSize: 10,
+        categoryId: this.routerVal.category || "",
+      };
+      this.sortPopup = false;
      this.initSortGoods();
      this.minPrice = "";
      this.maxPrice = "";
      this.params = {
        pageNumber: 1,
        pageSize: 10,
+        categoryId: this.routerVal.category || "",
      };
+      this.goodsList = [];
      this.loadData();
    },

@@ -497,8 +552,9 @@ export default {
    },

    init() {
-      this.loadDefaultKeyword();
+      // 加载搜索记录
      this.loadOldKeyword(this.loadIndex);
+      // 加载热词
      this.loadHotKeyword();
    },
    blur() {
@@ -509,9 +565,16 @@ export default {
        delta: 1,
      });
    },
+    // 跳转到商品详情
    navigateToDetailPage(item) {
      uni.navigateTo({
-        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+      });
+    },
+    // 跳转地址
+    navigateToStoreDetailPage(item) {
+      uni.navigateTo({
+        url: `/pages/product/shopPage?id=${item.content.storeId}`,
      });
    },
    loadmore() {
@@ -577,8 +640,16 @@ export default {
    },
    //加载默认搜索关键字
    loadDefaultKeyword() {
-      //定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
-      this.defaultKeyword = "请输入搜索商品";
+      /**
+       * 定义默认搜索关键字会根据当前热门搜索来进行显示
+       * 如果当前热门搜索没有的话，则会显示默认关键字
+       */
+      if (this.hotKeywordList.length != 0) {
+        //
+        this.defaultKeyword = this.hotKeywordList[0];
+      } else {
+        this.defaultKeyword = "请输入搜索商品";
+      }
    },
    //加载历史搜索,自动读取本地Storage
    loadOldKeyword(index) {
@@ -594,15 +665,39 @@ export default {
        },
      });
    },
-    //加载热门搜索
+
+    /**
+     * 加载热门搜索
+     * 1.5分钟之后更新缓存
+     * 2.如果有缓存热门关键字则去请求缓存
+     */
    async loadHotKeyword() {
      this.hotKeywordList = [];
-      let res = await getHotKeywords();
-      let keywords = res.data.result;
+      if (
+        !storage.getHotWords().time ||
+        storage.getHotWords().time <= new Date().getTime() / 1000
+      ) {
+        // 没有缓存或者第一次进入请求接口保存缓存
+        let res = await getHotKeywords(10);
+        let keywords = res.data.result;

-      keywords.forEach((item) => {
-        this.hotKeywordList.push(item);
-      });
+        keywords.forEach((item) => {
+          this.hotKeywordList.push(item);
+        });
+
+        let hotData = {
+          time: new Date().getTime() / 1000 + 30 * 5,
+          keywords: keywords,
+        };
+        storage.setHotWords(hotData);
+      } else {
+        let keywords = storage.getHotWords().keywords;
+
+        keywords.forEach((item) => {
+          this.hotKeywordList.push(item);
+        });
+      }
+      this.loadDefaultKeyword();
    },
    //加载商品 ，带下拉刷新和上滑加载
    async loadData(type, loading) {
@@ -610,9 +705,9 @@ export default {
      if (type == "refresh") {
        this.goodsList = [];
      }
-      //没有更多直接返回
+      //没有更多直接返回 #TODO
      let goodsList = await getGoodsList(this.params);
-      
+
      if (goodsList.data.result.content.length < 10) {
        this.loadingType = "noMore";
      }
@@ -620,19 +715,7 @@ export default {
      this.initSortGoods();
      uni.hideLoading();
    },
-    //监听输入
-    inputChange(event) {
-      //兼容引入组件时传入参数情况
-      var keyword = event.detail ? event.detail.value : event;
-      if (!keyword) {
-        this.keywordList = [];
-        this.isShowKeywordList = false;
-        return;
-      }
-      this.isShowKeywordList = true;

-      this.getKeywordNumFun(keyword);
-    },
    //高亮关键字
    drawCorrelativeKeyword(keywords, keyword) {
      var len = keywords.length,
@@ -663,7 +746,6 @@ export default {
        content: "确定清除历史搜索记录？",
        success: (res) => {
          if (res.confirm) {
-           
            this.oldKeywordList = [];
            uni.removeStorage({
              key: "OldKeys",
@@ -674,27 +756,39 @@ export default {
    },

    // 样式修改布局
-    doSearchSwitch(val) {
+    doSearchSwitch() {
      this.isSWitch = !this.isSWitch;
      this.isShowSeachGoods = true;
    },

-    //执行搜索
+    /**
+     * 执行搜索
+     */
    doSearch(keyword) {
+      //  用户自行搜索/热门搜索/搜索历史
      keyword = keyword === false ? this.keyword : keyword;
-      this.keyword = keyword;
+
+      if (!keyword) {
+        /**
+         * 进行空搜索
+         * 第一次搜索如果没有关键词会将热门搜索中第一个热词进行判定
+         * 如果没有热词则会展示一个空词搜索
+         */
+        keyword = (this.hotKeywordList.length && this.hotKeywordList[0]) || "";
+      }
+      this.defaultKeyword == "请输入搜索商品" ? (keyword = "") : "";
+      // this.keyword = keyword;
+      keyword ? (this.keyword = keyword) : "";
      this.saveKeyword(keyword); //保存为历史
      this.isShowSeachGoods = true;
      this.$refs.mSearch.isShowSeachGoods = true;
-      this.params.keyword = keyword;
+      this.params.keyword = this.keyword;
      this.params.pageNumber = 1;
      this.$set(this.sortParams, "keyword", keyword);
-
      this.loadData("refresh", 1);
    },
    //保存关键字到历史记录
    saveKeyword(keyword) {
-      
      if (!keyword) return false;
      uni.getStorage({
        key: "OldKeys",
@@ -715,7 +809,6 @@ export default {
            data: JSON.stringify(OldKeys),
          });
          this.oldKeywordList = OldKeys; //更新历史搜索
-        
        },
        fail: (e) => {
          var OldKeys = [keyword];
@@ -727,12 +820,6 @@ export default {
        },
      });
    },
-
-    // 搜索关键字
-    getKeywordNumFun(keywords) {
-      this.params.keyword = keywords;
-      this.$set(this.sortParams, "keyword", keywords);
-    },
  },
 };
 </script>
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -1,8 +1,13 @@
 <template>
  <view class="content">
    <view class="u-tabs-box">
-      <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change" :active-color="$lightColor"></u-tabs>
+      <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"
+        :active-color="$lightColor"></u-tabs>
    </view>
+    <div class="u-tabs-search">
+      <u-search placeholder="请输入订单编号" @search="handleGetOrderList(current)" @clear="handleGetOrderList(current)"
+        @custom="handleGetOrderList(current)" v-model="params.orderSn"></u-search>
+    </div>
    <scroll-view class="body-view" scroll-y @scrolltolower="renderDate">
      <view class="seller-view" v-for="(order, orderIndex) in orderList" :key="orderIndex">
        <!-- 店铺名称 -->
@@ -18,7 +23,7 @@
          <view class="order-sn">{{ order.serviceType_text }}</view>
        </view>
        <view v-for="(sku, goodsIndex) in order.orderItems" :key="goodsIndex">
-          <view class="goods-item-view" @click="onDetail(sku)">
+          <view class="goods-item-view" @click="onDetail(order,sku)">
            <view class="goods-img">
              <u-image border-radius="6" width="100%" height="100%" :src="sku.image"></u-image>
            </view>
@@ -37,36 +42,45 @@
            <view class="description">
              <!-- 售后申请 -->
              <view v-if="
-                  current === 0 && order.groupAfterSaleStatus &&
-                  order.groupAfterSaleStatus === 'ALREADY_APPLIED'
+                  current === 0 &&  order.groupAfterSaleStatus &&
+                 order.groupAfterSaleStatus.includes('ALREADY_APPLIED') 
                " class="cannot_apply">
                <u-icon class="icon" name="info-circle-fill"></u-icon>
                该商品已申请售后服务
              </view>
-              <view class="cannot_apply" v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus === 'EXPIRED'" @click="tipsShow = true">
+              <view class="cannot_apply"
+                v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('EXPIRED')  "
+                @click="tipsShow = true">
                <u-icon class="icon" name="info-circle-fill"></u-icon>
                该商品无法申请售后
              </view>

              <div v-if="current === 1 || current === 2">
                <!-- 申请中 -->
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_GOODS'">退货处理-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'">补发商品-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_MONEY'">退款-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'EXCHANGE_GOODS'">换货-{{ order.serviceStatus | serviceStatusList  }}</view>
-                <view class="cannot_apply" v-if="order.serviceType == 'CANCEL'">取消订单-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_GOODS'">
+                  退货处理-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'">
+                  补发商品-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_MONEY'">
+                  退款-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'EXCHANGE_GOODS'">
+                  换货-{{ order.serviceStatus | serviceStatusList  }}</view>
+                <view class="cannot_apply" v-if="order.serviceType == 'CANCEL'">
+                  取消订单-{{ order.serviceStatus | serviceStatusList  }}</view>
              </div>
+             
              <!-- 申请记录 -->
            </view>
+             <!-- 售后申请 -->
+              <div v-if="current === 0 && sku.afterSaleStatus && (sku.afterSaleStatus.includes('NOT_APPLIED') || sku.afterSaleStatus.includes('PART_AFTER_SALE')) "  @click="applyService(sku.sn, order, sku)" class="sale">
+                <view class=" default-btn border" >
+                  申请售后
+                </view>
+              </div>
            <view class="after-line">
-              <!-- 售后申请 -->
-              <view v-if="
-                  current === 0 && order.groupAfterSaleStatus=='NOT_APPLIED'
-                " @click="applyService(sku.sn, order, sku)" class="rebuy-btn">
-                申请售后
-              </view>
+
              <!-- 申请中 -->
-              <view class="rebuy-btn" v-if="
+              <view class="default-btn border" v-if="
                  current === 2 &&
                  order.serviceStatus &&
                  order.serviceStatus == 'PASS' &&
@@ -74,7 +88,10 @@
                " @click="onExpress(order, sku)">
                提交物流
              </view>
-              <view @click="afterDetails(order, sku)" v-if="current === 1 || current === 2" class="rebuy-btn">
+              <view @click="close(order,sku)" v-if="current === 1" class="default-btn close">
+                取消售后
+              </view>
+              <view @click="afterDetails(order, sku)" v-if="current === 1 || current === 2" class="default-btn border">
                售后详情
              </view>
            </view>
@@ -93,14 +110,16 @@
      </view>
      <u-loadmore bg-color="#f8f8f8" :status="status" />
    </scroll-view>
+    <u-modal show-cancel-button @confirm="closeService" v-model="cancelShow" content="确认取消售后"></u-modal>
    <u-modal v-model="tipsShow" content="当订单未确认收货|已过售后服务有效期|已申请售后服务时，不能申请售后"></u-modal>
  </view>
 </template>

 <script>
 import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
-import { getAfterSaleList } from "@/api/after-sale.js";
+import { getAfterSaleList, cancelAfterSale } from "@/api/after-sale.js";
 import { getOrderList } from "@/api/order.js";
+import storage from "@/utils/storage";

 export default {
  components: {
@@ -122,10 +141,15 @@ export default {
      ],
      current: 0, //当前表头索引
      tipsShow: false, //提示开关
+      cancelShow: false, //取消显示开关
+      selectedOrder: "", //选中的order
      orderList: [], //订单集合
      params: {
        pageNumber: 1,
        pageSize: 10,
+        sort: "createTime",
+        flowPrice:  1,
+        order: "desc",
      },

      logParams: {
@@ -135,15 +159,20 @@ export default {
      status: "loadmore",
    };
  },
-  onLoad() {
+  onLoad(options) {
    this.orderList = [];
    this.params.pageNumber = 1;
+    if (options.orderSn) this.params.orderSn = options.orderSn;
    this.getOrderList(this.current);
  },
  onPullDownRefresh() {
    this.change(this.current);
  },
  methods: {
+    handleGetOrderList(current) {
+      this.orderList = [];
+      this.getOrderList(current);
+    },
    /**
     * 切换tab页时，初始化数据
     */
@@ -161,6 +190,8 @@ export default {
        this.logParams = {
          pageNumber: 1,
          pageSize: 10,
+          sort: "createTime",
+          order: "desc",
        };
        if (index === 1) {
          this.logParams.serviceStatus = "APPLY";
@@ -181,12 +212,12 @@ export default {
      });
      getOrderList(this.params).then((res) => {
        uni.hideLoading();
-        const orderlist = res.data.result.records;
-        if (orderlist.length > 0) {
-          this.orderList = this.orderList.concat(orderlist);
+        const orderList = res.data.result.records;
+        if (orderList.length > 0) {
+          this.orderList = this.orderList.concat(orderList);
          this.params.pageNumber += 1;
        }
-        if (orderlist.length < 10) {
+        if (orderList.length < 10) {
          this.status = "nomore";
        } else {
          this.status = "loading";
@@ -194,6 +225,31 @@ export default {
      });
    },

+    close(order, sku) {
+      console.log(order, sku);
+      this.selectedOrder = order;
+      this.cancelShow = true;
+    },
+
+    async closeService() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      console.log(this.selectedOrder);
+      let res = await cancelAfterSale(this.selectedOrder.sn);
+      if (res.data.success) {
+        uni.showToast({
+          title: "取消成功!",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+      this.orderList = [];
+      this.getOrderList(this.current);
+
+      uni.hideLoading();
+    },
+
    /**
     * 售后详情
     */
@@ -220,7 +276,6 @@ export default {
              price: item.flowPrice,
            },
          ];
-    
        });

        this.orderList = this.orderList.concat(afterSaleLogList);
@@ -241,11 +296,9 @@ export default {
        ...order,
        ...sku,
      };
-
+      storage.setAfterSaleData(data);
      uni.navigateTo({
-        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent(
-          JSON.stringify(data)
-        )}`,
+        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`,
      });
    },

@@ -255,20 +308,28 @@ export default {
    onExpress(order, sku) {
      sku.storeName = order.storeName;

+      storage.setAfterSaleData(data);
      uni.navigateTo({
-        url: `./afterSalesDetailExpress?serviceSn=${
-          order.sn
-        }&sku=${encodeURIComponent(JSON.stringify(sku))}`,
+        url: `./afterSalesDetailExpress?serviceSn=${order.sn}`,
      });
    },

    /**
     * 查看详情
     */
-    onDetail(sku) {
-      if (!this.$u.test.isEmpty(sku.skuId)) {
+    onDetail(goods, sku) {
+      // 售后申请
+      if (this.current == 0) {
        uni.navigateTo({
-          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
+          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${
+            sku.goodsId || sku.goodsId
+          }`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/product/goods?id=${goods.skuId}&goodsId=${
+            goods.goodsId || goods.goodsId
+          }`,
        });
      }
    },
@@ -295,10 +356,14 @@ page,
  background: $page-color-base;
  height: 100%;
 }
+
 .body-view {
-  // height: calc(100vh - 44px -40px);
-  // overflow-y: auto;
-  height: 100%;
+  overflow-y: auto;
+  height: calc(100vh - 44px - 80rpx - 104rpx);
+}
+.u-tabs-search {
+  padding: 20rpx;
+  background: #fff;
 }
 .countMoney {
  margin-left: 7rpx;
@@ -388,28 +453,27 @@ page,
 .icon {
  margin-right: 10rpx;
 }
-.cancel-btn {
-  color: #999999;
-  border-color: #999999;
-  margin-left: 15rpx;
-  height: 60rpx;
+
+.sale {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
 }
-.pay-btn {
-  background-color: #1abc9c;
-  color: #ffffff;
-  margin-left: 15rpx;
-  height: 60rpx;
-}
-.rebuy-btn {
+.default-btn {
  background-color: #ffffff;
  margin-left: 15rpx;
  height: 60rpx;
  line-height: 60rpx;
  text-align: center;
  font-size: 24rpx;
-  border: 2rpx solid $light-color;
-  color: $light-color;
  padding: 0 24rpx;
  border-radius: 200px;
 }
+.close {
+  color: $light-color;
+}
+.border {
+  border: 2rpx solid $light-color;
+  color: $light-color;
+}
 </style>
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -10,7 +10,8 @@
          </view>
        </view>
        <view>
-          <view class="goods-item-view" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn" @click="gotoGoodsDetail(sku.goods_id)">
+          <view class="goods-item-view" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn"
+            @click="gotoGoodsDetail(sku.goods_id)">
            <view class="goods-img">
              <u-image border-radius="6" width="131rpx" height="131rpx" :src="item.image"></u-image>
            </view>
@@ -27,7 +28,8 @@
        <view class="after-num">
          <view>申请数量</view>
          <view>
-            <u-number-box :value="parseInt(form.num)" disabled-input :min="1" :max="parseInt(sku.num)" bg-color="#fff" @change="valChange"></u-number-box>
+            <u-number-box :value="parseInt(form.num)" disabled-input :min="1" :max="parseInt(sku.num)" bg-color="#fff"
+              @change="valChange"></u-number-box>
          </view>
        </view>
      </view>
@@ -36,7 +38,8 @@
        <!-- 退款原因 -->
        <view class="opt-view">
          <u-form-item label="申请原因" :label-width="150">
-            <u-input v-model="form.reason" type="select" input-align="right" :select-open="reasonSelectShow" @click="reasonSelectShow = true" placeholder="请选择申请原因" />
+            <u-input v-model="form.reason" type="select" input-align="right" :select-open="reasonSelectShow"
+              @click="reasonSelectShow = true" placeholder="请选择申请原因" />
          </u-form-item>
          <u-form-item label="申请说明" :label-width="150">
            <u-input input-align="right" type="textarea" v-model="form.problemDesc" placeholder="请描述申请售后的说明" />
@@ -47,7 +50,8 @@
        <view class="opt-view">
          <view class="img-title">上传凭证（最多5张）</view>
          <view class="images-view">
-            <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+            <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150"
+              @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
          </view>
        </view>

@@ -59,8 +63,7 @@
          </u-form-item>
          <view v-if="
              applyInfo.accountType === 'BANK_TRANSFER' &&
-              applyInfo.applyRefundPrice != 0
-            ">
+              applyInfo.applyRefundPrice != 0">
            <u-form-item label="银行开户行" :label-width="150">
              <u-input v-model="form.bankDepositName" type="text" input-align="right" placeholder="请输入银行开户行" />
            </u-form-item>
@@ -82,11 +85,14 @@
    </u-form>

    <view class="submit-view">
-      <u-button type="primary" ripple shape="circle" v-if="applyInfo.refundWay" :custom-style="customStyle" @click="onSubmit">提交申请</u-button>
+      <u-button type="primary" ripple shape="circle" v-if="applyInfo.refundWay" :custom-style="customStyle"
+        @click="onSubmit">提交申请</u-button>
    </view>
-    <u-select mode="single-column" :list="reasonList" v-model="reasonSelectShow" @confirm="reasonSelectConfirm"></u-select>
+    <u-select mode="single-column" :list="reasonList" v-model="reasonSelectShow" @confirm="reasonSelectConfirm">
+    </u-select>
    <u-select mode="single-column" :list="typeList" v-model="typeSelectShow" @confirm="typeSelectConfirm"></u-select>
-    <u-select mode="single-column" :list="returnList" v-model="returnSelectShow" @confirm="returnSelectConfirm"></u-select>
+    <u-select mode="single-column" :list="returnList" v-model="returnSelectShow" @confirm="returnSelectConfirm">
+    </u-select>
    <u-toast ref="uToast" />
  </view>
 </template>
@@ -100,7 +106,7 @@ import {

 import city from "@/components/m-city/m-city";
 import { upload } from "@/api/common.js";
-
+import { checkBankno } from "@/utils/Foundation";
 import storage from "@/utils/storage.js";
 export default {
  component: {
@@ -149,7 +155,7 @@ export default {
      customStyle: {
        backgroundColor: this.$lightColor,
      },
-      applyInfo: {}, 
+      applyInfo: {},
      form: {
        orderItemSn: "", // 订单sn
        skuId: "",
@@ -189,10 +195,8 @@ export default {
      title: navTitle, //此处写页面的title
    });
    this.sn = options.sn;
-    let dsku = decodeURIComponent(options.sku);
-    let newSku = JSON.parse(dsku);
-    this.sku = newSku
- 
+    this.sku = storage.getAfterSaleData();;
+
    this.form.orderItemSn = options.sn;
    this.form.skuId = this.sku.skuId;
    this.form.num = this.sku.num;
@@ -254,9 +258,7 @@ export default {
      this.form.accountType_label = e[0].label;
    },
    //返回方式
-    returnSelectConfirm(e) {
-     
-    },
+    returnSelectConfirm(e) {},

    //修改申请数量
    valChange(e) {
@@ -264,7 +266,6 @@ export default {
    },
    //图片上传
    onUploaded(lists) {
-    
      let images = [];

      lists.forEach((item) => {
@@ -278,6 +279,7 @@ export default {
      if (!this.handleCheckParams()) {
        return;
      }
+
      uni.showLoading({
        title: "加载中",
      });
@@ -297,74 +299,8 @@ export default {
        }
      });
    },
-
-    /**
-     * 验证银行卡号
-     */
-    checkBankno(bankno) {
-      var lastNum = bankno.substr(bankno.length - 1, 1); //取出最后一位（与luhm进行比较）
-      var first15Num = bankno.substr(0, bankno.length - 1); //前15或18位
-      var newArr = [];
-
-      for (var i = first15Num.length - 1; i > -1; i--) {
-        //前15或18位倒序存进数组
-        newArr.push(first15Num.substr(i, 1));
-      }
-
-      var arrJiShu = []; //奇数位*2的积 <9
-      var arrJiShu2 = []; //奇数位*2的积 >9
-      var arrOuShu = []; //偶数位数组
-      for (var j = 0; j < newArr.length; j++) {
-        if ((j + 1) % 2 == 1) {
-          //奇数位
-          if (parseInt(newArr[j]) * 2 < 9)
-            arrJiShu.push(parseInt(newArr[j]) * 2);
-          else arrJiShu2.push(parseInt(newArr[j]) * 2);
-        } //偶数位
-        else arrOuShu.push(newArr[j]);
-      }
-
-      var jishu_child1 = []; //奇数位*2 >9 的分割之后的数组个位数
-      var jishu_child2 = []; //奇数位*2 >9 的分割之后的数组十位数
-      for (var h = 0; h < arrJiShu2.length; h++) {
-        jishu_child1.push(parseInt(arrJiShu2[h]) % 10);
-        jishu_child2.push(parseInt(arrJiShu2[h]) / 10);
-      }
-
-      var sumJiShu = 0; //奇数位*2 < 9 的数组之和
-      var sumOuShu = 0; //偶数位数组之和
-      var sumJiShuChild1 = 0; //奇数位*2 >9 的分割之后的数组个位数之和
-      var sumJiShuChild2 = 0; //奇数位*2 >9 的分割之后的数组十位数之和
-      var sumTotal = 0;
-      for (var m = 0; m < arrJiShu.length; m++) {
-        sumJiShu = sumJiShu + parseInt(arrJiShu[m]);
-      }
-      for (var n = 0; n < arrOuShu.length; n++) {
-        sumOuShu = sumOuShu + parseInt(arrOuShu[n]);
-      }
-      for (var p = 0; p < jishu_child1.length; p++) {
-        sumJiShuChild1 = sumJiShuChild1 + parseInt(jishu_child1[p]);
-        sumJiShuChild2 = sumJiShuChild2 + parseInt(jishu_child2[p]);
-      }
-      //计算总和
-      sumTotal =
-        parseInt(sumJiShu) +
-        parseInt(sumOuShu) +
-        parseInt(sumJiShuChild1) +
-        parseInt(sumJiShuChild2);
-      //计算Luhm值
-      var k = parseInt(sumTotal) % 10 == 0 ? 10 : parseInt(sumTotal) % 10;
-      var luhm = 10 - k;
-      if (lastNum == luhm) {
-        return true;
-      } else {
-        return false;
-      }
-    },
-
    //检测提交参数
    handleCheckParams() {
-     
      if (this.$u.test.isEmpty(this.form.reason)) {
        this.$refs.uToast.show({ title: "请选择 退款原因", type: "error" });
        return false;
@@ -374,6 +310,7 @@ export default {
        return false;
      }

+      console.log(this.form.accountType)
      if (this.form.accountType == "BANK_TRANSFER") {
        // 银行开户行校验
        if (this.$u.test.isEmpty(this.form.bankDepositName)) {
@@ -398,7 +335,7 @@ export default {
            type: "error",
          });
          return false;
-        } else if (this.checkBankno(this.form.bankAccountNumber) === false) {
+        } else if (checkBankno(this.form.bankAccountNumber) === false) {
          this.$refs.uToast.show({
            title: "银行卡卡号不正确",
            type: "error",
@@ -531,7 +468,6 @@ page,
    align-items: center;
  }
  .images-view {
-    padding: 20rpx;
    display: flex;
    flex-direction: row;
    align-items: center;
@@ -553,7 +489,11 @@ page,
  background-color: #ffffff;
  height: 100rpx;
  width: 750rpx;
+  justify-content: flex-end;
+
+  display: flex;
  align-items: center;
-  padding: 0rpx 20rpx;
+  width: 100%;
+  padding-right: 32rpx;
 }
 </style>
--- a/pages/order/afterSales/afterSalesDetailExpress.vue
+++ b/pages/order/afterSales/afterSalesDetailExpress.vue
@@ -57,6 +57,7 @@
 <script>
 import { getLogistics } from "@/api/address.js";
 import { fillShipInfo } from "@/api/after-sale.js";
+import storage from "@/utils/storage";

 export default {
  data() {
@@ -76,7 +77,8 @@ export default {
    };
  },
  onLoad(options) {
-    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    
+    this.sku = storage.getAfterSaleData();
    let navTitle = "服务单详情";
    uni.setNavigationBarTitle({
      title: navTitle, //此处写页面的title
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -34,7 +34,7 @@
          <view class="select-title">退货</view>
          <view class="select-sub-title">
            退回收到的商品
-            <uni-icons color="#BABABA" type="arrowright"></uni-icons>
+            <u-icon name="arrow-right"  color="#bababa"></u-icon>
          </view>
        </view>
      </view>
@@ -46,7 +46,7 @@
          <view class="select-title">退款</view>
          <view class="select-sub-title">
            退款商品返还金额
-            <uni-icons color="#BABABA" type="arrowright"></uni-icons>
+            <u-icon name="arrow-right"  color="#bababa"></u-icon>
          </view>
        </view>
      </view>
@@ -55,13 +55,9 @@
 </template>

 <script>
-import UniIcons from "@/components/uni-icons/uni-icons.vue";
-
 import { getAfterSaleInfo } from "@/api/after-sale";
+import storage from "@/utils/storage";
 export default {
-  components: {
-    UniIcons,
-  },
  data() {
    return {
      sn: "",
@@ -71,10 +67,7 @@ export default {
  },
  onLoad(options) {
    this.sn = options.sn;
-    let dData = decodeURIComponent(options.sku);
-    let newData = JSON.parse(dData);
-    this.sku = newData;
-
+    this.sku = storage.getAfterSaleData();
    // 查看当前商品是否支持退款退货
    this.init()
  },
@@ -93,9 +86,7 @@ export default {
     */
    onSelect(value) {
      uni.redirectTo({
-        url: `./afterSalesDetail?sn=${this.sn}&sku=${encodeURIComponent(
-          JSON.stringify(this.sku)
-        )}&value=${value}`,
+        url: `./afterSalesDetail?sn=${this.sn}&value=${value}`,
      });
    },

--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -28,7 +28,7 @@
              logs[0].message
            }}</view>
          </view>
-          <uni-icons type="arrowright" style="margin-right: 5px"></uni-icons>
+         <u-icon name="arrow-right" style="margin-right: 5px" size="30" color="#999"></u-icon>
        </view>
      </view>
      <view class="goods-info">
@@ -75,7 +75,7 @@
      </view>
      <view class="detail-item">
        <view class="title">申请原因:</view>
-        <view class="value">{{ serviceDetail.reason }}</view>
+        <view class="value">{{ reason }}</view>
      </view>
      <!-- <view class="detail-item" v-if="serviceDetail.apply_vouchers">
 				<view class="title">申请凭证:</view>
@@ -90,11 +90,14 @@
          serviceDetail.afterSaleImage &&
          serviceDetail.afterSaleImage.split(',').length != 0
        ">
-        <image :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)" v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index"
-          style="width: 50px; height: 50px; margin: 0px 5px"></image>
+        <view v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index">
+          <u-image width="100" height="100" :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)"
+            ></u-image>
+        </view>
      </view>
      <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY' && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY' && serviceDetail.serviceStatus != 'APPLY'">
        <view class="title">收货地址:</view>
        <view class="value">
          <span v-if="storeAfterSaleAddress.salesConsigneeAddressPath">{{
@@ -103,12 +106,14 @@
        </view>
      </view>
      <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
        <view class="title">联系人:</view>
        <view class="value">{{ storeAfterSaleAddress.salesConsigneeName }}</view>
      </view>
      <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
        <view class="title">联系方式:</view>
        <view class="value">{{
          storeAfterSaleAddress.salesConsigneeMobile || "" | secrecyMobile
@@ -193,17 +198,14 @@
 <script>
 import {
  getServiceDetail,
-  getstoreAfterSaleAddress,
+  getStoreAfterSaleAddress,
  getAfterSaleLog,
+  getAfterSaleReason,
 } from "@/api/after-sale.js";
-import UniIcons from "@/components/uni-icons/uni-icons.vue";
-
 export default {
-  components: {
-    UniIcons,
-  },
  data() {
    return {
+      reason: "", //申请原因
      serviceTypeList: {
        // 售后类型
        CANCEL: "取消",
@@ -314,7 +316,7 @@ export default {
     * 获取地址信息
     */
    getAddress() {
-      getstoreAfterSaleAddress(this.sn).then((res) => {
+      getStoreAfterSaleAddress(this.sn).then((res) => {
        if (res.data.success) {
          this.storeAfterSaleAddress = res.data.result;
        }
@@ -330,6 +332,18 @@ export default {
      });
    },

+    /**
+     * 获取申请原因
+     */
+    getReasonList(serviceType) {
+      getAfterSaleReason(serviceType).then((res) => {
+        if (res.data.success) {
+          // 1357583466371219456
+          this.reason = this.serviceDetail.reason;
+        }
+      });
+    },
+
    /**
     * 初始化详情
     */
@@ -340,7 +354,10 @@ export default {
      getServiceDetail(this.sn).then((res) => {
        uni.hideLoading();
        this.serviceDetail = res.data.result;
-        if (this.serviceDetail.serviceType == "RETURN_GOODS") {
+        if (
+          this.serviceDetail.serviceType == "RETURN_GOODS" ||
+          this.serviceDetail.serviceType === "RETURN_MONEY"
+        ) {
          this.refundShow = true;
        }

@@ -348,11 +365,15 @@ export default {
          (this.serviceDetail.serviceType === "RETURN_GOODS" ||
            this.serviceDetail.serviceType === "ORDER_CANCEL") &&
          this.serviceDetail.refundWay === "OFFLINE";
+
        this.bankShow =
-          (this.serviceDetail.serviceType === "RETURN_GOODS" ||
-            this.serviceDetail.serviceType === "ORDER_CANCEL") &&
+          this.serviceDetail.accountType === "BANK_TRANSFER" &&
          this.serviceDetail.refundWay === "OFFLINE" &&
-          this.serviceDetail.accountType === "BANK_TRANSFER";
+          ((this.serviceDetail.serviceType === "RETURN_GOODS") |
+            (this.serviceDetail.serviceType === "ORDER_CANCEL") ||
+            this.serviceDetail.serviceType === "RETURN_MONEY");
+
+        this.getReasonList(this.serviceDetail.serviceType);
      });
    },

--- a/pages/order/complain/complain.vue
+++ b/pages/order/complain/complain.vue
@@ -45,7 +45,7 @@
      <view class="cell-item">
        <view class="cell-title"> 投诉凭证 </view>
        <view class="cell-view">
-          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }" upload-text="" :show-progress="false" :action="action" width="100" @on-uploaded="onUploaded" :max-count="5">
+          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }" upload-text=""  :action="action" width="100" @on-uploaded="onUploaded" :max-count="5">
          </u-upload>
        </view>
      </view>
--- a/pages/order/complain/complainInfo.vue
+++ b/pages/order/complain/complainInfo.vue
@@ -103,7 +103,9 @@ export default {
 .row {
  display: flex;
  flex-wrap: wrap;
+  padding: 26rpx 32rpx;
 }
+
 .speak-msg {
  padding: 26rpx 32rpx;
  > span {
@@ -120,6 +122,6 @@ export default {
  padding: 16rpx;
 }
 .tips {
-  margin: 40rpx 0;
+  margin: 40rpx 32rpx;
 }
 </style>
--- a/pages/order/evaluate/evaluateDetail.vue
+++ b/pages/order/evaluate/evaluateDetail.vue
@@ -25,7 +25,16 @@
          {{ comment.goodsName }}
        </view>
        <view class="goods-subtitle"></view>
-
+        <view class="commentStyle" v-if="comment.reply">
+          商家回复：
+          <span class="addCommentSpan">{{ comment.reply }}</span>
+          <view class="img">
+            <!-- 循环出商家回复评价的图片 -->
+            <u-image width="140rpx" height="140rpx" v-if="comment.replyImage" v-for="(replyImg, replyIndex) in splitImg(comment.replyImage)" :src="replyImg" :key="replyIndex"
+              @click="preview(splitImg( comment.replyImage), index)">
+            </u-image>
+          </view>
+        </view>
      </view>
    </view>
  </view>
@@ -49,6 +58,18 @@ export default {
    this.comment = JSON.parse(decodeURIComponent(options.comment));
  },
  methods: {
+    /**
+     * 切割图像
+     */
+    splitImg(val) {
+      if (val && val.split(",")) {
+        return val.split(",");
+      } else if (val) {
+        return val;
+      } else {
+        return false;
+      }
+    },
    /**
     * 点击图片放大或保存
     */
@@ -68,6 +89,38 @@ export default {
 </script>

 <style lang="scss" scoped>
+.commentStyle {
+  margin-top: 16rpx;
+  padding: 14rpx 26rpx;
+  background: #f5f5f5;
+  border-radius: 6px;
+  font-size: 22rpx;
+  font-weight: 700;
+  text-align: left;
+  line-height: 40rpx;
+}
+.img {
+  display: flex;
+  flex-wrap: wrap;
+  /* height: 140rpx; */
+  overflow: hidden;
+  margin: 10rpx 0;
+
+  image {
+    width: 166rpx;
+    height: 166rpx;
+    margin: 0 15rpx 15rpx 0;
+
+    &:nth-of-type(3n + 0) {
+      margin: 0 0 15rpx 0;
+    }
+  }
+}
+
+.addCommentSpan {
+  color: $u-tips-color !important;
+  padding-left: 20rpx;
+}
 .memName {
  font-size: 28rpx;
 }
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -2,7 +2,8 @@
  <view>
    <view class="wrap">
      <view class="u-tabs-box">
-        <u-tabs :list="list" :is-scroll="false" inactive-color="#333" :current="current" class="utabs" :active-color="$lightColor" @change="changeTab"></u-tabs>
+        <u-tabs :list="list" :is-scroll="false" inactive-color="#333" :current="current" class="utabs"
+          :active-color="$lightColor" @change="changeTab"></u-tabs>
      </view>
      <swiper class="swiper-box" :current="current" @change="changeSwiper" duration="500">
        <swiper-item v-for="(item, listIndex) in list" :key="listIndex">
@@ -18,14 +19,15 @@
              <view v-for="(sku, _index) in order.orderItems" :key="_index">
                <view class="goods-item-view">
                  <view>
-                    <u-image border-radius="6rpx" width="132rpx" height="132rpx" class="goods_img" :src="sku.image" alt />
+                    <u-image border-radius="6rpx" width="132rpx" height="132rpx" class="goods_img" :src="sku.image"
+                      alt />
                  </view>
                  <view class="goods-info">
                    <view class="goods-title u-line-2">{{ sku.name }}</view>
                    <view class="text title">{{ gradeList[order.grade] || '' }}</view>
                  </view>
                </view>
-                <view class="btn-view u-row-between" v-if="current != 0">
+                <view class="btn-view u-row-between" v-if="current == 2">
                  <view class="description">
                    <view class="text title">
                      <u-read-more ref="uReadMore" :color="$lightColor" text-indent="0">
@@ -34,7 +36,8 @@
                    </view>

                    <view class="goods-imgs-view" v-if="order.image">
-                      <view class="img-view" v-if="order.image" v-for="(img, imgIndex) in order.image.split(',')" :key="imgIndex">
+                      <view class="img-view" v-if="order.image" v-for="(img, imgIndex) in order.image.split(',')"
+                        :key="imgIndex">
                        <u-image v-if="order.image" @click.native="
                            preview(order.image.split(','), imgIndex)
                          " width="160rpx" height="160rpx" :src="img"></u-image>
@@ -42,17 +45,21 @@
                    </view>
                  </view>
                </view>
-                <view class="again-btn" @click="onDetail(order)" v-if="current == 1">
+                <view class="again-btn" @click="onDetail(order)" v-if="current == 2">
                  <u-tag text="评价详情" shape="circle" mode="plain" type="error" />
                </view>
-                <view v-if="current == 0 && sku.commentStatus == 'UNFINISHED'">
+                <view v-if="current == 1 && sku.commentStatus == 'UNFINISHED'">
                  <view class="evaluate">
-                    <view @click="talkCommont(order)">
+                    <view @click="talkCommont(sku)">
                      <u-tag text="发表评价" shape="circle" mode="plain" type="error" />
                    </view>
                  </view>
                </view>
+                <view class="tips" v-if="sku.commentStatus">
+                  {{groupCommentStatusWay[sku.commentStatus]}}
+                </view>
              </view>
+
            </view>
            <uni-load-more :status="params.loadStatus"></uni-load-more>
          </scroll-view>
@@ -69,7 +76,12 @@ import { getComments } from "@/api/members.js";
 export default {
  data() {
    return {
-      list: [ //顶部tab
+      list: [
+        //顶部tab
+
+        {
+          name: "全部订单",
+        },
        {
          name: "待评价",
        },
@@ -77,12 +89,19 @@ export default {
          name: "已评价",
        },
      ],
-      gradeList: {  //评论表
+      gradeList: {
+        //评论表
        GOOD: "好评",
        MODERATE: "中评",
        WORSE: "差评",
        haveImage: "有图",
      },
+      groupCommentStatusWay: {
+        NEW: "新订单，不能进行评论",
+        UNFINISHED: "未完成评论",
+        WAIT_CHASE: "待追评的评论信息",
+        FINISHED: "已经完成评论",
+      },
      current: 0, //当前tabIndex
      orderList: [], //商品集合
      params: {
@@ -108,12 +127,18 @@ export default {
      this.params.loadStatus = "more";
      this.orderList = [];
      //重新读取数据
+
      if (val == 0) {
+        delete  this.params.commentStatus 
        this.loadData();
-      }
-      if (val == 1) {
+      } else if (val == 1) {
+        this.params.commentStatus = "UNFINISHED";
        this.orderList = [];
-        this.loadComments();
+        this.loadData();
+      } else {
+        this.params.commentStatus = "FINISHED";
+        this.orderList = [];
+        return this.loadComments();
      }
    },
  },
@@ -123,7 +148,7 @@ export default {
     * 判断当前店铺是否有可评价的商品
     */
    commentStatus(val) {
-      if (this.current == 1) {
+      if (this.current == 2) {
        return true;
      } else {
        let show;
@@ -192,10 +217,11 @@ export default {
    /**
     * 发表评价
     */
-    talkCommont(order) {
+    talkCommont(sku) {
+      console.log(sku);
      uni.navigateTo({
-        url: `./releaseEvaluate?sn=${order.sn}&order=${encodeURIComponent(
-          JSON.stringify(order)
+        url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent(
+          JSON.stringify(sku)
        )}`,
      });
    },
@@ -235,11 +261,7 @@ export default {
      if (this.params.loadStatus == "noMore") return;
      if (index == 0) {
        this.loadData();
-      }
-      if (index == 1) {
-        this.params.audit_status = "PASS_AUDIT";
-        this.params.comments_type = "INITIAL";
-        this.params.comment_status = "WAIT_CHASE";
+      } else {
        this.loadComments();
      }
    },
@@ -261,6 +283,11 @@ export default {
 page {
  height: 100%;
 }
+.tips {
+  text-align: right;
+  font-size: 24rpx;
+  color: #999;
+}
 .wrap {
  background: #f6f6f6;
  height: calc(100vh - var(--window-top));
--- a/pages/order/evaluate/releaseEvaluate.vue
+++ b/pages/order/evaluate/releaseEvaluate.vue
@@ -1,7 +1,7 @@
 <template>
  <view>
    <!-- 遍历出评价商品 -->
-    <view v-for="(sku, index) in order.orderItems" :key="index">
+    <view>
      <view class="after-sales-goods-detail-view">
        <view>
          <view class="goods-item-view">
@@ -23,23 +23,27 @@
          <view class="sub-title">满意请打好评哦</view>
        </view>
        <view class="rate-view">
-          <view class="rate-btn" @click="onGrade('GOOD', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }" class="alifont icon-haoping1"></view>
+          <view class="rate-btn" @click="onGrade('GOOD')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }"></u-icon>
            <text>好评</text>
          </view>
-          <view class="rate-btn" @click="onGrade('MODERATE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }" class="alifont icon-zhongping1"></view>
+          <view class="rate-btn" @click="onGrade('MODERATE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }"></u-icon>
            <text>中评</text>
          </view>
-          <view class="rate-btn" @click="onGrade('WORSE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }" class="alifont icon-chaping"></view>
+          <view class="rate-btn" @click="onGrade('WORSE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }"></u-icon>
            <text>差评</text>
          </view>
        </view>
      </view>
      <view class="info-evaluate-view">
        <view class="input-view">
-          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type" :border="border" :maxlength="maxlength" :placeholder="placeholder" />
+          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type"
+            :border="border" :maxlength="maxlength" :placeholder="placeholder" />
        </view>
        <view class="input-num">
          <text>{{ form.content.length }}/{{ maxlength }}</text>
@@ -47,7 +51,8 @@
      </view>
      <view class="info-evaluate-view">
        <view class="images-view">
-          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150"
+            @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
        </view>
      </view>
    </view>
@@ -57,7 +62,8 @@
        <view class="seller-rate-view">
          <view class="rate-title">描述相符</view>
          <view>
-            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40"></u-rate>
+            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40">
+            </u-rate>
          </view>
        </view>
        <view class="seller-rate-view">
@@ -94,7 +100,7 @@ export default {
      maxlength: 500, //评价最大字数为500字
      placeholder:
        "宝贝满足您的期待吗？说说它的优点和美中不足的地方吧。您的评价会帮助更多的人",
-      order: {}, //订单信息
+      sku: {}, //订单信息
      form: {
        content: "", //评价详情
        goodsId: "", //商品id
@@ -111,10 +117,9 @@ export default {
  onLoad(options) {
    // 获取上一级传过来的数据进行解析
    this.form.orderItemSn = options.sn;
-    this.order = JSON.parse(decodeURIComponent(options.order));
-    this.form.goodsId = this.order.orderItems[0].goodsId;
-    this.form.orderItemSn = this.order.orderItems[0].sn;
-    this.form.skuId = this.order.orderItems[0].skuId;
+    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    this.form.goodsId = this.sku.goodsId;
+    this.form.skuId = this.sku.skuId;
  },
  methods: {
    /**
@@ -141,7 +146,7 @@ export default {
            success: () => {
              setTimeout(() => {
                uni.navigateBack();
-              }, 2000);
+              }, 500);
            },
          });
        }
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -1,68 +1,87 @@
 <template>
  <div class="wrapper">
    <!-- 选择地址 -->
-    <div class="box1 box">
-      <u-row style="margin-top: 32rpx">
-        <u-col style="padding: 0 !important" :offset="0" :span="11" @click.native="clickToAddress()">
+    <div class="address-box" @click="clickToAddress()">
+      <div class="user-box flex">
+        <div class="flex-8">
          <div v-if="!address.id">请选择地址</div>
          <div v-else>
-            <div class="userClass">
-              {{ address.name }}
-              <span>
-                {{ address.mobile | secrecyMobile }}
-                <u-tag v-if="address.isDefault" text="默认" style="margin-left: 24rpx" mode="plain" type="error" size="mini" />
-              </span>
-            </div>
-            <div class="userAdress">
-              <span v-if="address.consigneeAddressPath[0]">{{
-                address.consigneeAddressPath[0]
-              }}</span>
-
-              <span v-if="address.consigneeAddressPath[1]">{{
-                address.consigneeAddressPath[1]
-              }}</span>
-              <span v-if="address.consigneeAddressPath[2]">{{
-                address.consigneeAddressPath[2]
-              }}</span>
-
-              <span v-if="address.consigneeAddressPath[3]">{{
-                address.consigneeAddressPath[3]
-              }}</span>
-              <span>
+            <div class="user-address">
+              <!-- 省市区 -->
+              <div class="flex flex-a-c">
+                <span class="default" v-if="address.isDefault">默认</span>
+                <div class="address-list" v-if="address.consigneeAddressPath.length != 0">
+                  <span
+                    class="address-item"
+                    v-for="(item, index) in address.consigneeAddressPath"
+                    :key="index"
+                  >
+                    {{ item }}
+                  </span>
+                </div>
+              </div>
+              <!-- 详细地址 -->
+              <div class="user-address-detail wes-2">
                {{ address.detail }}
-              </span>
+              </div>
+              <!-- 姓名 手机号 -->
+              <div>
+                <span>{{ address.name }}</span>
+                <span class="mobile">{{ address.mobile | secrecyMobile }}</span>
+              </div>
            </div>
          </div>
-        </u-col>
-        <u-col :span="1" @click.native="
-            navigateTo('/pages/mine/address/address?way=' + routerVal.way)
-          " style="text-align: right">
-          <u-icon name="arrow-right" style="color: #bababa"></u-icon>
-        </u-col>
-      </u-row>
+        </div>
+        <u-icon name="arrow-right" style="color: #bababa"></u-icon>
+      </div>
+      <!-- 背景 -->
+      <div class="bar"></div>
    </div>
-    <!-- 背景 -->
-    <div class="bar"></div>

    <!-- 开团信息 -->
    <view class="group-box" v-if="isAssemble">
      <view class="group-title">
        <span v-if="pintuanFlage">你正在开团购买</span>
-        <span v-else>为你加入仅差<span>{{routerVal.parentOrder.toBeGroupedNum }}</span>人的团购买</span>
+        <span v-else
+          >为你加入仅差<span>{{ routerVal.parentOrder.toBeGroupedNum }}</span
+          >人的团购买</span
+        >
      </view>
      <view class="group">
        <view>
-          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx" :src="masterWay.face || '/static/missing-face.png'"></u-image>
+          <u-image
+            borderRadius="50%"
+            shape="square"
+            class="head-img"
+            width="81rpx"
+            height="81rpx"
+            :src="masterWay.face || '/static/missing-face.png'"
+          ></u-image>
          <view class="btn-one">团长</view>
        </view>
        <view class="line"> </view>
        <view>
          <!-- 如果有最后一名，显示最后一名，没有最后一名，显示等待参团 -->
-          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square" width="81rpx" height="81rpx">
+          <u-image
+            class="head-img"
+            v-if="endWay.face"
+            :src="endWay.face"
+            borderRadius="50%"
+            shape="square"
+            width="81rpx"
+            height="81rpx"
+          >
            <view slot="loading"></view>
          </u-image>
-
-          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx" :src="endWay.face || '/static/missing-face.png'"></u-image>
+          <u-image
+            class="head-img"
+            borderRadius="50%"
+            shape="square"
+            v-else
+            width="81rpx"
+            height="81rpx"
+            :src="endWay.face || '/static/missing-face.png'"
+          ></u-image>

          <view class="wait">{{ endWay.nickname || "等待参团" }}</view>
        </view>
@@ -71,73 +90,100 @@

    <!-- 店铺商品信息 -->
    <div class="box box2" v-for="(item, index) in orderMessage.cartList" :key="index">
-      <u-row class="tab1" @click="navigateToStore(item)">
-        <u-col :offset="0">
-          <span class="ybname">{{ item.storeName }}</span>
-        </u-col>
-      </u-row>
-      <div class="promotionNotice">{{ item.promotionNotice }}</div>
-      <u-row class="goodsBorder" v-for="(val, i) in item.skuList" :key="i">
-        <u-col class="tabL" :offset="0" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
-          <u-image borderRadius="10rpx" :src="val.goodsSku.thumbnail" alt />
-        </u-col>
-        <u-col :span="9" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" class="tabC">
-          <div style="overflow: hidden">
-            <p class="sp_name">{{ val.goodsSku.goodsName }}</p>
-            <p class="sp_promotion" v-if="val.promotion_tags">
-              <view class="sp_tag sp_tag_plain" v-for="(promotion_item, promotion_index) in val.promotion_tags" :key="promotion_index">{{ promotion_item }}</view>
-            </p>
+      <div @click="navigateToStore(item)">
+        <div class="store-name">
+          <span>{{ item.storeName }}</span>
+        </div>
+      </div>
+      <div class="promotionNotice">{{ item.promotionNotice || "" }}</div>
+      <div class="flex goods-item" v-for="(val, i) in item.skuList" :key="i">
+        <div
+          class="goods-image"
+          @click="
+            navigateTo(
+              '/pages/product/goods?id=' +
+                val.goodsSku.id +
+                '&goodsId=' +
+                val.goodsSku.goodsId
+            )
+          "
+          :span="3"
+        >
+          <u-image
+            borderRadius="10rpx"
+            width="200rpx"
+            height="200rpx"
+            :src="val.goodsSku.thumbnail"
+            alt
+          />
+        </div>
+        <div
+          @click="
+            navigateTo(
+              '/pages/product/goods?id=' +
+                val.goodsSku.id +
+                '&goodsId=' +
+                val.goodsSku.goodsId
+            )
+          "
+          class="goods-detail"
+        >
+          <div class="flex">
+            <p class="goods-name">{{ val.goodsSku.goodsName }}</p>
            <span class="nums">x{{ val.num }}</span>
          </div>
-
-          <p class="sp_number">￥{{ val.goodsSku.price | unitPrice }}</p>
-        </u-col>
-      </u-row>
-
-      <u-row>
-        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
-        <u-col :span="8" textAlign="right">
-          <u-input style="text-align:right;" class="uinput" v-model="remarkVal[index].remark" />
-        </u-col>
-      </u-row>
-    </div>
-    <!-- 订单信息 -->
-    <div class="box box3">
+          <p class="goods-prices">
+            <span>￥</span>
+            <span class="goods-price">{{ formatPrice(val.goodsSku.price)[0] }}</span>
+            <span>.{{ formatPrice(val.goodsSku.price)[1] }}</span>
+          </p>
+        </div>
+      </div>
      <u-row>
        <u-col :offset="0" :span="4">发票信息</u-col>
        <u-col :span="8" class="tipsColor" textAlign="right" @click.native="invoice()">
-          <span v-if="receiptList">{{receiptList.receiptTitle}} - {{receiptList.receiptContent}}</span>
+          <span v-if="receiptList"
+            >{{ receiptList.receiptTitle }} - {{ receiptList.receiptContent }}</span
+          >
          <span v-else>不开发票</span>
        </u-col>
      </u-row>
+      <u-row>
+        <u-col
+          v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
+          :offset="0"
+          :span="9"
+          @click="shippingFlag = true"
+          >配送
+        </u-col>
+        <u-col
+          v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
+          :span="3"
+          textAlign="right"
+          @click="shippingFlag = true"
+        >
+          {{
+            shippingMethod.find((e) => {
+              return e.value == shippingText;
+            }).label
+          }}
+        </u-col>
+      </u-row>
+      <u-row>
+        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
+        <u-col :span="8" textAlign="right">
+          <u-input
+            style="text-align: right"
+            class="uinput"
+            v-model="remarkVal[index].remark"
+          />
+        </u-col>
+      </u-row>
    </div>

    <!-- 发票信息 -->
    <invoices :res="receiptList" @callbackInvoice="callbackInvoice" v-if="invoiceFlag" />
-    <u-select v-model="shippingFlag" :list="shippingMethod" ></u-select>
-
-    <!-- 优惠券 -->
-    <div class="box box4">
-      <u-row>
-        <u-col :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
-        <u-col :span="3" textAlign="right" @click="shippingFlag = true">
-          {{   shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
-        </u-col>
-      </u-row>
-      <u-row>
-        <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
-
-        <u-col :span="3" v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice" textAlign="right" @click="GET_Discount()">
-          <span class="main-color">-{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
-        </u-col>
-        <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
-        <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
-          {{ couponNums || "0" }}张可用
-          <u-icon name="arrow-right"></u-icon>
-        </u-col>
-      </u-row>
-
-    </div>
+    <u-select v-model="shippingFlag" :list="shippingMethod"></u-select>

    <div class="box box5" v-if="orderMessage.priceDetailDTO">
      <div>
@@ -150,53 +196,103 @@
      </div>
      <div>
        <u-row>
-          <u-col :span="7">运费</u-col>
-          <u-col :span="5" class="tr tipsColor" textAlign="right">
-            <u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262" text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
-            <span>￥{{
-                orderMessage.priceDetailDTO.freightPrice | unitPrice
-              }}</span>
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
+          <u-col
+            v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
+            :span="5"
+            class="tr tipsColor"
+            textAlign="right"
+          >
+            <span v-if="orderMessage.priceDetailDTO.freightPrice == 0">包邮</span>
+            <span v-else
+              >￥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }}</span
+            >
          </u-col>
        </u-row>
      </div>
+      <u-row>
+        <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>

+        <u-col
+          :span="3"
+          v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice"
+          textAlign="right"
+          @click="GET_Discount()"
+        >
+          <span class="main-color"
+            >-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
+          >
+        </u-col>
+        <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
+        <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
+          {{ orderMessage.canUseCoupons.length || "0" }} 张可用
+          <u-icon name="arrow-right"></u-icon>
+        </u-col>
+      </u-row>
      <div>
        <u-row>
          <u-col :span="9">优惠金额</u-col>
-          <u-col :span="3" textAlign="right">-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</u-col>
+          <u-col
+            :span="3"
+            textAlign="right"
+            v-if="orderMessage.priceDetailDTO.couponPrice"
+          >
+            <span class="main-color">
+              -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
+            ></u-col
+          >
+          <u-col :span="3" textAlign="right" v-else>0.00</u-col>
        </u-row>
      </div>
      <div>
        <u-row>
          <u-col :span="6">活动优惠</u-col>
          <u-col :span="6" class="tr tipsColor" textAlign="right">
-            <u-tag style="margin-right: 20rpx" v-if="orderMessage.priceDetailDTO.discountPrice != 0" color="#FF6262" :text="`优惠 ${orderMessage.priceDetailDTO.discountPrice} 元`" type="warning"
-              size="mini" mode="plain" shape="circle" />
-            <span>{{
-              orderMessage.priceDetailDTO.discountPrice | unitPrice
-            }}</span>
+            <span v-if="orderMessage.priceDetailDTO.discountPrice"
+              >-￥{{ orderMessage.priceDetailDTO.discountPrice | unitPrice }}</span
+            >
+            <span v-else>0.00</span>
          </u-col>
        </u-row>
      </div>
    </div>

+    <!-- 配送地区没有提示 -->
+    <div class="notSupportFreight" v-if="notSupportFreight.length != 0">
+      <u-notice-bar
+        style="width: 100%"
+        :volume-icon="false"
+        mode="horizontal"
+        :list="notSupportFreightGoodsList"
+      >
+      </u-notice-bar>
+    </div>
+
    <!-- 结账 -->
-    <div class="box box6 mp-iphonex-bottom" v-if="orderMessage.priceDetailDTO">
-      <div class="navL">
-        合计：
-        <span class="number">
-          ¥
-          <span>{{ orderMessage.priceDetailDTO.billPrice | unitPrice }}</span>
-        </span>
+
+    <div class="box6 mp-iphonex-bottom" v-if="orderMessage.priceDetailDTO">
+      <div class="tabbar-left">
+        <div v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
+          <span>¥</span>
+          <span class="price">{{
+            formatPrice(orderMessage.priceDetailDTO.flowPrice)[0]
+          }}</span>
+          <span>.{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} </span>
+        </div>
+        <span v-else class="number"
+          ><span style="margin-right: 10rpx">{{
+            orderMessage.priceDetailDTO.payPoint | unitPrice
+          }}</span
+          >积分</span
+        >
      </div>
      <div class="navRiv" @click="createTradeFun()">
        <!-- #ifndef MP-WEIXIN -->
-        <div class="navR">提交订单</div>
+        <div class="tabbar-right">提交订单</div>
        <!-- #endif -->
        <!-- #ifdef MP-WEIXIN -->
-        <div class="navR">微信支付</div>
+        <div class="tabbar-right">微信支付</div>
        <!-- #endif -->
-
      </div>
    </div>
  </div>
@@ -249,6 +345,8 @@ export default {
      endWay: "", //最后一个参团人
      masterWay: "", //团长信息
      pintuanFlage: true, //是开团还是拼团
+      notSupportFreight: [], //不支持运费
+      notSupportFreightGoodsList: ["以下商品超出配送范围："],
    };
  },
  filters: {
@@ -315,6 +413,13 @@ export default {
  mounted() {},

  methods: {
+    // 格式化金钱  1999 --> [1999,00]
+    formatPrice(val) {
+      if (typeof val == "undefined") {
+        return val;
+      }
+      return val.toFixed(2).split(".");
+    },
    //发票回调 选择发票之后刷新购物车
    async callbackInvoice(val) {
      this.invoiceFlag = false;
@@ -343,9 +448,7 @@ export default {
      this.navigateTo(
        `/pages/mine/address/address?from=cart&way=${
          this.routerVal.way
-        }&parentOrder=${encodeURIComponent(
-          JSON.stringify(this.routerVal.parentOrder)
-        )}`
+        }&parentOrder=${encodeURIComponent(JSON.stringify(this.routerVal.parentOrder))}`
      );
    },

@@ -373,6 +476,18 @@ export default {
      // 循环店铺id,商品id获取优惠券
      let store = [];
      let skus = [];
+      let selectedCoupon = [];
+      if (this.orderMessage.platformCoupon)
+        selectedCoupon.push(this.orderMessage.platformCoupon.memberCoupon.id);
+      if (
+        this.orderMessage.storeCoupons &&
+        Object.keys(this.orderMessage.storeCoupons)[0]
+      ) {
+        let storeMemberCouponsId = Object.keys(this.orderMessage.storeCoupons)[0];
+        let storeCouponId = this.orderMessage.storeCoupons[storeMemberCouponsId]
+          .memberCoupon.id;
+        selectedCoupon.push(storeCouponId);
+      }
      this.orderMessage.cartList.forEach((item) => {
        item.skuList.forEach((sku) => {
          store.push(sku.storeId);
@@ -386,7 +501,7 @@ export default {
        data: this.orderMessage.priceDetailDTO.goodsPrice,
      });
      this.navigateTo(
-        `/pages/cart/coupon/index?way=${this.routerVal.way}&storeId=${store}&skuId=${skus}`
+        `/pages/cart/coupon/index?way=${this.routerVal.way}&storeId=${store}&skuId=${skus}&selectedCoupon=${selectedCoupon}`
      );
    },

@@ -467,7 +582,7 @@ export default {
            }
          } else {
            uni.showToast({
-              title: "创建订单有误!请稍后重试",
+              title: res.data.message,
              duration: 2000,
              icon: "none",
            });
@@ -503,10 +618,14 @@ export default {

    // 获取结算参数
    getOrderList() {
-      // 获取购物车可用优惠券
-      this.getCartsCouponNums();
+      this.notSupportFreight = [];
      // 获取结算参数
      API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
+        if (res.data.result.skuList.length <= 0) {
+          uni.redirectTo({
+            url: "/pages/order/myOrder?status=0",
+          });
+        }
        res.data.result.cartList.forEach((item, index) => {
          this.remarkVal[index] = {
            remark: item.remark,
@@ -514,6 +633,12 @@ export default {
          };
        });
        this.orderMessage = res.data.result;
+        /**
+         * 为了避免路径传值在h5中超出限制问题
+         * 这块将可用的优惠券以及不可用的优惠券放入到vuex里面进行存储
+         */
+        this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
+        this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;

        if (!res.data.result.memberAddress.id) {
          // 获取会员默认地址
@@ -524,14 +649,16 @@ export default {
            ","
          );
        }
-      });
-    },

-    /**购物车可用优惠券 */
-    getCartsCouponNums() {
-      API_Trade.getCartCouponNum(this.routerVal.way).then((res) => {
-        if (res.data.success) {
-          this.couponNums = res.data.result;
+        if (
+          res.data.result.notSupportFreight &&
+          res.data.result.notSupportFreight.length != 0
+        ) {
+          this.notSupportFreight = res.data.result.notSupportFreight;
+
+          res.data.result.notSupportFreight.forEach((item) => {
+            this.notSupportFreightGoodsList[0] += item.goodsSku.goodsName;
+          });
        }
      });
    },
@@ -540,7 +667,16 @@ export default {
  },
 };
 </script>
+<style scoped>
+page {
+  background: #ededed !important;
+}
+</style>
 <style scoped lang="scss">
+.flex-8 {
+  flex: 8;
+}
+
 .main-color {
  font-weight: bold;
 }
@@ -551,12 +687,13 @@ export default {
 }
 .promotionNotice {
  font-size: 24rpx;
+  margin: 20rpx 0;
  color: $aider-light-color;
 }
 .nums {
+  flex: 2;
  color: $light-color;
-  float: right;
-  width: 15%;
+
  text-align: center;
 }
 .wait {
@@ -574,6 +711,9 @@ export default {
  width: 143rpx;
  border-bottom: 2px dotted #999;
 }
+.tabbar-left {
+  margin-left: 32rpx;
+}

 .btn-one,
 .wait {
@@ -602,11 +742,8 @@ export default {

 .group-title {
  text-align: center;
-
  font-size: 28rpx;
-  font-family: PingFang SC, PingFang SC-Regular;
  font-weight: 400;
-
  color: $light-color;
 }

@@ -622,7 +759,6 @@ export default {

 .group {
  width: 100%;
-
  display: flex;
  align-items: center;
  justify-content: center;
@@ -643,62 +779,51 @@ export default {
  height: 4rpx;
  overflow: hidden;
  width: 100%;
-  background: url("/pages/floor/imgs/line.png") no-repeat;
-}
-
-.tabC {
-  > p {
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    white-space: nowrap;
-  }
+  background: url("@/pages/order/imgs/line.png") no-repeat;
 }

 .box2 {
  margin-top: 20rpx;
 }
+.notSupportFreight {
+  position: fixed;

-.userClass {
-  font-weight: bold;
-  font-size: 32rpx;
-  color: $u-content-color;
-  > span {
-    margin-left: 20rpx;
+  bottom: calc(100rpx + env(safe-area-inset-bottom));
+  // #ifdef H5
+  bottom: 100rpx;
+  // #endif
+  display: flex;
+  align-items: center;
+  left: 0;
+  background: #fdf6ec;
+  height: 100rpx;
+  width: 100%;
+  transition: 0.35s;
+
+  > .tips {
+    margin: 0 32rpx;
  }
 }
-
-.userAdress {
-  margin: 20rpx 0;
-  color: $u-tips-color;
-  font-size: 26rpx;
+/deep/ .u-notice-bar-wrap {
+  width: 100% !important;
 }

 .box6 {
  position: fixed;
  bottom: 0;
  left: 0;
-
-  margin: 0;
+  width: 100%;
  height: 100rpx;
  overflow: hidden;
  line-height: 100rpx;
  margin-bottom: 0px !important;
  background: #fff;
  color: #333;
-  width: 100%;
-
-  > .navL {
-    width: 65%;
-  }
-
-  > .navRiv {
-    float: left;
-  }
+  display: flex;
+  justify-content: space-between;
 }

-.navR {
+.tabbar-right {
  margin-top: 10rpx;
  height: 80rpx;
  color: #fff;
@@ -707,6 +832,7 @@ export default {
  padding: 0 44rpx;
  text-align: center;
  border-radius: 400px;
+  margin-right: 32rpx;
 }

 .sp_tag {
@@ -720,7 +846,7 @@ export default {
  border-radius: 0.4em;
 }

-.sp_promotion {
+.goods-promotion {
  float: left;
  width: 75%;
  margin: 4rpx 0;
@@ -740,15 +866,9 @@ export default {
  margin-left: 0;
 }

-.sp_name {
-  float: left;
-  width: 75%;
+.goods-name {
+  flex: 8;
  font-size: 28rpx;
-  overflow: hidden;
-
-  text-overflow: ellipsis;
-
-  white-space: nowrap;
 }

 .sp_type {
@@ -760,28 +880,21 @@ export default {
 .number {
  color: $main-color;
  font-size: 26rpx;
-  margin-left: 10rpx;
-
+  font-weight: bold;
  > span {
    font-size: 36rpx;
  }
 }

-.sp_number {
-  color: $light-color;
+.goods-prices {
+  margin: 10rpx 0;
+  color: $main-color;
  font-size: 28rpx;
-}
-
-.box1 {
-  background: #f6f6f6 !important;
-  min-height: 166rpx;
-  // height: 200rpx;
-
-  /deep/ .u-row {
-    border: none;
+  font-weight: bold;
+  > .goods-price {
+    font-size: 38rpx;
+    padding: 0 2rpx;
  }
-
-  margin-bottom: 0 !important;
 }

 .box {
@@ -789,26 +902,19 @@ export default {
  overflow: hidden;
  background: #fff;
  margin-bottom: 20rpx;
+  color: #666;
  padding: 0 32rpx;
 }

-.navL,
-.navR {
-  float: left;
-}
-
 .wrapper {
-  background: #f9f9f9;
  height: auto;
+  background: #f7f7f7;
  padding-bottom: 200rpx;
  overflow: auto !important;
 }

-.tab1 {
-}
-
-.ybname {
-  margin-left: 20rpx;
+.store-name {
+  margin-top: 32rpx;
  font-weight: 400;
  color: #333333;
 }
@@ -819,18 +925,66 @@ export default {

 /deep/ .u-col-3,
 .tipsColor {
-  color: $u-tips-color;
+  color: #333;
 }

-.tabL {
+.goods-image {
  text-align: left;
  overflow: hidden;
+}
+.default {
+  background: $main-color;
+  font-size: 24rpx;
+  border-radius: 8rpx;
+  padding: 0rpx 12rpx;
+  color: #fff;
+  margin-right: 20rpx;
+}
+.address-box {
+  border-radius: 40rpx;
+  border-top-left-radius: 0 !important;
+  border-top-right-radius: 0 !important;
+  overflow: hidden;
+  background: #fff;
+  margin-bottom: 20rpx;
+  color: #666;
+}

-  /deep/ .u-image,
-  .u-image__image {
-    width: 132rpx !important;
-    height: 132rpx !important;
-    border-radius: 0.4em !important;
+.address-item {
+  font-weight: normal;
+  letter-spacing: 1rpx;
+}
+.user-box {
+  padding: 32rpx;
+}
+.user-address-detail {
+  color: #333;
+  font-size: 38rpx;
+  font-weight: bold;
+  margin: 20rpx 0;
+  letter-spacing: 1rpx;
+}
+.mobile {
+  margin-left: 20rpx;
+}
+.price {
+  font-size: 50rpx !important;
+  margin: 0 2rpx;
+}
+.goods-detail {
+  display: flex;
+  flex-direction: column;
+
+  justify-content: center;
+  flex: 8;
+  margin-left: 20rpx !important;
+  > p {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
  }
 }
+.goods-item {
+  margin: 20rpx 0;
+}
 </style>
--- a/pages/order/imgs/line.png
+++ b/pages/order/imgs/line.png
--- a/pages/order/invoice/invoiceDetail.vue
+++ b/pages/order/invoice/invoiceDetail.vue
@@ -79,7 +79,11 @@ export default {
          },
        });
      } else {
-        this.$api.msg("暂无发票可预览");
+        uni.showToast({
+          title: "暂无发票可预览",
+          duration: 2000,
+          icon: "none",
+        });
      }
    },
    download() {
@@ -95,7 +99,11 @@ export default {
                uni.saveFile({
                  tempFilePath: tempFilePath,
                  success: function (res) {
-                    _this.$api.msg("发票已下载到" + res.savedFilePath);
+                    uni.showToast({
+                      title: "发票已下载到" + res.savedFilePath,
+                      duration: 2000,
+                      icon: "none",
+                    });
                  },
                });
              }
@@ -103,7 +111,11 @@ export default {
          });
        });
      } else {
-        this.$api.msg("暂无发票可下载");
+        uni.showToast({
+          title: "暂无发票可下载",
+          duration: 2000,
+          icon: "none",
+        });
      }
    },
  },
@@ -193,13 +205,6 @@ export default {
  }
 }

-.btn {
-  font-size: 34rpx;
-  margin: 60rpx 20rpx;
-  &::after {
-    border: none;
-  }
-}
 .u-cell {
  padding: 35rpx 20rpx;
  height: 110rpx;
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -39,9 +39,9 @@
              <view class="btn-view u-flex u-row-between">
                <view class="description">
                  <!-- 等待付款 -->
-                  <text v-if="order.payStatus === 'PAID'">已付金额：</text>
-                  <text v-else>应付金额：</text>
-                  <text class="price">￥{{ order.flowPrice | unitPrice }}</text>
+                  <div v-if="order.payStatus === 'PAID'">已付金额:</div>
+                  <div v-else>应付金额:</div>
+                  <div class="price">￥{{ order.flowPrice | unitPrice }}</div>
                </view>
                <view>
                  <!-- 全部 -->
@@ -57,6 +57,9 @@
                  <u-button ripple :customStyle="{'background':lightColor,'color':'#fff' }" shape="circle" class="pay-btn" size="mini" v-if="order.allowOperationVO.rog" @click="onRog(order.sn)">
                    确认收货
                  </u-button>
+                  <u-button ripple shape="circle" class="cancel-btn" size="mini" v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyService(order)">
+                    退款/售后
+                  </u-button>
                  <!-- TODO 后续完善 -->
                  <!-- <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
                      order.orderStatus === 'CANCELLED' ||
@@ -91,7 +94,7 @@
      </view>
    </u-popup>
    <u-toast ref="uToast" />
-    <u-modal :confirm-color="lightColor" v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'"  @confirm="confirmRog"></u-modal>
+    <u-modal :confirm-color="lightColor" v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" @confirm="confirmRog"></u-modal>
  </view>
 </template>

@@ -106,7 +109,7 @@ export default {
  },
  data() {
    return {
-      lightColor:this.$lightColor,
+      lightColor: this.$lightColor,
      tabCurrentIndex: 0, //导航栏索引
      navList: [
        //导航栏list
@@ -203,6 +206,8 @@ export default {
    this.loadData(this.status);
  },

+  
+
  onLoad(options) {
    /**
     * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
@@ -214,6 +219,7 @@ export default {
    if (status == 0) {
      this.loadData(status);
    }
+  
  },

  watch: {
@@ -230,6 +236,18 @@ export default {
    },
  },
  methods: {
+
+
+    // 售后
+    applyService(order){
+      
+      
+      uni.navigateTo({
+         url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`
+      });
+
+    },
+
    // 店铺详情
    navigateToStore(val) {
      uni.navigateTo({
@@ -309,9 +327,8 @@ export default {
          this.navList[index].loadStatus = "noMore";
        }
        if (orderList.length > 0) {
-          this.navList[index].orderList = this.navList[index].orderList.concat(
-            orderList
-          );
+          this.navList[index].orderList =
+            this.navList[index].orderList.concat(orderList);
          this.navList[index].pageNumber += 1;
        }
      });
@@ -458,14 +475,11 @@ export default {
     * 重新购买
     */
    reBuy(order) {
-      console.log(order)
-      return 
+      console.log(order);
+      return;
      uni.navigateTo({
        url:
-          "/pages/product/goods?id=" +
-          order.id +
-          "&goodsId=" +
-          order.goodsId,
+          "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
      });
    },

@@ -491,6 +505,9 @@ page,

 .swiper-box {
  height: calc(100vh - 40px);
+  // #ifdef H5
+  height: calc(100vh - 40px - 44px);
+  // #endif
 }

 .list-scroll-content {
@@ -610,9 +627,10 @@ page,
    font-size: 26rpx;

    .description {
+      display: flex;
      color: #909399;
-      size: 25rpx;
-
+      size: 24rpx;
+      flex: 1;
      .price {
        color: $main-color;
      }
@@ -673,5 +691,4 @@ page,
  margin-left: 15rpx;
  height: 60rpx;
 }
-
 </style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lemon橪	e73d76eb57	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2022-02-14 14:31:36 +08:00
lemon橪	b9a89d7c40	新增分销模块分销业绩详细信息补充	2022-02-14 14:31:29 +08:00
paulGao	1a1bf814a0	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp	2022-02-14 14:21:50 +08:00
paulGao	f52e929d04	适配api	2022-02-14 14:21:48 +08:00
paulGao	38d8d2e1ca	适配修改后的api	2022-02-12 15:20:48 +08:00
paulGao	ab4015d0e0	适配修改的api	2022-02-10 18:57:17 +08:00
lemon橪	15027e51ee	优化安卓app在登录验证页面图像可能显示异常问题	2022-02-07 14:41:18 +08:00
paulGao	557d7ef1d9	fix bugs	2022-01-27 14:58:42 +08:00
paulGao	4dea906e23	修复店铺和平台优惠券同时选择时，显示问题	2022-01-21 19:02:06 +08:00
paulGao	68e25cb0b3	优化下单后退显示	2022-01-04 19:58:01 +08:00
paulGao	4d033e59f1	增加刷新token接口失效的情况处理	2022-01-04 14:22:00 +08:00
paulGao	a80c579d8a	售后获取订单过滤0元订单	2022-01-04 09:20:20 +08:00
paulGao	5cc48ed462	修复登录时uuid变化问题	2021-12-31 12:04:39 +08:00
lemon橪	2abc8ff9d8	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-12-29 09:23:06 +08:00
lemon橪	198bd6c322	修复楼层装修请求文章的接口路径	2021-12-29 09:23:05 +08:00
paulGao	7fb96f1eac	修复购物车全选显示不正确问题	2021-12-28 19:50:06 +08:00
paulGao	2020f55826	修复订单详情跳转商品页面错误	2021-12-27 18:45:39 +08:00
lemon橪	c58f8d7831	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-12-25 10:55:27 +08:00
lemon橪	32a6bbacd0	购物车新增领劵判断，优化我的优惠券中可能出现的Bug	2021-12-25 10:55:25 +08:00
夜良king	b08c77b6c0	我的足迹里-全选的改动	2021-12-24 16:41:43 +08:00
lemon橪	a8836744f6	我的收藏布局修改	2021-12-24 16:22:03 +08:00
lemon橪	3a2202a2e8	修改部分已发现的bug	2021-12-24 09:12:21 +08:00
lemon橪	896749d812	修复购物车在更新最新后端代码的时候导致的bug	2021-12-23 18:36:00 +08:00
paulGao	09ec1e8c06	修复默认弹促销	2021-12-23 16:06:59 +08:00
paulGao	07627c41e3	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp	2021-12-21 19:12:20 +08:00
paulGao	e4e278c2fa	适配促销活动，修复促销问题	2021-12-21 19:12:04 +08:00
lemon橪	1b1b239ba0	合并冲突提交	2021-12-20 17:35:38 +08:00
lemon橪	c1d4d39265	udesk 技术储备	2021-12-20 17:34:45 +08:00
lemon橪	dfd3885486	储备udesk方案，暂时注释	2021-12-20 17:34:27 +08:00
paulGao	892f49c83a	适配重构促销	2021-12-15 18:17:33 +08:00
paulGao	85d0671443	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp	2021-12-13 19:33:21 +08:00
paulGao	f22e7b9fcb	适配重构促销	2021-12-13 19:31:48 +08:00
lemon橪	d282ef1b24	化楼层装修中商品分类判断	2021-12-13 17:17:02 +08:00
lemon橪	9c2529ae3d	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-12-13 17:16:14 +08:00
lemon橪	108b7f5b0b	优化楼层装修中商品分类判断	2021-12-13 17:16:12 +08:00
paulGao	b4c8be3e63	Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-uniapp	2021-12-13 02:26:08 +08:00
paulGao	4064c56b21	适配重构促销	2021-12-11 13:48:18 +08:00
lemon橪	1416762afe	优化楼层装修中商品分类代码可能会出现的bug	2021-12-09 18:32:01 +08:00
lemon橪	17f23fe920	砍价分享图片有误bug修改	2021-12-03 15:52:40 +08:00
lemon橪	c412c92b3e	新增取消售后优化售后部分逻辑	2021-11-30 14:59:49 +08:00
lemon橪	deed875c1b	新增商品列表	2021-11-29 09:58:39 +08:00
lemon橪	f600b628ce	我的足迹样式优化	2021-11-22 15:25:42 +08:00
lemon橪	0c887a25e3	修改login中第三方循环判断	2021-11-22 11:18:00 +08:00
lemon橪	89dbd32351	修改商品详情中图片有空格问题	2021-11-19 15:49:42 +08:00
lemon橪	98c5863973	新增搜素样式判断优化，以及投诉图片上传内容条显示	2021-11-18 18:11:28 +08:00
lemon橪	3d1089b756	优化我的评价	2021-11-17 16:30:04 +08:00
lemon橪	6c8102aecd	新增我的评价中订单评论状态	2021-11-16 17:43:09 +08:00
lemon橪	56fdb2c2f0	退出登录	2021-11-16 11:11:54 +08:00
lemon橪	7c85460fbb	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-11-15 16:19:55 +08:00
lemon橪	47b58c290a	删除冗余选择器优化代码	2021-11-15 16:19:53 +08:00
paulGao	cdf57806d6	add logout	2021-11-11 18:46:26 +08:00
lemon橪	9671d60555	修改商品搜索样式以及es中删除部分字段	2021-11-11 18:15:12 +08:00
lemon橪	f8b388c968	优化筛选	2021-11-11 16:42:41 +08:00
lemon橪	91cc98e853	修改筛选逻辑判断	2021-11-10 10:22:37 +08:00
lemon橪	58484f1b61	筛选中可能出现的问题	2021-11-09 19:04:38 +08:00
lemon橪	d65ad6c5fd	修改登录中可能存在的验证码bug	2021-11-08 11:21:19 +08:00
lemon橪	68bc1d6974	优化商品筛选楼层装修判断	2021-11-04 10:53:52 +08:00
lemon橪	b1c518c3a8	合并Master	2021-11-03 11:55:24 +08:00
lemon橪	48c7030c0e	修改部分页面判断问题	2021-11-03 11:54:38 +08:00
chopper711	13c9d521f9	update README.md.	2021-11-02 08:03:59 +00:00
lemon橪	375653eb78	更新微信公众号登录	2021-10-29 16:34:41 +08:00
lemon橪	8c72cdcb0a	修改我的优惠券中bug	2021-10-29 11:19:27 +08:00
lemon橪	cfb88d798b	提交上次更改多余删除部分	2021-10-26 15:45:30 +08:00
lemon橪	ebf32a18b0	1.修改商品规格中可能出现的sku判断，优化选择商品规格上下滑动。2.优化登录页面样式。3.优化购物车样式	2021-10-26 15:27:13 +08:00
lemon橪	5f6c1adf91	优化无痛刷新token 修改分销扫码bug	2021-10-22 18:03:41 +08:00
lemon橪	44648e9971	首页下拉刷新，优化商品促销界面	2021-10-15 18:01:54 +08:00
lemon橪	fd37087c43	删除冗余组件，修改搜索商品样式	2021-10-13 18:01:09 +08:00
lemon橪	4c47a1249f	优化售后方面	2021-10-12 16:31:03 +08:00
lemon橪	ea3563e4e9	解决商品详情中商品介绍判断bug	2021-10-06 16:46:47 +08:00
lemon橪	c98c5b64e1	修改部分已知的代码问题	2021-09-28 17:56:21 +08:00
lemon橪	3b9b2e8ba2	优化订单，组件页面下拉刷新，修改评论bug	2021-09-27 19:58:18 +08:00
lemon橪	cebde87682	修改小程序使用优惠券bug	2021-09-26 10:30:28 +08:00
lemon橪	0b2bf1faf1	优化购物车在微信公众号中样式问题	2021-09-22 11:31:37 +08:00
lemon橪	73560e8366	修改筛选不赋值categoryId问题	2021-09-18 10:11:29 +08:00
lemon橪	afabfdd1d5	修改发现的商品搜索已售问题	2021-09-18 09:59:47 +08:00
lemon橪	dadce33d74	解决筛选bug 和已知的坐标问题	2021-09-17 18:08:08 +08:00
lemon橪	fe0d888da0	优化微信网页登录	2021-09-10 10:45:37 +08:00
lemon橪	58f33b05dd	优化微信公众号中h5登录	2021-09-09 17:53:57 +08:00
lemon橪	ba3034e5cb	提交补交	2021-09-09 15:05:19 +08:00
lemon橪	4c7663d671	修改地址中逻辑错误bug	2021-09-09 15:02:44 +08:00
lemon橪	a78dca1a0c	修改第三方登录时苹果审核不同过原因	2021-09-09 14:50:51 +08:00
lemon橪	c529688932	优化移动端已知的问题	2021-09-09 11:21:28 +08:00
lemon橪	0cfb5d42c0	优化部分样式	2021-09-08 09:52:04 +08:00
lemon橪	13f3971f2a	修改收藏bug	2021-09-03 16:46:55 +08:00
lemon橪	075399d329	修改收藏bug	2021-09-03 16:33:32 +08:00
lemon橪	90d9fa9671	修改搜索问题，优化签到页面	2021-09-03 09:48:35 +08:00
lemon橪	6ca01d2c71	解决后端更新之后es中与前端不匹配bug,优化部分代码复用性	2021-09-02 16:08:35 +08:00
lemon橪	275d76c0dd	优化提交页面样式，优化商品默认为第一个热词进行搜索，修复分销商铺bug	2021-09-01 17:30:54 +08:00
lemon橪	c53af2fcc3	防抖登录，砍价优化，新增砍价记录，优化积分信息，优化组件复用。	2021-08-27 17:54:52 +08:00
lemon橪	c45a378665	未提交的api修改	2021-08-27 14:24:16 +08:00
lemon橪	cb982c2883	砍价活动修改bug	2021-08-27 14:11:06 +08:00
lemon橪	52e6c57f70	解决签到问题以及优惠券，砍价等问题	2021-08-26 18:08:16 +08:00
lemon橪	9a91e58f2c	优化修改密码部分	2021-08-26 09:48:32 +08:00
lemon橪	25fb26b7d0	优化拼团时选择地址bug,优化其他问题	2021-08-26 09:31:57 +08:00
lemon橪	8f5f44022b	优化app中订单时间问题	2021-08-23 11:54:27 +08:00
lemon橪	a2994454aa	修复优惠券微信小程序中出现的bug,以及拼团分享规格问题	2021-08-23 10:56:56 +08:00
lemon橪	915aee9143	微信支付成功订阅进行优化	2021-08-23 10:09:12 +08:00
lemon橪	224eb05703	修改部分scss类名，新增部分注释以及登录颜色化配置:)	2021-08-19 16:20:21 +08:00
lemon橪	775bf3055d	修改第三方登录可能出现的bug	2021-08-17 17:10:19 +08:00
lemon橪	d76bab4b71	优化小程序登录跳转部分代码.新增全局条件编译跳转方法	2021-08-17 11:53:56 +08:00
lemon橪	3d1e175194	修改楼层装修中商品装修出现的默认不显示bug	2021-08-16 11:34:15 +08:00
lemon橪	885ccb5006	配置微信小程序返回首页按钮	2021-08-16 10:35:12 +08:00
lemon橪	eb11f9dbae	修改收藏店铺bug	2021-08-12 17:05:01 +08:00
lemon橪	415dd15dd1	删除没有的components组件	2021-08-12 16:48:06 +08:00
lemon橪	3f19fc8c15	新增店铺营业执照	2021-08-11 17:09:37 +08:00
lemon橪	464379178d	优化部分代码冗余	2021-08-11 10:28:04 +08:00
lemon橪	1fbb43c848	修改店铺页面店铺显示问题	2021-08-11 09:49:09 +08:00
lemon橪	b93395d0dc	添加店铺联系客服功能	2021-08-10 09:57:48 +08:00
lemon橪	1141923407	修改店铺样式，优化部分代码	2021-08-09 18:44:03 +08:00
lemon橪	209060fd76	优化部分代码，修改店铺ui以及功能	2021-08-09 18:40:06 +08:00
lemon橪	e02fa75274	店铺页面有些bug 已处理	2021-08-05 19:01:31 +08:00
lemon橪	4ca71d0987	优化移动端登录样式按钮样式问题	2021-08-04 18:14:31 +08:00
lemon橪	123127d977	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-07-30 16:29:17 +08:00
lemon橪	d19b02a97d	优化热门搜索方案，如果更新了后端最新代码，请pull下更新	2021-07-30 16:29:05 +08:00
mabo	aad083970e	no message	2021-07-30 08:02:13 +08:00
lemon橪	436dd56e54	积分商品展示的部分问题	2021-07-28 09:53:41 +08:00
lemon橪	a9db24d1ad	新增积分商品功能以及在微信公众号优化部分逻辑	2021-07-27 18:14:53 +08:00
lemon橪	a6fec5cf70	优化部分商品评价无id,以及投诉详情页面展示错误问题	2021-07-22 17:32:33 +08:00
lemon橪	0ea121e59e	积分商品，以及完善砍价商品	2021-07-20 18:05:50 +08:00
lemon橪	65a9110ada	合并分支	2021-07-15 15:10:43 +08:00
lemon橪	fc9b7bac16	优化部分页面以及逻辑	2021-07-15 15:10:27 +08:00
mabo	3171fddd7b	售后列表添加排序字段	2021-07-08 14:35:40 +08:00
lemon橪	2df8be328f	补交上次提交遗漏部分	2021-07-07 16:42:12 +08:00
lemon橪	8f942bf01e	优化验证码以及跳转部分	2021-07-07 15:59:48 +08:00
lemon橪	346eb13d50	新增拼团活动为空时优化提示	2021-07-07 10:56:57 +08:00
lemon橪	b8e0ddcb5a	优化个人中心页面的样式	2021-07-05 15:26:44 +08:00
lemon橪	10d8f25ddf	新增可配置组件	2021-07-05 11:30:46 +08:00
lemon橪	96d42cdab8	修改一些可见的问题	2021-07-02 17:58:49 +08:00
mabo	3294f12268	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp # Conflicts: # pages/product/goods.vue	2021-07-02 15:49:24 +08:00
mabo	29630a8495	商品参数修改	2021-07-02 15:47:08 +08:00
lemon橪	9f48cc7110	分销认证新增银行开户行银行开户名银行账号	2021-07-02 15:26:52 +08:00
lemon橪	efb2a7963e	微信小程序版本提交更新版本解决缓存问题	2021-07-02 10:52:36 +08:00
lemon橪	8ecc85a21c	优化上个提交中app以及小程序的样式问题	2021-07-01 15:46:42 +08:00
lemon橪	765ad65b8f	新增商品超出配送范围提示	2021-07-01 15:25:00 +08:00
lemon橪	8500fb4087	Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp	2021-07-01 11:16:52 +08:00
lemon橪	ef51049ed4	分销商铺解绑，优化商品售后部分的流程	2021-07-01 11:16:46 +08:00
mabo	ef5941de00	商品详情规则选择的bug	2021-06-30 18:25:45 +08:00
lemon橪	4599b02a41	直播间优化提示，安卓以及ios扫码权限判定	2021-06-29 16:26:32 +08:00