feat: ✨ 新增虚拟商品不展示地址功能

perf: 🐛 优化QQ登录和微信登录Bug
fix: 优化小程序登录
2025-12-19 17:05:55 +08:00 · 2023-08-18 18:49:34 +08:00 · 2023-08-14 14:40:08 +08:00 · 2023-08-10 15:04:20 +08:00 · 2023-08-10 14:19:23 +08:00 · 2023-08-03 16:04:18 +08:00
161 changed files with 19086 additions and 6448 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # OSX
 #
 .DS_Store
+node_modules/

 #Intellij idea
 .idea/
@@ -8,3 +9,5 @@
 .vscode/
 /unpackage/
 .hbuilderx/launch.json
+.project.config.json
+.project.private.config.json
--- a/App.vue
+++ b/App.vue
@@ -1,22 +1,44 @@
-
-
 <script>
-/**
+	/**
 	 * vuex管理登录状态，具体可以参考官方登录模板示例
 	 */
-import { mapMutations } from "vuex";
-import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-import config from "@/config/config";
-// 悬浮球
+	import {
+		mapMutations
+	} from "vuex";
+	import APPUpdate from "@/plugins/APPUpdate";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
+	import config from "@/config/config";
+	import storage from "@/utils/storage";

-export default {
+	
+	
+	/**
+	 * 路由监听并删除路由
+	 * https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateTo.html
+	 * */
+	// #ifdef MP-WEIXIN
+	wx.onAppRoute((res) => {
+		const pages = getCurrentPages();
+		console.log("pages:" + pages.length,pages);
+		if (pages.length > 3) {
+			delete getCurrentPages()[2]
+		}
+		console.log('路由监听', {
+			res
+		})
+	})
+	// #endif
+
+	export default {
 		data() {
 			return {
 				config,
 			};
 		},

+
 		/**
 		 * 监听返回
 		 */
@@ -48,7 +70,7 @@ export default {
 		methods: {
 			...mapMutations(["login"]),
 		},
-  onLaunch: function () {
+		onLaunch: function() {
 			// #ifdef APP-PLUS
 			this.checkArguments(); // 检测启动参数
 			APPUpdate();
@@ -66,7 +88,18 @@ export default {

 		onShow() {
 			// #ifndef H5
+			if(this.config.enableGetClipboard){
 				this.getClipboard();
+			}
+			// #endif
+			// #ifdef APP-PLUS
+
+			if (storage.getShow()) {
+				if (uni.getSystemInfoSync().platform == 'ios') {
+					this.$u.route("/pages/tabbar/screen/fullScreen");
+
+				}
+			}
 			// #endif
 		},
 		methods: {
@@ -76,11 +109,11 @@ export default {
 			applyUpdateWeChat() {
 				const updateManager = uni.getUpdateManager();

-      updateManager.onCheckForUpdate(function (res) {
+				updateManager.onCheckForUpdate(function(res) {
 					// 请求完新版本信息的回调
 				});

-      updateManager.onUpdateReady(function (res) {
+				updateManager.onUpdateReady(function(res) {
 					uni.showModal({
 						title: "更新提示",
 						content: "发现新版本，是否重启应用？",
@@ -92,7 +125,7 @@ export default {
 						},
 					});
 				});
-      updateManager.onUpdateFailed(function (res) {
+				updateManager.onUpdateFailed(function(res) {
 					// 新的版本下载失败
 				});
 			},
@@ -108,8 +141,7 @@ export default {
 						//app启动时打开启动广告页
 						var w = plus.webview.open(
 							"/hybrid/html/advertise/advertise.html",
-            "本地地址",
-            {
+							"本地地址", {
 								top: 0,
 								bottom: 0,
 								zindex: 999,
@@ -118,7 +150,7 @@ export default {
 							500
 						);
 						//设置定时器，4s后关闭启动广告页
-          setTimeout(function () {
+						setTimeout(function() {
 							plus.webview.close(w);
 							APPUpdate();
 						}, 3000);
@@ -128,7 +160,7 @@ export default {
 					uni.setStorage({
 						key: "launchFlag",
 						data: true,
-          success: function () {
+						success: function() {
 							console.log("error时存储launchFlag");
 						},
 					});
@@ -140,15 +172,18 @@ export default {
 			 */
 			async getClipboard() {
 				let res = await getClipboardData();
+
 				/**
 				 * 解析粘贴板数据
 				 */
-      if (res.indexOf(config.shareLink) != -1) {
+
+				if (res.indexOf(config.shareLink) != -1 && (res != this.$store.state.shareLink)) {
+					this.$store.state.shareLink = res
 					uni.showModal({
 						title: "提示",
 						content: "检测到一个分享链接是否跳转？",
 						confirmText: "跳转",
-          success: function (callback) {
+						success: function(callback) {
 							if (callback.confirm) {
 								const path = res.split(config.shareLink)[1];
 								if (path.indexOf("tabbar") != -1) {
@@ -190,32 +225,35 @@ export default {
 				// #endif
 			},
 		},
-};
+	};
 </script>

 <style lang="scss">
-@import "uview-ui/index.scss";
+	@import "uview-ui/index.scss";

-// -------适配底部安全区  苹果x系列刘海屏
+	// -------适配底部安全区  苹果x系列刘海屏

-// #ifdef MP-WEIXIN
-.mp-iphonex-bottom {
+	// #ifdef MP-WEIXIN
+	.mp-iphonex-bottom {
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 		box-sizing: content-box;
 		height: auto !important;
 		padding-top: 10rpx;
-}
-// #endif
+	}

-body {
+	// #endif
+
+	body {
 		background-color: $bg-color;
-}
-/************************ */
-.w200 {
+	}
+
+	/************************ */
+	.w200 {
 		width: 200rpx !important;
-}
-.flex1 {
+	}
+
+	.flex1 {
 		flex: 1; //必须父级设置flex
-}
+	}
 </style>
--- a/MP_verify_qSyvBPhDsPdxvOhC.txt
+++ b/MP_verify_qSyvBPhDsPdxvOhC.txt
@@ -1 +0,0 @@
-qSyvBPhDsPdxvOhC
--- a/README.md
+++ b/README.md
@@ -1,218 +1,211 @@
-## 🔥 Lilishop B2B2C商城系统
+## Lilishop B2B2C 商城系统

-##### 🌹  开源不易，如有帮助请点Star 
+### 商城介绍

-
-
-#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，进群先看文档后提问）
-
-##### 交流 qq 1群 961316482（已满）
-
-##### 交流 qq 2群 875294241
-
-
-
-##### 商城 公众号/小程序体验，扫描二维码
-
-![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 商城系统 基于SpringBoot 研发，B2B2C多用户商城系统，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+**更多 README**：https://gitee.com/beijing_hongye_huicheng/lilishop/blob/master/README.md

-业务兼容O2O商城/B2B商城/B2B2C商城/F2B2C商城/S2B2C商城。支持小程序商城、H5商城、APP商城、 PC商城。
+**演示站点**：https://m-b2b2c.pickmall.cn/ 账号：13011111111 验证码：111111

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

-商城前后端分离、支持分布式部署。
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)

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

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

-##### 商城 API/消费者 聚合版
-api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转https://gitee.com/beijing_hongye_huicheng/lilishop-simplify
+`uni-app` https://uniapp.dcloud.net.cn/api/

-### ☃️ 商城 开发/使用/常见问题 帮助文档
+`vue2` https://v2.cn.vuejs.org/

-https://docs.pickmall.cn
+`uView v1` https://v1.uviewui.com/

-### 💧 开源商城项目地址(gitee)
+#### 环境

-**API（商城所有API）**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
+在开发之前保证本地安装了以下软件
+`hbulider` https://www.dcloud.io/hbuilderx.html

-**UI（商城管理端/商家端/买家PC端）**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+### 技术栈

-**uniapp（商城移动端，支持小程序/APP/H5）**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+本项目技术栈为 `uni-app` + `scss` + `ES2015` + `uView` 提前学习和了解这些知识将帮助你更好地上手我们的项目。

-**docker一键部署（商城部署脚本）**：https://gitee.com/beijing_hongye_huicheng/docker.git
+### 安装

-### 💧 开源商城项目地址(github)
+1. 克隆项目到本地

-**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
-
-
-☃️ UI 项目下3个文件夹 buyer：买家PC端，seller：商家端，manager：后台管理端
-
-
-### 💧 演示地址(手机验证码为 ‘111111’)
-
-**商城管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
-
-**商城店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
-
-**商城PC页面**：https://pc-b2b2c.pickmall.cn
-
-**商城移动端（请使浏览器手机模式，或者用手机浏览器打开）**：https://m-b2b2c.pickmall.cn
-
-**小程序/公众号**：扫描二维码
-
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
-
-### 🚙 3行命令搭建本地商城（注：只能本机访问，如需调整，请自行操作镜像）
-
-温馨提示：由于服务中间件较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
-
-
-
-#####  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 这里有与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     |
-
-| 前端演示         | 地址            |
-| -------------- | --------------- |
-| 商城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)
-
-
-
-
-
-### 🧩 商城前端功能展示
-
-
-
-#### ⚽️ 商城移动端
-
-<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)
-
-##### 🕹 后台技术选型
-
-| 说明           | 框架            | 说明           |               |
-| -------------- | --------------- | -------------- | ------------- |
-| 基础框架       | Spring Boot     | MVC框架        | Spring MVC    |
-| 持久框架       | Mybatis-Plus    | 程序构建       | Maven         |
-| 关系型数据库   | MySQL           | 消息中间件AMQP | RocketMQ      |
-| 缓存           | Redis +MongoDB  | 搜索引擎       | Elasticsearch |
-| 安全框架       | Spring Security | 数据库连接池   | Druid         |
-| 数据库分库分表 | sharding        | 定时任务       | xxl-job       |
-| 负载均衡       | Nginx           | 静态资源       | 阿里云OSS     |
-| 短信           | 阿里云短信      | 认证           | JWT           |
-| 日志处理       | Log4j           | 接口规范       | RESTful       |
-
-##### 🖥 前端-运营后台、店铺后台
-
-| 说明       | 框架       | 说明       | 框架    |
-| ---------- | ---------- | ---------- | ------- |
-| 构建工具   | webpack    | JS版本     | ES6     |
-| 基础JS框架 | Vue.js     | 视频播放器 | Dplayer |
-| 路由管理   | Vue Router | 状态管理   | Vuex    |
-| 基础UI库   | iView      | UI界面基于 | iView   |
-| 网络请求   | axios      |            |         |
-
-##### 📱前端-移动端
-
-| 说明      | 架构    | 说明     | 架构    |
-| --------- | ------- | -------- | ------- |
-| 基础UI库  | uViewui | 基础框架 | uni-app |
-| CSS预处理 | scss    | 地图引擎 | amap    |
-
-### 🌟 版本升级
-
-```
-商城后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
-
-后续会考虑推出微服务商城系统/商城中台等
+```shell
+git clone https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
 ```

+2. 从`hbulider`中打开项目

-### ⚠️ 开源须知
-1.仅允许用于个人学习研究使用.
+```shell
+直接将项目拖进hbulider中点击运行即可
+```

-2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
+### 目录结构

-3.软件受国家计算机软件著作权保护（登记号：2021SR0805085）。
+```
+├── api  // 接口
+├── components  // 组件
+├── config  // 配置文件
+├── CustomStartPage  // 打包配置的开屏页
+├── CustomStoryboard  // ios自定义storyboard启动页
+├── hybrid  // 广告配置页
+├── js_sdk  // 封装的js_sdk
+├── lib  // 封装的部分方法
+├── pages  // 页面
+├── plugins  // 插件
+├── static  // 静态资源
+├── store  // vuex
+├── utils  // 工具类
+├── uview-ui  // uview
+├── App.vue  // 入口页面
+├── main.js  // 入口文件
+├── manifest.json  // hbulider配置文件
+├── pages.json  // 路由配置文件
+├── uni.scss  // 全局样式
+└── vue.config.js  // vue配置文件
+```

-4.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+### 运行
+
+#### 运行在 h5
+
+在`hbulider`中点击`运行`->`运行到浏览器`->`选择自己的浏览器九号`
+
+#### 运行在微信小程序
+
+1.需要保证本地要有`微信开发者工具` https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
+
+2.在`hbulider`中点击`运行`->`运行到小程序模拟器`->`微信开发者工具` 运行的时候需要配置小程序的`appid`，配置完成后即可运行
+
+#### 运行 APP
+
+##### 运行在安卓
+
+在`hbulider`中点击`运行`->`运行到手机或模拟器`->`选择运行到安卓APP基座`
+
+##### 运行在 IOS
+
+在`hbulider`中点击`运行`->`运行到手机或模拟器`->`选择运行到IOS基座`


-### 🐧 交流群

-##### 官方qq 1群 961316482（已满）
-##### 官方qq 2群 875294241
+
+### 项目配置/开发
+
+#### config配置
+在根目录`config`下的`config`设置中配置了一些默认的配置，可以根据自己的需求进行修改
+
+```
+const name = "lilishop"; //全局商城name
+const schemeName = "lilishop"; //唤醒app需要的schemeName
+export default {
+  name: name,
+  schemeLink: `${schemeName}://`, //唤起app地址
+  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
+  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
+  appid: "", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
+  aMapKey: "", //在高德中申请Web服务key
+  scanAuthNavigation: ["https://m-b2b2c.pickmall.cn/"], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  iosAppId: "id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
+  logo: "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
+  customerServiceMobile: "13161366885", //客服电话
+  customerServiceEmail: "lili@lili.com", //客服邮箱
+  imWebSrc: "https://im.pickmall.cn", //IM地址
+  baseWsUrl: "wss://im-api.pickmall.cn/lili/webSocket", // IM WS 地址
+  enableGetClipboard: false, //是否启用粘贴板获取 scanAuthNavigation 中的链接，如果匹配则会跳转到对应页面
+  enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app
+  /**
+   * 如需更换主题请修改此处以及uni.scss中的全局颜色
+   */
+  mainColor: "#ff3c2a", // 主题色
+  lightColor: "#ff6b35", // 高亮主题色
+  aiderLightColor: "#ff9f28", // 辅助高亮颜色
+  defaultUserPhoto: "/static/missing-face.png", // 默认用户头像
+  enableFetchMobileLogin: false // 是否启用获取手机号登录 如果微信小程序提示封禁手机号获取权限 可将此选项设置成false作为备用登录方案
+};
+
+```
+#### 组件
+在根目录`components`下的`components`设置中配置了一些默认的组件，可以根据自己的需求进行修改或阅读组件详情代码以及README.md文档
+
+#### 页面
+在`pages`文件夹写入或修改页面代码，在`pages.json`中去配置页面路由，具体配置可以参考`pages.json` 或参考uni-app的文档
+
+在微信小程序中默认启用分包操作，如果需要在微信小程序中使用分包，需要在`pages.json`中配置分包路径，具体配置可以参考`pages.json` 或参考uni-app的文档
+
+#### 主题
+1.现在`config`中设置主题色
+
+2.在`uni.scss`中设置全局颜色
+
+3.替换项目中一些icon以及图片的颜色
+
+
+
+
+### 常见问题
+
+#### 微信小程序移动端启动报错
+
+小程序直播插件报错，在`manifest`中删除代码。
+![启动报错](https://docs.pickmall.cn/configure/images/live.png)
+
+#### 微信小程序上传文件过大超出 2MB
+
+1.关闭微信小程序，停止微信小程序运行
+
+2.重新点击运行小程序模拟器，在最下方有一个 `运行时是否压缩代码` 勾选并重新运行
+
+3.如果还是提示超出2MB，重新执行1步骤，然后点击`发行`->`小程序`即可
+
+4.以上1-3步骤都不行，可以尝试删除一些自己开发的代码或本地的静态资源图片
+
+#### 微信小程序在开发者工具中可以使用接口在测试版却不行
+1.首先保证是否填写`request`合法域名 在微信小程序后台配置
+
+2.需保证接口为https请求
+
+request合法域名基础配置如下
+```
+https://buyer-api.pickmall.cn
+https://common-api.pickmall.cn
+https://im-api.pickmall.cn
+https://restapi.amap.com
+```
+
+socket合法域名
+```
+wss://im-api.pickmall.cn
+```
+uploadFile合法域名
+```
+https://common-api.pickmall.cn
+```
+downloadFile合法域名
+```
+https://buyer-api.pickmall.cn
+https://common-api.pickmall.cn
+https://im-api.pickmall.cn
+https://lilishop-oss.oss-cn-beijing.aliyuncs.com
+```
+
+#### 如何配置API
+在根目录 `config` -> `api` 中配置开发环境以及生产环境 api 接口地址
+
+#### 运行报错
+初次运行时候可能因为本地环境缺少编译插件，这个时候一定要注意看报错信息，根据报错信息安装相应的插件即可
+
+#### 如何配置微信小程序appid
+在根目录 `manifest.json` 中配置微信小程序appid
+
+
+#### 微信登录报错
+需检查appId是否配置正确，在后台管理中信任登录的`appId`以及`appSecret`是否配置正确
+
+

--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -0,0 +1,17 @@
+{
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920\">《服务协议》</a>和<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920\">《服务协议》</a>和<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "styles" : {
+        "borderRadius" : "5px"
+    }
+}
--- a/api/address.js
+++ b/api/address.js
@@ -25,7 +25,7 @@ export function getAddressList(pageNumber, pageSize) {
 */
 export function getLogistics() {
  return http.request({
-    url: "/logistics",
+    url: "/other/logistics",
    method: Method.GET,
    needToken: true,
    params: { pageNumber: 1, pageSize: 200, disabled: "OPEN" },
--- a/api/article.js
+++ b/api/article.js
@@ -28,3 +28,16 @@ export function getArticleDetail(type) {
  });
 }

+/**
+ * 获取文章详情
+ * @param type
+ */
+ export function getArticleDetailByType(type) {
+  return http.request({
+    url: `/other/article/type/${type}`,
+    method: Method.GET,
+  });
+}
+
+
+
--- a/api/connect.js
+++ b/api/connect.js
@@ -15,7 +15,7 @@ const request = http.request;
 */
 export function webConnect(code) {
 	return http.request({
-		url: `connect/login/web/${code}`,
+		url: `passport/connect/connect/login/web/${code}`,
 		method: Method.GET,
 		needToken: true,
 		header: {
@@ -25,8 +25,8 @@ export function webConnect(code) {
 }
 export function openIdLogin(params, clientType) {
 	return http.request({
-		url: `connect/app/login`,
-		method: Method.GET,
+		url: `passport/connect/connect/app/login`,
+		method: Method.POST,
 		needToken: true,
 		data: params,
 		header: {
@@ -40,7 +40,7 @@ export function openIdLogin(params, clientType) {
 */
 export function loginCallback(state) {
 	return http.request({
-		url: `connect/result?state=${state}`,
+		url: `passport/connect/connect/result?state=${state}`,
 		method: Method.GET,
 		needToken: false
 	});
@@ -54,7 +54,7 @@ export function loginCallback(state) {
 */
 export function mpAutoLogin(params) {
 	return http.request({
-		url: 'mini-program/auto-login',
+		url: 'passport/connect/miniProgram/auto-login',
 		method: Method.GET,
 		params
 	});
--- a/api/entry.js
+++ b/api/entry.js
@@ -0,0 +1,41 @@
+/**
+ * 入驻类相关api
+ */
+
+import { http, Method } from "@/utils/request.js";
+
+// 获取当前用户的代理入驻详情
+export function getCompanyDetail(params) {
+  return http.request({
+    url: "/store/store/apply",
+    method: Method.GET,
+    params,
+  });
+}
+
+// 申请店铺第一步-填写企业信息
+export function applyFirst(params) {
+  return http.request({
+    url: "/store/store/apply/first",
+    method: Method.PUT,
+    params,
+  });
+}
+
+// 申请店铺第二步-填写银行
+export function applySecond(params) {
+  return http.request({
+    url: "/store/store/apply/second",
+    method: Method.PUT,
+    params,
+  });
+}
+
+// 申请店铺第三步-填写银行
+export function applyThird(params) {
+  return http.request({
+    url: "/store/store/apply/third",
+    method: Method.PUT,
+    params,
+  });
+}
--- a/api/home.js
+++ b/api/home.js
@@ -1,6 +1,21 @@
 import { http, Method } from "@/utils/request.js";

-
+ export function toSpecial(data) {
+  return http.request({
+    url: `/other/pageData/getSpecial`,
+    method: Method.GET,
+    data
+  });
+}
+/**
+ * 专题内容
+ */
+ export function getSpecial(id) {
+  return http.request({
+    url: `/other/pageData/get/${id}`,
+    method: Method.GET,
+  });
+}

 /**
 * 获取广告图
@@ -44,10 +59,22 @@ export function getHotKeywords(count) {
 * @param client_type
 * @param page_type
 */
-export function getFloorData() {
+export function getFloorData(params) {
  return http.request({
    url: `/other/pageData/getIndex?clientType=H5`,
    method: "get",
+    params
+  });
+}
+
+/**
+ * 获取店铺楼层数据
+ */
+export function getFloorStoreData(params) {
+  return http.request({
+    url: `/other/pageData?pageClientType=H5`,
+    method: "get",
+    params
  });
 }

--- a/api/im.js
+++ b/api/im.js
@@ -0,0 +1,82 @@
+import { http,Method } from "@/utils/request.js";
+
+import api from "@/config/api.js";
+
+/**
+ * 获取聊天详情接口
+ * @param {*} talkId 
+ * @returns 
+ */
+export function getTalk(talkId) {
+    return http.request({
+      url: `${api.im}/talk/${talkId}`,
+      method: Method.GET,
+    });
+}
+
+/**
+ * 获取与用户的聊天详情
+ * @param {*} talkId 
+ * @returns 
+ */
+ export function getTalkByUser(userId) {
+  return http.request({
+    url: `${api.im}/talk/by/user/${userId}`,
+    method: Method.GET,
+  });
+}
+
+/**
+ * 获取聊天列表
+ * @param {*} talkId 
+ * @returns 
+ */
+ export function getTalkList(params) {
+    return http.request({
+      url: `${api.im}/talk/list`,
+      method: Method.GET,
+      params
+    });
+}
+
+/**
+ * 获取聊天信息接口
+ * @param {*} params 
+ * @returns 
+ */
+ export function getTalkMessage(params) {
+    return http.request({
+      url: `${api.im}/message`,
+      method: Method.GET,
+      params
+    });
+}
+
+/**
+ * 获取聊天信息接口
+ * @param {*} params 
+ * @returns 
+ */
+ export function cleanUnreadMessage(params) {
+  return http.request({
+    url: `${api.im}/message/clean/unred`,
+    method: Method.PUT,
+    params
+  });
+}
+// 从商品页点击 客服 跳转 获取商品详情
+export function jumpObtain(skuId, goodsId) {
+  return http.request({
+    url: `/goods/goods/sku/${goodsId}/${skuId}`,
+    method: Method.GET,
+  });
+}
+// 清除未读
+// /im/message/clean/unred
+export function clearmeaager() {
+  return http.request({
+    url: `${api.im}/message/clean/unred`,
+    method: Method.PUT,
+  });
+}
+
--- a/api/login.js
+++ b/api/login.js
@@ -14,6 +14,34 @@ export function resetByMobile(params) {
  });
 }

+
+//获取自动发券
+export function getAutoCoup(){
+  return http.request({
+    url:`/promotion/coupon/activity`,
+    method:"GET",
+    needToken: true,
+  });
+}
+
+/**
+ * 账号密码登陆
+ * @params  password
+ * @params  username
+ */
+ export function userLogin(params, clientType){
+  return http.request({
+    method: "POST",
+    url:`/passport/member/userLogin`,
+    data: params,
+    header: {
+      "content-type": "application/x-www-form-urlencoded",
+	  clientType: clientType,
+    },
+  })
+}
+
+
 /**
 * 发送验证码
 * @param  mobile
@@ -74,3 +102,20 @@ export function logout () {
    needToken: true,
  })
 }
+
+export function scannerCodeLogin(params){
+	return http.request({
+	  url: '/passport/member/app_scanner',
+	  method: "POST",
+	  params,
+	  needToken: true,
+	});
+}
+export function scannerCodeLoginConfirm(params){
+	return http.request({
+	  url: '/passport/member/app_confirm',
+	  method: "POST",
+	  params,
+	  needToken: true,
+	});
+}
--- a/api/members.js
+++ b/api/members.js
@@ -202,6 +202,22 @@ export function getGoodsCollection(params, type) {
  });
 }

+/**
+ * 获取商品收藏
+ * @param params
+ * @returns {AxiosPromise}
+ */
+export function getStoreCollection(params, type) {
+  return http.request({
+    url: `/member/storeCollection/${type}`,
+    method: Method.GET,
+    needToken: true,
+    loading: false,
+    message: false,
+    params,
+  });
+}
+
 /**
 * 收藏商品
 * @returns {AxiosPromise}
@@ -236,7 +252,7 @@ export function deleteGoodsCollection(ids) {
 */
 export function deleteStoreCollection(store_id) {
  return http.request({
-    url: `/member/collection/delete/STORE/${store_id}`,
+    url: `/member/storeCollection/delete/STORE/${store_id}`,
    method: Method.DELETE,
    needToken: true,
  });
@@ -255,6 +271,19 @@ export function getGoodsIsCollect(type, good_id) {
  });
 }

+/**
+ * 获取商品是否被收藏
+ * @param good_id
+ */
+export function getStoreIsCollect(type, store_id) {
+  return http.request({
+    url: `/member/storeCollection/isCollection/${type}/${store_id}`,
+    method: Method.GET,
+    needToken: true,
+    loading: false,
+  });
+}
+
 /**
 * 收藏店铺
 * @param store_id 店铺ID
@@ -262,10 +291,9 @@ export function getGoodsIsCollect(type, good_id) {
 */
 export function collectionStore(store_id) {
  return http.request({
-    url: "members/collection/store",
-    header: { "content-type": "application/x-www-form-urlencoded" },
+    url: `/member/storeCollection/add/STORE/${store_id}`,
    method: Method.POST,
-    data: { store_id },
+    needToken: true,
  });
 }

@@ -419,3 +447,16 @@ export function getMemberPointSum() {
    method: Method.GET,
  });
 }
+
+/**
+ * 获取会员积分VO
+ * @param
+ */
+export function withdrawalSettingVO() {
+  return http.request({
+    url: `/wallet/wallet/withdrawalSettingVO`,
+    method: Method.GET,
+    needToken: true,
+  });
+}
+
--- a/api/message.js
+++ b/api/message.js
@@ -14,7 +14,7 @@ import api from '@/config/api.js';
 */
 export function getWeChatMpMessage() { 
  return http.request({
-    url: 'mini-program/subscribeMessage',
+    url: 'passport/connect/miniProgram/subscribeMessage',
    method: Method.GET
  });
 }
@@ -48,6 +48,24 @@ export function messageMarkAsRead(ids) {
  });
 }

+//读取站内消息
+export function editMessages(message_id,params){
+  return http.request({
+    url:`/message/member/${message_id}`,
+    method:Method.PUT,
+    needToken:true,
+    params
+  })
+}
+//获取站内消息
+export function messages(params) {
+  return http.request({
+    url: "/message/member",
+    method: Method.GET,
+    needToken: true,
+    params,
+  });
+}

 /**
 * 获取物流消息列表
@@ -73,7 +91,7 @@ export function getLogisticsMessages(params) {
 */	
 export function getAppVersion(appType) {
  return http.request({
-    url: `/appVersion/${appType}`,
+    url: `/other/appVersion/${appType}`,
    method: Method.GET,
    type:"manager"
  });
@@ -86,7 +104,7 @@ export function getLogisticsMessages(params) {
 */	
 export function getAppVersionList(type,data) {
  return http.request({
-    url: `/appVersion/appVersion/${type}`,
+    url: `/other/appVersion/appVersion/${type}`,
    method: Method.GET,
    type:"manager",
    data
--- a/api/store.js
+++ b/api/store.js
@@ -13,7 +13,7 @@ import {http, Method} from '@/utils/request.js';
 */
 export function getStoreList(params) {
  return http.request({
-    url: '/store',
+    url: '/store/store',
    method: Method.GET,
    params,
  });
@@ -55,5 +55,17 @@ export function getStoreList(params) {
 }


+/**
+ * 获取自提点信息
+ * @param id
+ */
+ export function getStoreAddress(storeId,params) {
+  return http.request({
+    url: `/store/address/page/${storeId}`,
+    method: Method.GET,
+    params
+  });
+}
+


--- a/api/trade.js
+++ b/api/trade.js
@@ -155,6 +155,18 @@ export function setAddressId(addressId,way) {
  
  });
 }
+/**
+ * 设置收货地址ID
+ * @param addressId
+ */
+ export function setStoreAddressId(storeAddressId,way) {
+  return http.request({
+    url: `/trade/carts/storeAddress?storeAddressId=${storeAddressId}&way=${way}`,
+    method: Method.GET,
+    needToken: true,
+  
+  });
+}


 /**
@@ -281,3 +293,29 @@ export function reBuy(sn) {
    needToken: true,
  });
 }
+
+
+/**
+ * 获取全部配送方式
+ */
+ export function shippingMethodList(params) {
+  return http.request({
+    url: `/trade/carts/shippingMethodList`,
+    method: Method.GET,
+    needToken: true,
+    params: params,
+  });
+}
+
+/**
+ * 提交配送方式
+ * @param params
+ */
+ export function setShipMethod(params) {
+  return http.request({
+    url: "/trade/carts/shippingMethod",
+    method: Method.PUT,
+    needToken: true,
+    params,
+  });
+}
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -1,59 +1,50 @@
 <template>
 	<div class="wrapper">
-    <u-popup
-      class="popup"
-      v-model="buyMask"
-      :height="setup.height"
-      closeable
-      :mode="setup.mode"
-      :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 && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
 							<span v-if="goodsDetail.promotionPrice && !pointDetail">
 								￥
-                <span class="goods-price-promotionShow goods-price-bigshow">{{
-                  formatPrice(goodsDetail.promotionPrice)[0]
-                }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
+								<span class="goods-price-promotionShow goods-price-bigshow">{{ $options.filters.goodsFormatPrice(goodsDetail.promotionPrice)[0] }}</span>
+								.{{ $options.filters.goodsFormatPrice(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)[1] }}
+								<span class="goods-price-bigshow">{{ $options.filters.goodsFormatPrice(goodsDetail.price)[0] }}</span>
+								.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
 							</div>
 						</view>
 						<!-- 正常商品的价格 -->
-            <view class="goods-price" v-else>
+						<view v-else>
+							<!-- 批发价格 -->
+							<div class="price-row flex" v-if="goodsDetail.salesModel === 'WHOLESALE'">
+								<div class="goods-price" v-for="(item, index) in wholesaleList" :key="index">
 									<span>
 										￥
-                <span class="goods-price-bigshow">{{
-                  formatPrice(goodsDetail.price)[0]
-                }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
+										<span class="goods-price-bigshow">{{ $options.filters.goodsFormatPrice(item.price)[0] }}</span>
+										.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
 									</span>
+									<span class="wholesale-item">{{ item.num }}{{ goodsDetail.goodsUnit }}</span>
+								</div>
+							</div>
+							<div class="goods-price" v-else>
+								<span>
+									￥
+									<span class="goods-price-bigshow">{{ $options.filters.goodsFormatPrice(goodsDetail.price)[0] }}</span>
+									.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
+								</span>
+							</div>
 						</view>
 						<view class="goods-check-skus">
 							已选
@@ -62,66 +53,55 @@
 								<span>，{{ num }}个</span>
 							</span>
 						</view>
+						<view class="goods-check-skus">
+							库存
+							<span class="goods-check-skus-name">
+								<span>{{ goodsDetail.quantity }}</span>
+							</span>
+						</view>
 					</view>
 				</view>
 				<!-- 商品信息 -->
 				<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>

 							<!-- 正常逻辑 循环出sku -->
 							<view
 								v-if="!parentOrder"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								:class="{ active: spec_val.value == currentSelected[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 }}
+							>
+								{{ spec_val.value }}
 							</view>

 							<!-- 拼团购买，仅筛选出当前拼团类型商品 -->
 							<view
 								v-if="parentOrder && spec_val.skuId == goodsDetail.id"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								:class="{ active: spec_val.value == currentSelected[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 }}
+							>
+								{{ spec_val.value }}
 							</view>
 						</view>
 					</view>
 					<!-- 数量 -->
-          <view class="goods-skus-number">
+					<view class="goods-skus-number flex flex-a-c flex-j-sb">
 						<view class="view-class-title">数量</view>
-            <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>
+						<uni-number-box class="uNumber" :min="1" :max="999"   v-model="num"></uni-number-box>
 					</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>
@@ -129,101 +109,134 @@
 	</div>
 </template>
 <script>
-import * as API_trade from "@/api/trade.js";
-import setup from "./popup";
-
+import * as API_trade from '@/api/trade.js';
+import setup from './popup';
+import uniNumberBox from '@/components/uni-number-box'
 export default {
+	components: {
+		uniNumberBox
+	},
 	data() {
 		return {
 			setup,
-      num: 1,
-      // 步进器的大小尺寸单位是 rpx
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
-      selectName: "", //选中商品的昵称
-      selectSkuList: "", //选中商铺sku,
-      selectedSpecImg: "", //选中的图片路径
-      buyType: "", //用于存储促销，拼团等活动类型
-      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
+			num: this.wholesaleList && this.wholesaleList.length > 0 ? this.wholesaleList[0].num : 1,
+
+			selectName: '', //选中商品的昵称
+			selectSkuList: '', //选中商铺sku,
+			selectedSpecImg: '', //选中的图片路径
+			buyType: '', //用于存储促销，拼团等活动类型
+			parentOrder: '', //父级拼团活动的数据 - 如果是团员则有数据
 			formatList: [],
-      currentSelceted: [],
-      skuList: "",
-      isClose: false, //是否可以点击遮罩关闭
+			currentSelected: [],
+			skuList: '',
+			isClose: false //是否可以点击遮罩关闭
 		};
 	},
 	props: {
+		wholesaleList: {
+			type: null,
+			default: false
+		},
 		buyMask: {
 			type: Boolean,
-      default: false,
+			default: false
 		},
 		isGroup: {
 			type: Boolean,
-	  default: false,
+			default: false
 		},
 		goodsDetail: {
-      default: "",
-      type: null,
+			default: '',
+			type: null
 		},
 		selectedSku: {
-      default: "",
-      type: null,
+			default: '',
+			type: null
 		},
 		goodsSpec: {
-      default: "",
-      type: null,
+			default: '',
+			type: null
 		},
 		addr: {
-      default: "",
-      type: null,
+			default: '',
+			type: null
 		},
 		pointDetail: {
-      default: "",
-      type: null,
+			default: '',
+			type: null
+		}
 	},
+	computed: {
+		wholesalePrice(key) {
+			return this.wholesaleList.length
+				? this.wholesaleList.map(item => {
+						return item.price;
+				  })
+				: [];
+		},
+		wholesaleNum(key) {
+			return this.wholesaleList.length
+				? this.wholesaleList.map(item => {
+						return item.num;
+				  })
+				: [];
+		}
 	},
 	watch: {
+		num(val) {
+			
+			val == 0 ? this.num = 1 : ''
+			if (val) {
+				
+				//超过库存后修改回库存
+				if (val > this.goodsDetail.quantity) {
+					this.$nextTick(function() {
+						this.num = this.goodsDetail.quantity;
+					});
+				}
+			}
+		},
 		buyType: {
 			handler(val) {
 				if (val) {
 					this.buyType = val;
 				}
 			},
-      immediate: true,
+			immediate: true
 		},
 		selectSkuList: {
 			handler(val, oldval) {
-        this.$emit("changed", val);
-      },
-      deep: true,
+				this.$emit('changed', val);
 			},
+			deep: true
+		}
 	},

 	methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
+		numCheck(val) {
+			if (this.wholesaleList && this.wholesaleList.length > 0) {
+				if (this.num <= this.wholesaleList[0].num) {
+					uni.showToast({
+						title: '批发商品购买数量不能小于起批数量!',
+						duration: 2000,
+						icon: 'none'
+					});
+					this.num = this.wholesaleList[0].num;
+				}
 			}
-      return val.toFixed(2).split(".");
 		},
-
 		closeMask() {
-      this.$emit("closeBuy", false);
+			this.$emit('closeBuy', false);
 		},
 		
 		/**点击规格 */
 		handleClickSpec(val, index, specValue) {
-      this.currentSelceted[index] = specValue.value;
-      let selectedSkuId = this.goodsSpec.find((i) => {
+			this.currentSelected[index] = specValue.value;
+			let selectedSkuId = this.goodsSpec.find(i => {
 				let matched = true;
-        let specValues = i.specValues.filter((j) => j.specName !== "images");
+				let specValues = i.specValues.filter(j => j.specName !== 'images');
 				for (let n = 0; n < specValues.length; n++) {
-          if (specValues[n].specValue !== this.currentSelceted[n]) {
+					if (specValues[n].specValue !== this.currentSelected[n]) {
 						matched = false;
 						return;
 					}
@@ -233,25 +246,25 @@ export default {
 				}
 			});
 			if (selectedSkuId?.skuId) {
-        this.$set(this.currentSelceted, index, specValue.value);
+				this.$set(this.currentSelected, index, specValue.value);
 				this.selectSkuList = {
 					spec: {
 						specName: val.name,
-            specValue: specValue.value,
+						specValue: specValue.value
 					},
-          data: this.goodsDetail,
+					data: this.goodsDetail
 				};
 				this.selectName = specValue.value;

-        this.$emit("handleClickSku", {
+				this.$emit('handleClickSku', {
 					skuId: selectedSkuId.skuId,
-          goodsId: this.goodsDetail.goodsId,
+					goodsId: this.goodsDetail.goodsId
 				});
 			} else {
 				uni.showToast({
-          title: "暂无该商品!",
+					title: '暂无该商品!',
 					duration: 2000,
-          icon: "none",
+					icon: 'none'
 				});
 			}
 		},
@@ -260,14 +273,10 @@ export default {
 		 * 直接购买
 		 */
 		buy(data) {
-      API_trade.addToCart(data).then((res) => {
+			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)
-            )}`,
+						url: `/pages/order/fillorder?way=${data.cartType}&addr=${''}&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`
 					});
 				}
 			});
@@ -279,44 +288,42 @@ export default {
 		addToCartOrBuy(val) {
 			if (!this.selectSkuList) {
 				uni.showToast({
-          title: "请选择规格商品",
-          icon: "none",
+					title: '请选择规格商品',
+					icon: 'none'
 				});
 				return;
 			}
 			let data = {
 				skuId: this.goodsDetail.id,
-        num: this.num,
+				num: this.num
 			};

-      if (val == "cart") {
-        API_trade.addToCart(data).then((res) => {
+			if (val == 'cart') {
+				API_trade.addToCart(data).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({
-              title: "商品已添加到购物车",
-              icon: "none",
+							title: '商品已添加到购物车',
+							icon: 'none'
 						});

-            this.$emit("queryCart");
+						this.$emit('queryCart');
 						this.closeMask();
 					}
 				});
 			} else {
 				// 判断是否拼团商品
 				if (this.buyType) {
-          data.cartType = "PINTUAN";
-        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
-          data.cartType = "VIRTUAL";
+					data.cartType = 'PINTUAN';
+				} else if (this.goodsDetail.goodsType == 'VIRTUAL_GOODS') {
+					data.cartType = 'VIRTUAL';
 				} else {
-          data.cartType = "BUY_NOW";
+					data.cartType = 'BUY_NOW';
 				}

-        API_trade.addToCart(data).then((res) => {
+				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))}`,
+							url: `/pages/order/fillorder?way=${data.cartType}&addr=${this.addr.id || ''}&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`
 						});
 					}
 				});
@@ -326,8 +333,8 @@ export default {
 			// 格式化数据
 			let arr = [{}];

-      if(!Array.isArray(list)){
-        return false
+			if (!Array.isArray(list)) {
+				return false;
 			}
 			list.forEach((item, index) => {
 				item.specValues.forEach((spec, specIndex) => {
@@ -335,9 +342,9 @@ export default {
 					let values = {
 						value: spec.specValue,
 						quantity: item.quantity,
-            skuId: item.skuId,
+						skuId: item.skuId
 					};
-          if (name === "images") {
+					if (name === 'images') {
 						return;
 					}

@@ -345,20 +352,20 @@ export default {
 						if (
 							arrItem.name == name &&
 							arrItem.values &&
-              !arrItem.values.find((i) => {
+							!arrItem.values.find(i => {
 								return i.value === values.value;
 							})
 						) {
 							arrItem.values.push(values);
 						}

-            let keys = arr.map((key) => {
+						let keys = arr.map(key => {
 							return key.name;
 						});
 						if (!keys.includes(name)) {
 							arr.push({
 								name: name,
-                values: [values],
+								values: [values]
 							});
 						}
 					});
@@ -368,19 +375,19 @@ export default {
 			arr.shift();
 			this.formatList = arr;

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

 							this.selectName = value.specValue;

 							this.selectSkuList = {
 								spec: value,
-                data: this.goodsDetail,
+								data: this.goodsDetail
 							};
 						});
 				}
@@ -388,16 +395,20 @@ export default {

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

 	mounted() {
 		this.formatSku(this.goodsSpec);
-  },
+	}
 };
 </script>
 <style lang="scss" scoped>
-@import "./popup.scss";
+@import './popup.scss';
+
+.price-row {
+	text-align: center;
+}

 .buy {
 	background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
@@ -419,6 +430,14 @@ export default {
 .goods-skus-number {
 	justify-content: space-between;
 	display: flex;
+
+	> .view-class-title {
+		flex: 8;
+	}
+
+	> .view-class-input {
+		flex: 1;
+	}
 }

 /deep/ .uni-scroll-view {
@@ -465,6 +484,14 @@ export default {
 	}
 }

+.wholesale-item {
+	color: #999 !important;
+	font-size: 24rpx;
+	margin: 0 20rpx;
+	display: flex;
+	justify-content: center;
+}
+
 .goods-header {
 	height: 200rpx;
 	display: flex;
@@ -483,8 +510,14 @@ export default {
 .goods-price {
 	color: $price-color;
 	line-height: 80rpx;
-  display: flex;
+	margin-right: 20rpx;
+
+	> * {
+		color: $price-color;
+		line-height: 80rpx;
+	}
 }
+
 .promotion-box {
 	line-height: 1;
 	display: flex;
@@ -492,22 +525,28 @@ export default {
 	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;
 	}
--- a/components/m-city/m-city.vue
+++ b/components/m-city/m-city.vue
@@ -200,7 +200,7 @@ export default {
            this.tabCurrentIndex++;

            // 当前距离重新为最上面
-            this.scrollTop = 0;
+						this.$set(this,'scrollTop',0)
          }
        } else {
          this.$emit("funcValue", this.tabbars);
--- a/components/m-goods-list/README.md
+++ b/components/m-goods-list/README.md
@@ -0,0 +1,11 @@
+## 商品列表展示
+
+### OBJECT 参数说明
+
+| 属性        | 说明                                                       | 类型    | 必填 |
+| ----------- | ---------------------------------------------------------- | ------- | ---- |
+| `res`       | 显示数据                                                   | Array   | 是   |
+| `type`      | 商品展示类型 oneColumns twoColumns  ，默认展示一行两列商品 | String  | 否   |
+| `storeName` | 是否展示店铺名称，默认展示                                 | Boolean | 否   |
+| `keywords` | 高亮展示搜索内容                                 | String | 否   |
+
--- a/components/m-goods-list/base-list.vue
+++ b/components/m-goods-list/base-list.vue
@@ -0,0 +1,277 @@
+<template>
+  <div>
+    <!-- 一行两列商品展示 -->
+    <view class="goods-list" v-if="type == 'twoColumns'">
+      <view v-for="(item, index) in res" :key="index" class="goods-item">
+        <view class="image-wrapper" @click="navigateToDetailPage(item)">
+          <u-image
+            :src="item.thumbnail"
+            width="100%"
+            height="330rpx"
+           mode="aspectFit"
+          >
+            <u-loading slot="loading"></u-loading>
+          </u-image>
+        </view>
+        <view class="goods-detail">
+          <div
+            class="title clamp"
+            v-html="lightSearchStr(keyword, item.goodsName)"
+            @click="navigateToDetailPage(item)"
+          ></div>
+          <view class="price-box" @click="navigateToDetailPage(item)">
+            <div class="price" v-if="item.price != undefined">
+              ¥<span
+                >{{
+                  $options.filters.goodsFormatPrice(item.price)[0]
+                }} </span
+              >.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
+            </div>
+          </view>
+          <div class="count-config" @click="navigateToDetailPage(item)">
+            <span>已售 {{ item.buyCount || "0" }}</span>
+            <span>{{ item.commentNum || "0" }}条评论</span>
+          </div>
+          <div
+            class="store-seller-name"
+            v-if="storeName"
+            @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.storeName || "暂无" }}</span>
+            </div>
+            <span>
+              <u-icon name="arrow-right"></u-icon>
+            </span>
+          </div>
+        </view>
+      </view>
+    </view>
+	 <!-- 一行一列商品展示 -->
+    <div v-if="type == 'oneColumns'">
+      <div  v-for="(item, index) in res" :key="index" class="goods-row">
+        <div class="flex goods-col">
+          <div class="goods-img" @click="navigateToDetailPage(item)">
+            <u-image
+              width="230rpx"
+              border-radius="16"
+              height="230rpx"
+							mode="aspectFit"
+              :src="item.goodsImage || item.thumbnail"
+            >
+              <u-loading slot="loading"></u-loading>
+            </u-image>
+          </div>
+          <div class="goods-detail">
+            <div class="title clamp3" @click="navigateToDetailPage(item)">
+              {{ item.goodsName }}
+            </div>
+            <view class="price-box" @click="navigateToDetailPage(item)">
+              <div class="price" v-if="item.price != undefined">
+                ¥<span
+                  >{{ $options.filters.goodsFormatPrice(item.price)[0] }} </span
+                >.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
+              </div>
+            </view>
+            <div class="promotion" @click="navigateToDetailPage(item)">
+              <div v-if="item.salesModel == 'WHOLESALE'">
+                <span>批</span>
+              </div>
+              <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
+              style="overflow: hidden"
+              @click="navigateToDetailPage(item)"
+              class="count-config"
+            >
+              <span style="float: left; font-size: 22rpx"
+                >已售 {{ item.buyCount || "0" }}</span
+              >
+              <span style="float: right; font-size: 22rpx"
+                >{{ item.commentNum || "0" }}条评论</span
+              >
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import commonTpl from "@/components/m-goods-list/common";
+export default {
+  data() {
+    return {
+      lightColor: this.$mainColor,
+    };
+  },
+  mixins: [commonTpl],
+  props: {
+	// 展示的类型
+	type:{
+		type:String,
+		default:"oneColumns"
+	},
+    // 遍历的数据
+    res: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  methods: {
+    // 跳转到商品详情
+    navigateToDetailPage(item) {
+      uni.navigateTo({
+        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.goods-list {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 10rpx 20rpx 284rpx;
+  width: 100%;
+
+  > .goods-item {
+    background-color: #ffffff;
+    display: flex;
+    border-radius: 16rpx;
+    flex-direction: column;
+    width: calc(50% - 30rpx);
+    margin-bottom: 20rpx;
+    padding-bottom: 20rpx;
+
+    &:nth-child(2n + 1) {
+      margin-right: 20rpx;
+    }
+
+    .image-wrapper {
+      width: 100%;
+      height: 330rpx;
+      border-radius: 16rpx 16rpx 0 0;
+      overflow: hidden;
+      padding: 0;
+    }
+  }
+
+  .count-config,
+  .store-seller-name {
+    font-size: $font-sm;
+  }
+
+  .text-hidden {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.goods-row {
+  background: #fff;
+  padding: 16rpx;
+
+  > .goods-col {
+    display: flex;
+
+    > .goods-img {
+      overflow: hidden;
+      flex: 4;
+    }
+
+    > .goods-detail {
+      flex: 7;
+    }
+  }
+}
+
+.goods-detail {
+  margin: 0 20rpx;
+
+  > .title {
+    font-size: $font-base;
+    color: $font-color-dark;
+    line-height: 1.5;
+    height: 86rpx;
+    padding: 10rpx 0 0;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+
+  .promotion {
+    margin-top: 4rpx;
+    display: flex;
+
+    div {
+      span {
+        font-size: 24rpx;
+        color: $light-color;
+        margin-right: 10rpx;
+        padding: 0 4rpx;
+        border-radius: 2rpx;
+      }
+    }
+  }
+
+  .store-seller-name {
+    color: #666;
+    overflow: hidden;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .count-config {
+    padding: 5rpx 0;
+    color: #666;
+    display: flex;
+    font-size: 24rpx;
+    justify-content: space-between;
+  }
+
+  > .price-box {
+    margin-top: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-right: 10rpx;
+    font-size: 24rpx;
+    color: $font-color-light;
+
+    > .price {
+      font-size: 26rpx;
+      line-height: 1;
+      color: $main-color;
+      font-weight: bold;
+
+      /deep/ span:nth-of-type(1) {
+        font-size: 38rpx;
+      }
+    }
+  }
+}
+</style>
--- a/components/m-goods-list/common.vue
+++ b/components/m-goods-list/common.vue
@@ -0,0 +1,69 @@
+<template>
+</template>
+
+<script>
+	export default {
+		methods: {
+			// 高亮显示搜索内容	
+			lightSearchStr(keyword, str) {
+				if (!keyword) {
+					return str
+				} else {
+					let unicodes = '';
+					for (let i of Array.from(keyword)) {
+						unicodes += this.unicode(i) + "|"
+					}
+					const rule = '(' + unicodes + ')'
+					const reg = new RegExp(rule, 'gi');
+					return str ? str.replace(reg, matchValue =>
+						`<span style="color:${this.lightColor}">${matchValue}</span>`
+					) : ''
+				}
+			},
+			//  转换为unicode
+			unicode(str) {
+				var value = '';
+				for (var i = 0; i < str.length; i++) {
+					value += '\\u' + this.left_zero_4(parseInt(str.charCodeAt(i)).toString(16));
+				}
+				return value;
+			},
+			left_zero_4(str) {
+				if (str != null && str != '' && str != 'undefined') {
+					if (str.length == 2) {
+						return '00' + str;
+					}
+				}
+				return str;
+			},
+			// 数据去重一下 只显示一次 减免 劵 什么的
+			getPromotion(item) {
+				if (item.promotionMap) {
+					let array = [];
+					Object.keys(item.promotionMap).forEach((child) => {
+						if (!array.includes(child.split("-")[0])) {
+							array.push(child.split("-")[0]);
+						}
+					});
+					return array;
+				}
+			},
+			// 跳转到商品详情
+			navigateToDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+				});
+			},
+			// 跳转地址
+			navigateToStoreDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=${item.storeId}`,
+				});
+			},
+		},
+	}
+</script>
+
+<style lang='scss' scoped>
+	
+</style>
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -0,0 +1,341 @@
+<template>
+	<view>
+		<!-- 一行两列商品展示 -->
+		<view class="goods-list" v-if="type == 'twoColumns'">
+			<view v-for="(item, index) in res" :key="index" class="goods-item">
+				<view class="image-wrapper" @click="navigateToDetailPage(item)">
+					<u-image :src="item.thumbnail" width="100%" height='330rpx' mode="aspectFit">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</view>
+				<view class="goods-detail">
+					<div class="title clamp" v-html="lightSearchStr(keyword,item.goodsName)"
+						@click="navigateToDetailPage(item)">
+
+					</div>
+					<view class="price-box" @click="navigateToDetailPage(item)">
+						<div class="price" v-if="item.price!=undefined">
+							¥<span>{{ $options.filters.goodsFormatPrice(item.price )[0] }} </span>.{{
+	            $options.filters.goodsFormatPrice(item.price )[1]
+	          }}
+						</div>
+					</view>
+					<div class="promotion" @click="navigateToDetailPage(item)">
+						<div v-if="item.salesModel == 'WHOLESALE'">
+							<span>批</span>
+						</div>
+						<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="count-config" @click="navigateToDetailPage(item)">
+						<span>已售 {{ item.buyCount || "0" }}</span>
+						<span>{{ item.commentNum || "0" }}条评论</span>
+					</div>
+					<div class="store-seller-name" v-if="storeName" @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.storeName || "暂无" }}</span>
+						</div>
+						<span>
+							<u-icon name="arrow-right"></u-icon>
+						</span>
+					</div>
+				</view>
+			</view>
+		</view>
+		<!-- 一行一列商品展示 -->
+		<div v-if="type == 'oneColumns'"  class="goods-one-row">
+			<div v-for="(item, index) in res" :key="index" class="goods-row">
+				<div class="flex goods-col">
+					<div class="goods-img" @click="navigateToDetailPage(item)">
+						<u-image width="230rpx" mode="aspectFit" border-radius='16' height="230rpx" :src="item.thumbnail">
+							<u-loading slot="loading"></u-loading>
+						</u-image>
+					</div>
+					<div class="goods-detail">
+						<div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.goodsName }}</div>
+						<view class="price-box" @click="navigateToDetailPage(item)">
+							<div class="price" v-if="item.price!=undefined">
+								¥<span>{{ $options.filters.goodsFormatPrice(item.price )[0] }} </span>.{{
+			            $options.filters.goodsFormatPrice(item.price )[1]
+			          }}
+							</div>
+						</view>
+						<div class="promotion" @click="navigateToDetailPage(item)">
+							<div v-if="item.salesModel == 'WHOLESALE'">
+								<span>批</span>
+							</div>
+							<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 style="overflow: hidden" @click="navigateToDetailPage(item)" class="count-config">
+							<span style="float: left; font-size: 22rpx">已售 {{ item.buyCount || '0' }}</span>
+							<span style="float: right; font-size: 22rpx">{{ item.commentNum || '0' }}条评论</span>
+						</div>
+						<div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
+							<div class="text-hidden" v-if="storeName">
+								<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated"
+									text="自营" type="error" />
+								<span class="line1-store-name">{{ item.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>
+
+			</div>
+		</div>
+
+	</view>
+</template>
+
+<script>
+	import commonTpl from '@/components/m-goods-list/common'
+	export default {
+		data() {
+			return {
+				lightColor: this.$mainColor
+			}
+		},
+		mixins: [commonTpl],
+		
+		props: {
+			// 遍历的数据
+			res: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			// 一行两列还是一行一列显示
+			type: {
+				type: String,
+				default: 'twoColumns',
+				validator() {
+					return ['twoColumns', 'oneColumns']
+				}
+			},
+			storeName: {
+				type: Boolean,
+				default: true
+			},
+			keyword: {
+				type: null,
+				default: ''
+			}
+
+		},
+		watch: {
+			keyword(val) {
+				if (val) {
+					this.lightSearchStr(val)
+				}
+			}
+		},
+		methods: {
+
+			// 高亮显示搜索内容	
+			lightSearchStr(keyword, str) {
+				if (!keyword) {
+					return str
+				} else {
+					let unicodes = '';
+					for (let i of Array.from(keyword)) {
+						unicodes += this.unicode(i) + "|"
+					}
+					const rule = '(' + unicodes + ')'
+					const reg = new RegExp(rule, 'gi');
+					return str ? str.replace(reg, matchValue =>
+						`<span style="color:${this.lightColor}">${matchValue}</span>`
+					) : ''
+				}
+			},
+			//  转换为unicode
+			unicode(str) {
+				var value = '';
+				for (var i = 0; i < str.length; i++) {
+					value += '\\u' + this.left_zero_4(parseInt(str.charCodeAt(i)).toString(16));
+				}
+				return value;
+			},
+			left_zero_4(str) {
+				if (str != null && str != '' && str != 'undefined') {
+					if (str.length == 2) {
+						return '00' + str;
+					}
+				}
+				return str;
+			},
+			// 数据去重一下 只显示一次 减免 劵 什么的
+			getPromotion(item) {
+				if (item ? item.promotionMap : item.promotionMap) {
+					const fieldList = item ? item.promotionMap : item.promotionMap
+					let array = [];
+					Object.keys(fieldList).forEach((child) => {
+						if (!array.includes(child.split("-")[0])) {
+							array.push(child.split("-")[0]);
+						}
+					});
+					return array;
+				}
+			},
+			// 跳转到商品详情
+			navigateToDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+				});
+			},
+			// 跳转地址
+			navigateToStoreDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=${item.storeId}`,
+				});
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+		.goods-one-row{
+			padding-bottom: 250rpx;
+		}
+		/* 商品列表 */
+		.goods-list {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 10rpx 20rpx 284rpx;
+			width: 100%;
+	
+			>.goods-item {
+				background-color: #ffffff;
+				display: flex;
+				border-radius: 16rpx;
+				flex-direction: column;
+				width: calc(50% - 30rpx);
+				margin-bottom: 20rpx;
+				padding-bottom: 20rpx;
+	
+				&:nth-child(2n + 1) {
+					margin-right: 20rpx;
+				}
+	
+	
+				.image-wrapper {
+					width: 100%;
+					height: 330rpx;
+					border-radius: 16rpx 16rpx 0 0;
+					overflow: hidden;
+					padding: 0;
+				}
+			}
+	
+			.count-config,
+			.store-seller-name {
+				font-size: $font-sm;
+			}
+	
+			.text-hidden {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	
+	
+		.goods-row {
+			background: #fff;
+			padding: 16rpx;
+	
+			>.goods-col {
+				display: flex;
+	
+				>.goods-img {
+					overflow: hidden;
+					flex: 4;
+				}
+	
+				>.goods-detail {
+					flex: 7;
+				}
+			}
+		}
+	
+		.goods-detail {
+			margin: 0 20rpx;
+	
+			>.title {
+				font-size: $font-base;
+				color: $font-color-dark;
+				line-height: 1.5;
+				height: 86rpx;
+				padding: 10rpx 0 0;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+	
+			.promotion {
+				margin-top: 4rpx;
+				display: flex;
+	
+				div {
+					span {
+						font-size: 24rpx;
+						color: $light-color;
+						margin-right: 10rpx;
+						padding: 0 4rpx;
+						border-radius: 2rpx;
+					}
+				}
+			}
+	
+			.store-seller-name {
+				color: #666;
+				overflow: hidden;
+				display: flex;
+				justify-content: space-between;
+			}
+	
+			.count-config {
+				padding: 5rpx 0;
+				color: #666;
+				display: flex;
+				font-size: 24rpx;
+				justify-content: space-between;
+			}
+	
+			>.price-box {
+				margin-top: 10rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding-right: 10rpx;
+				font-size: 24rpx;
+				color: $font-color-light;
+	
+				>.price {
+					font-size: 26rpx;
+					line-height: 1;
+					color: $main-color;
+					font-weight: bold;
+	
+					/deep/ span:nth-of-type(1) {
+						font-size: 38rpx;
+					}
+				}
+			}
+	
+		}
+</style>
--- a/components/m-goods-list/promotion.vue
+++ b/components/m-goods-list/promotion.vue
@@ -0,0 +1,170 @@
+<template>
+	<div>
+		<div v-for="(item, index) in res" :key="index" class="goods-row" @click="navigateToDetailPage(item)">
+			<div class="flex goods-col">
+				<div class="goods-img">
+					<u-image width="230rpx" mode="aspectFit" border-radius='16' height="230rpx" :src="item.goodsImage || item.thumbnail">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</div>
+				<div class="goods-detail">
+					<div class="title clamp3">{{ item.goodsName }}</div>
+					<div class='flex flex-a-c flex-j-sb'>
+						<view class="price-box">
+							<!-- 秒杀 / 拼团 -->
+							<div class="price" v-if="!type && item.price!=undefined">
+								¥<span>{{ $options.filters.goodsFormatPrice(item.price )[0] }} </span>.{{
+										$options.filters.goodsFormatPrice(item.price )[1]
+									}}
+							</div>
+							<!-- 砍价 -->
+							<div class="price" v-if="type && item.purchasePrice!=undefined">
+								最低：
+								¥<span>{{ $options.filters.goodsFormatPrice(item.purchasePrice )[0] }} </span>.{{
+										$options.filters.goodsFormatPrice(item.purchasePrice )[1]
+									}}
+							</div>
+							<!-- 兜底策略如果金额是0 -->
+							<div class="price" v-if="!item.price">
+								¥<span>0 </span>.00
+							</div>
+						</view>
+						<div>
+							<image class='buy' :src="buy"></image>
+						</div>
+					</div>
+					<div class='count-config' v-if="!type">
+						<span>即将恢复{{ item.originalPrice}}元</span>
+					</div>
+				</div>
+			</div>
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import commonTpl from '@/components/m-goods-list/common'
+	export default {
+		data() {
+			return {
+				lightColor: this.$mainColor,
+				buy: require('@/static/buy.png')
+			}
+		},
+		mixins: [commonTpl],
+		props: {
+			// 遍历的数据
+			res: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			type:{
+				type:null,
+				default:""
+			}
+		},
+		methods: {
+			// 跳转到商品详情
+			navigateToDetailPage(item) {
+				if(this.type == 'kanJia'){
+					 uni.navigateTo({
+						url: `/pages/promotion/bargain/detail?id=${item.id}`,
+					});
+					return
+				}
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${item.skuId}&goodsId=${item.goodsId}`,
+				});
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	.buy {
+		width: 152rpx;
+		height: 108rpx;
+	}
+	.flex-j-sb {
+		width: 100%;
+	}
+	.goods-row {
+		background: #fff;
+		padding: 16rpx;
+		>.goods-col {
+			display: flex;
+			>.goods-img {
+				overflow: hidden;
+				flex: 4;
+			}
+			>.goods-detail {
+				flex: 7;
+			}
+		}
+	}
+	.goods-detail {
+		margin: 0 20rpx;
+		>.title {
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 1.5;
+			height: 86rpx;
+			padding: 10rpx 0 0;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+		}
+
+		.promotion {
+			margin-top: 4rpx;
+			display: flex;
+
+			div {
+				span {
+					font-size: 24rpx;
+					color: $light-color;
+					margin-right: 10rpx;
+					padding: 0 4rpx;
+					border-radius: 2rpx;
+				}
+			}
+		}
+
+		.count-config {
+			padding: 5rpx 0;
+			color: #666;
+			display: flex;
+			font-size: 24rpx;
+			letter-spacing:2rpx;
+			padding-left: 10rpx;
+		}
+
+
+
+	}
+
+	.price-box {
+		margin-top: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10rpx;
+		font-size: 24rpx;
+		color: $font-color-light;
+
+		>.price {
+			font-size: 26rpx;
+			line-height: 1;
+			color: $main-color;
+			font-weight: bold;
+
+			/deep/ span:nth-of-type(1) {
+				font-size: 48rpx;
+			}
+		}
+	}
+</style>
--- a/components/m-goods-recommend/index.vue
+++ b/components/m-goods-recommend/index.vue
@@ -1,27 +1,11 @@
 <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>
+		 <goodsTemplate :res='goodsList' />
  </div>
 </template>
-
 <script>
+	import goodsTemplate from '@/components/m-goods-list/list'
 import { getGoodsList } from "@/api/goods.js";
 export default {
  data() {
@@ -50,6 +34,7 @@ export default {
      default: "",
    },
  },
+	components:{goodsTemplate},
  mounted() {
    this.initGoods();
  },
@@ -74,11 +59,11 @@ export default {
        }
      });
      let goodsList = await getGoodsList(submit);
-      this.goodsList.push(...goodsList.data.result.content);
+      this.goodsList.push(...goodsList.data.result.records);
    },
    handleClick(item) {
      uni.navigateTo({
-        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
      });
    },
  },
--- a/components/m-share/index.vue
+++ b/components/m-share/index.vue
@@ -8,7 +8,7 @@
    <view class="share-list">
      <!-- #ifdef MP-WEIXIN -->
      <view class="share-item">
-        <button class="share-btn" open-type="share">
+        <button class="share-btn" @click="weChatShare" open-type="share">
          <u-icon color="#04BE02" size="80" name="weixin-fill"></u-icon>微信好友
        </button>
      </view>
@@ -62,6 +62,16 @@ export default {
    close() {
      this.$emit("close");
    },
+    weChatShare(){
+      this.$u.mpShare = {
+        title:  this.shareTitle(), // 默认为小程序名称，可自定义
+        path: '', // 默认为当前页面路径，一般无需修改，QQ小程序不支持
+        // 分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径。
+        // 支持PNG及JPG，默认为当前页面的截图
+        imageUrl: this.thumbnail ||''
+      }
+    },
+
    // h5复制链接
    // #ifdef H5
    copyLink() {
@@ -73,33 +83,20 @@ export default {
          this.configs.shareLink +
          getCurrentPages()[getCurrentPages().length - 1].__page__.fullPath;
      }
-      if (content === null || content === undefined) {
-        content = "";
-      } else content = content + "";
-      const result = h5Copy(content);
-      if (result === false) {
-        uni.showToast({
-          title: "不支持",
-        });
-      } else {
-        uni.showToast({
-          title: "复制成功",
-          icon: "none",
-        });
-      }
+      this.$options.filters.setClipboard(content)
    },
    // #endif

    shareTitle() {
      let shareTitle;
      if (this.type == "goods") {
-        shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
+        shareTitle = `[好友推荐]${this.goodsName}快来跟我一起看看吧`;
      } else if (this.type == "shops") {
-        shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
+        shareTitle = `[好友发现]${this.goodsName}快来跟我一起看看吧`;
      } else if (this.type == "pintuan") {
-        shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
+        shareTitle = `[好友邀请]${this.goodsName}快来跟我一起抢购吧!`;
      } else if (this.type == "kanjia") {
-        shareTitle = `请快来帮我砍一刀${this.goodsName}`;
+        shareTitle = `[好友邀请]请快来帮我砍一刀${this.goodsName}`;
      }
      return shareTitle;
    },
--- a/components/m-take-down-sale-goods/index.vue
+++ b/components/m-take-down-sale-goods/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <u-popup v-model="show" mode="bottom" height="800rpx" border-radius="14">
+      <div class="wrapper">
+        <view class="down-goods-tips">该商品已下架</view>
+        <scroll-view scroll-y="true" style="height: 670rpx">
+          <goodsRecommend title="其他商品" />
+        </scroll-view>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+import goodsRecommend from "@/components/m-goods-recommend/index.vue";
+
+export default {
+  data() {
+    return {
+      show: true, // 是否显示
+    };
+  },
+  components: { goodsRecommend },
+};
+</script>
+
+<style lang="scss" scoped>
+.down-goods-tips {
+  font-size: 36rpx;
+  text-align: center;
+  font-weight: bold;
+  padding: 40rpx 0;
+}
+</style>
--- a/components/uni-number-box.vue
+++ b/components/uni-number-box.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }" :style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
+			v-model="inputValue" :style="{background, color}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }" :style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+	 */
+
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			modelValue(val) {
+				this.inputValue = +val;
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = +this.modelValue;
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = +this.value;
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value -= step;
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value += step;
+					if (value > (this.max * scale)) {
+						return;
+					}
+					if (value < (this.min * scale)) {
+						value = this.min * scale
+					}
+				}
+
+				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				// TODO vue2 兼容
+				this.$emit("input", +this.inputValue);
+				// TODO vue3 兼容
+				this.$emit("update:modelValue", +this.inputValue);
+			},
+			_getDecimalScale() {
+
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, String(this.step).split(".")[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				this.$emit('blur', event)
+				let value = event.detail.value;
+				if (!value) {
+					// this.inputValue = 0;
+					return;
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min;
+				}
+				const scale = this._getDecimalScale();
+				this.inputValue = value.toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				this.$emit("input", +this.inputValue);
+			},
+			_onFocus(event) {
+				this.$emit('focus', event)
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	$box-height: 48rpx;
+	$bg: #f5f5f5;
+	$br: 4rpx;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 4rpx;
+		background-color: $bg;
+		width: 70rpx;
+		height: $box-height;
+		text-align: center;
+		font-size: 24rpx;
+		border-left-width: 0;
+		border-right-width: 0;
+		color: $color;
+	}
+
+	.uni-numbox__minus {
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
+	}
+
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 40rpx;
+
+		font-size: 40rpx;
+		font-weight: 300;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
--- a/pages/mine/address/uniMap.vue
+++ b/pages/mine/address/uniMap.vue
@@ -29,7 +29,8 @@ export default {
            });
          });
        },
-        fail() {
+        fail(e) {
+          console.log(e)
          that.$emit("close");
        },
      });
--- a/components/verification/verification.vue
+++ b/components/verification/verification.vue
@@ -96,7 +96,7 @@
            name="close"
          ></u-icon>

-          <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
+          <text class="cu-tag round" @click="getCode">刷新拼图</text>
          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1"
            >Lili-FRAMEWORK</text
          >
--- a/config/api.js
+++ b/config/api.js
@@ -4,15 +4,16 @@
 */
 // 开发环境
 const dev = {
-  // common: "https://common-api.pickmall.cn",
-  // buyer: "https://buyer-api.pickmall.cn",
-  
-        common: "http://192.168.111:8890",
-        buyer: "http://192.168.111:8888",
-
+  im: "https://im-api.pickmall.cn",
+  common: "https://common-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
+  // common: "http://192.168.0.113:8890",
+  // buyer: "http://192.168.0.113:8888",
+  // im: "http://192.168.0.113:8885",
 };
 // 生产环境
 const prod = {
+  im: "https://im-api.pickmall.cn",
  common: "https://common-api.pickmall.cn",
  buyer: "https://buyer-api.pickmall.cn",
 };
@@ -32,6 +33,7 @@ api = prod;

 api.buyer += "/buyer";
 api.common += "/common";
+api.im += "/im";
 export default {
  ...api,
 };
--- a/config/config.js
+++ b/config/config.js
@@ -1,16 +1,27 @@
 const name = "lilishop"; //全局商城name
-const schemeName = 'lilishop' //唤醒app需要的schemeName
+const schemeName = "lilishop"; //唤醒app需要的schemeName
 export default {
  name: name,
  schemeLink: `${schemeName}://`, //唤起app地址
  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
  appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
-  appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看
-  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地址
-  customerServiceMobile:"13161366885", //客服电话
-  customerServiceEmail:"lili@lili.com" //客服邮箱 
+  aMapKey: "1f78544934b66c9fbc0104117f663973", //在高德中申请Web服务key
+  scanAuthNavigation: ["https://m-b2b2c.pickmall.cn/"], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  iosAppId: "id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
+  logo: "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
+  customerServiceMobile: "13161366885", //客服电话
+  customerServiceEmail: "lili@lili.com", //客服邮箱
+  imWebSrc: "https://im.pickmall.cn", //IM地址
+  baseWsUrl: "wss://im-api.pickmall.cn/lili/webSocket", // IM WS 地址
+  enableGetClipboard: false, //是否启用粘贴板获取 scanAuthNavigation 中的链接，如果匹配则会跳转到对应页面
+  enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app
+  /**
+   * 如需更换主题请修改此处以及uni.scss中的全局颜色
+   */
+  mainColor: "#ff3c2a", // 主题色
+  lightColor: "#ff6b35", // 高亮主题色
+  aiderLightColor: "#ff9f28", // 辅助高亮颜色
+  defaultUserPhoto: "/static/missing-face.png", // 默认用户头像
+  enableFetchMobileLogin: false // 是否启用获取手机号登录 如果微信小程序提示封禁手机号获取权限 可将此选项设置成false作为备用登录方案
 };
--- a/js_sdk/t-jwt/jwt.js
+++ b/js_sdk/t-jwt/jwt.js
@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+exports.weBtoa = function (string) {
+    string = String(string);
+    var bitmap, a, b, c, result = "", i = 0, rest = string.length % 3;
+    for (; i < string.length;) {
+        if ((a = string.charCodeAt(i++)) > 255 ||
+            (b = string.charCodeAt(i++)) > 255 ||
+            (c = string.charCodeAt(i++)) > 255)
+            throw new TypeError("Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range.");
+        bitmap = (a << 16) | (b << 8) | c;
+        result += b64.charAt(bitmap >> 18 & 63) + b64.charAt(bitmap >> 12 & 63) +
+            b64.charAt(bitmap >> 6 & 63) + b64.charAt(bitmap & 63);
+    }
+    return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
+};
+exports.weAtob = function (string) {
+    string = String(string).replace(/[\t\n\f\r ]+/g, "");
+    if (!b64re.test(string))
+        throw new TypeError("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
+    string += "==".slice(2 - (string.length & 3));
+    var bitmap, result = "", r1, r2, i = 0;
+    for (; i < string.length;) {
+        bitmap = b64.indexOf(string.charAt(i++)) << 18 | b64.indexOf(string.charAt(i++)) << 12 |
+            (r1 = b64.indexOf(string.charAt(i++))) << 6 | (r2 = b64.indexOf(string.charAt(i++)));
+        result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255) :
+            r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255) :
+                String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
+    }
+    return result;
+};
+function b64DecodeUnicode(str) {
+    return decodeURIComponent(exports.weAtob(str).replace(/(.)/g, function (p) {
+        var code = p.charCodeAt(0).toString(16).toUpperCase();
+        if (code.length < 2) {
+            code = "0" + code;
+        }
+        return "%" + code;
+    }));
+}
+function base64_url_decode(str) {
+    var output = str.replace(/-/g, "+").replace(/_/g, "/");
+    switch (output.length % 4) {
+        case 0:
+            break;
+        case 2:
+            output += "==";
+            break;
+        case 3:
+            output += "=";
+            break;
+        default:
+            throw "Illegal base64url string!";
+    }
+    try {
+        return b64DecodeUnicode(output);
+    }
+    catch (err) {
+        return exports.weAtob(output);
+    }
+}
+function weappJwtDecode(token, options) {
+    if (typeof token !== "string") {
+        throw ("Invalid token specified");
+    }
+    options = options || {};
+    var pos = options.header === true ? 0 : 1;
+    try {
+        return JSON.parse(base64_url_decode(token.split(".")[pos]));
+    }
+    catch (e) {
+        throw ("Invalid token specified: " + e.message);
+    }
+}
+exports.default = weappJwtDecode;
--- a/main.js
+++ b/main.js
@@ -3,19 +3,24 @@ import App from "./App";
 import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
 import store from "./store";
-
-
+import config from '@/config/config';
+import airBtn from "@/components/m-airbtn/index.vue";
+import socketIO from './pages/mine/im/socket';
 /**
 * 仅在h5中显示唤醒app功能
 * 在h5页面手动挂载
 * 
 */
 // #ifdef H5
-import airBtn from "@/components/m-airbtn/index.vue";
-let btn = Vue.component("airBtn", airBtn); //全局注册
-document.body.appendChild(new btn().$mount().$el);
+if (config.enableMiniBarStartUpApp) {
+  let btn = Vue.component("airBtn", airBtn); //全局注册
+  document.body.appendChild(new btn().$mount().$el);
+}
 // #endif

+// 引入uView对小程序分享的mixin封装
+let mpShare = require('uview-ui/libs/mixin/mpShare.js');
+Vue.mixin(mpShare)

 /**
 * 全局filters
@@ -27,6 +32,7 @@ Object.keys(filters).forEach((key) => {

 // 引入Vuex
 Vue.prototype.$store = store;
+// Vue.prototype.socketIo = new socketIO();
 Vue.use(uView);
 Vue.config.productionTip = false;

@@ -38,11 +44,11 @@ Vue.config.productionTip = false;
 * 如需更换主题请修改此处以及uni.scss中的全局颜色
 */
 // 主题色
-Vue.prototype.$mainColor = "#ff3c2a";
+Vue.prototype.$mainColor = config.mainColor;
 // 高亮主题色
-Vue.prototype.$lightColor = "#ff6b35";
+Vue.prototype.$lightColor = config.lightColor;
 // 辅助高亮颜色
-Vue.prototype.$aiderLightColor = "#ff9f28";
+Vue.prototype.$aiderLightColor = config.aiderLightColor;


 App.mpType = "app";
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
 {
-    "name" : "lili商城",
-    "appid" : "__UNI__C100675",
+    "name" : "lilishop",
+    "appid" : "__UNI__ED807EA",
    "description" : "",
-    "versionName" : "4.0.49",
-    "versionCode" : 4000049,
+    "versionName" : "4.5.3",
+    "versionCode" : 4000503,
    "transformPx" : false,
    "app-plus" : {
        "compatible" : {
@@ -63,8 +63,19 @@
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                ],
                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "schemes" : "lilishop"
+                "schemes" : "lilishop",
+                //安卓自添加 权限  应用市场 过度索取权限
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
                },
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"
+                },
+                "autoSdkPermissions" : false
+            },
+            //安卓自添加 权限  应用市场 过度索取权限
            "ios" : {
                "idfa" : false,
                "privacyDescription" : {
@@ -75,7 +86,8 @@
                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
                    "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                },
-                "urltypes" : "lilishop"
+                "urltypes" : "lilishop",
+                "dSYMs" : false
            },
            /* ios打包配置 */
            "sdkConfigs" : {
@@ -104,7 +116,7 @@
                    },
                    "apple" : {},
                    "qq" : {
-                        "appid" : "101918503"
+                        "appid" : "101918501"
                    }
                },
                "geolocation" : {
@@ -195,15 +207,12 @@
            }
        },
        "plugins" : {
-            "myPlugin" : {
-                "version" : "1.1.0",
-                "provider" : "wx738958e0f4c894f9"
-            },
            "live-player-plugin" : {
                "version" : "1.3.0",
                "provider" : "wx2b03c6e691cd7370"
            }
-        }
+        },
+        "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ]
    },
    "h5" : {
        "devServer" : {
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,24 @@
 				"enablePullDownRefresh":true  
 			}
 		}, 
-		
+		{
+			"path":"pages/tabbar/screen/fullScreen",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus":{
+					"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+					"background": "transparent", // 背景透明
+					"backgroundColor": "rgba(0,0,0,0)", // 背景透明
+					"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+				}
+			}
+		},
+		{
+			"path": "pages/tabbar/home/title",
+			"style": {
+				"navigationBarTitleText": "消息"
+			}
+		},
 		{
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
@@ -68,6 +85,12 @@
 			"style": {
 				
 			}
+		},
+				{
+					"path": "pages/tabbar/special/special",
+					"style": {
+							"navigationBarTitleText": "专题"
+					}
 		}

 	],
@@ -202,6 +225,13 @@
 						"navigationBarTitleText": "地址管理"
 					}
 				},
+				{
+					"path": "address/storeAddress",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "自提点"
+					}
+				},
 				{
 					"path": "address/add",
 					"style": {
@@ -233,6 +263,8 @@
 						"navigationBarTitleText": "面容登录"
 					}
 				},
+				
+				
 				{
 					"path": "set/securityCenter/editPassword",
 					"style": {
@@ -243,7 +275,26 @@
 					}
 				},

+				{
+					"path": "im/list",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"enablePullDownRefresh": true,
+						"app-plus": {
+						}
 						
+					}
+				},
+				{
+					"path": "im/index",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"enablePullDownRefresh": true,
+						"app-plus": {
+						}
+						
+					}
+				},
 				{
 					"path": "set/feedBack",
 					"style": {
@@ -402,6 +453,7 @@
 						}
 					}
 				}
+
 			]

 		},
@@ -431,6 +483,21 @@
 						}
 					}
 				},
+				
+				{
+					"path": "entry/seller/index",
+					"style": {
+						"navigationBarTitleText": "店铺入驻",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "entry/seller/control",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "article",
 					"style": {
@@ -444,6 +511,14 @@
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "scannerCodeLoginConfirm",
+					"style": {
+						"navigationBarTitleText": "扫码登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]

@@ -455,6 +530,8 @@
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -468,6 +545,7 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="coupon-center">
-    <swiper class="swiper-box">
-      <swiper-item class="swiper-item">
-        <scroll-view class="scroll-v" enableBackToTop="true" scroll-y @scrolltolower="loadMore">
-          <u-empty mode="coupon" text="没有优惠券了" v-if="whetherEmpty"></u-empty>
+		<div class="swiper-box">
+			<div class="swiper-item">
+				<div class="scroll-v" enableBackToTop="true" scroll-y>
+					<u-empty mode="coupon" style='margin-top: 20%;' text="没有优惠券了" v-if="whetherEmpty"></u-empty>
 					<view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
 						<view class="left">
 							<view class="wave-line">
@@ -23,10 +23,11 @@
 						<view class="right">
 							<view>
 								<!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
-                <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 class="coupon-title wes-3" v-if="item.scopeType">
+									<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
+									<span v-if="item.scopeType == 'PORTION_GOODS_CATEGORY'">仅限品类</span>
+									<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
+									</view>
 								</view>
 								<view v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
 							</view>
@@ -37,17 +38,21 @@
 							<view class="bg-quan"> 券 </view>
 						</view>
 					</view>
-          <uni-load-more :status="loadStatus"></uni-load-more>
-        </scroll-view>
-      </swiper-item>
-    </swiper>
+
+				</div>
+			</div>
+		</div>
 	</view>
 </template>

 <script>
-import { receiveCoupons } from "@/api/members.js";
-import { getAllCoupons } from "@/api/promotions.js";
-export default {
+	import {
+		receiveCoupons
+	} from "@/api/members.js";
+	import {
+		getAllCoupons
+	} from "@/api/promotions.js";
+	export default {
 		data() {
 			return {
 				loadStatus: "more", //下拉状态
@@ -57,13 +62,18 @@ export default {
 					pageNumber: 1,
 					pageSize: 10,
 				},
-      storeId: "", //店铺 id
+				storeId: "", //店铺 id,
+				couponData: ""
 			};
 		},
 		onLoad(option) {
 			this.storeId = option.storeId;
 			this.getCoupon();
 		},
+		onReachBottom() {
+
+			this.loadMore()
+		},
 		onPullDownRefresh() {
 			//下拉刷新
 			this.params.pageNumber = 1;
@@ -78,34 +88,46 @@ export default {
 				uni.showLoading({
 					title: "加载中",
 				});
-      let submitData = { ...this.params };
+				let submitData = {
+					...this.params
+				};
 				// 判断当前是否有店铺
-      this.storeId ? (submitData = { ...this.params, storeId: this.storeId }): "",
+				this.storeId ? (submitData = {
+						...this.params,
+						storeId: this.storeId
+					}) : "",
 					getAllCoupons(submitData)
 					.then((res) => {
-            uni.hideLoading();
+						if (this.$store.state.isShowToast){ uni.hideLoading() };
 						uni.stopPullDownRefresh();
 						if (res.data.code == 200) {
 							// 如果请求成功，展示数据并进行展示
-              let data = res.data.result;
-              if (data.total == 0) {
+							this.couponData = res.data.result
+							if (this.couponData.total == 0) {
 								// 当本次请求数据为空展示空信息
 								this.whetherEmpty = true;
 							} else {
-                this.couponList.push(...data.records);
+								this.couponList.push(...this.couponData.records);
 								this.loadStatus = "noMore";
 							}
 						}
 					})
 					.catch((err) => {
-            uni.hideLoading();
+						 if (this.$store.state.isShowToast){ uni.hideLoading() };
 					});
 			},
 			/**
 			 * 领取优惠券
 			 */
-    receive(item) {
-      receiveCoupons(item.id).then((res) => {
+			receive(val) {
+				this.$u.throttle(()=>{
+					this.fetchCoupon(val)
+				}, 1500)
+				
+			},
+
+			fetchCoupon(val){
+				receiveCoupons(val.id).then((res) => {
 					if (res.data.code == 200) {
 						uni.showToast({
 							title: "领取成功",
@@ -119,13 +141,14 @@ export default {
 					}
 				});
 			},
+
 			/**
 			 * 加载更多
 			 */
 			loadMore() {
-      if (this.loadStatus != "noMore") {
+				if (this.couponData.total > this.params.pageNumber * this.params.pageSize) {
 					this.params.pageNumber++;
-        this.getAllCoupons();
+					this.getCoupon();
 				}
 			},
 		},
@@ -134,52 +157,18 @@ export default {
 				url: "/pages/cart/coupon/couponIntro",
 			});
 		},
-};
+	};
 </script>
 <style>
-page {
+	page {
 		height: 100%;
-}
+	}
 </style>
 <style lang="scss" scoped>
-.coupon-center {
+	.coupon-center {
 		height: 100%;

-  .couponList-scroll-content {
-    position: relative;
-    width: 100%;
-    display: flex;
-    white-space: nowrap;
-    align-items: center;
-    justify-content: space-between;
-    align-items: center;
-    background-color: $main-color;
-    color: #ffffff;
-
-    .tab-item {
-      width: 160rpx;
-      height: 80rpx;
-      line-height: 60rpx;
-      text-align: center;
-      display: inline-block;
-    }
-
-    .active {
-      border-bottom: 2px solid #ffffff;
-      broder-width: 60rpx;
-      font-size: 30rpx;
-      font-weight: 700;
-      padding-bottom: 4rpx;
-    }
-  }
-
 		.swiper-box {
-    height: 100%;
-
-    .scroll-v {
-      height: 100%;
-    }
-
 			.coupon-item {
 				display: flex;
 				align-items: center;
@@ -191,6 +180,7 @@ page {
 					width: 260rpx;
 					background-color: $light-color;
 					position: relative;
+
 					.message {
 						color: $font-color-white;
 						display: flex;
@@ -226,6 +216,7 @@ page {
 							margin-top: 4rpx;
 						}
 					}
+
 					.circle {
 						width: 40rpx;
 						height: 40rpx;
@@ -234,10 +225,12 @@ page {
 						border-radius: 50%;
 						z-index: 111;
 					}
+
 					.circle-top {
 						top: -20rpx;
 						right: -20rpx;
 					}
+
 					.circle-bottom {
 						bottom: -20rpx;
 						right: -20rpx;
@@ -254,11 +247,16 @@ page {
 					background-color: #ffffff;
 					overflow: hidden;
 					position: relative;
-        > view:nth-child(1) {
+
+					>view:nth-child(1) {
 						color: #666666;
 						margin-left: 20rpx;
-          line-height: 3em;
-          > view:nth-child(1) {
+						display: flex;
+						height: 100%;
+						flex-direction: column;
+						justify-content: space-around;
+
+						>view:nth-child(1) {
 							color: #ff6262;
 							font-size: 30rpx;
 						}
@@ -295,5 +293,10 @@ page {
 				}
 			}
 		}
-}
+	}
+
+	.coupon-title {
+		width: 260rpx;
+
+	}
 </style>
--- a/pages/cart/coupon/couponDetail.vue
+++ b/pages/cart/coupon/couponDetail.vue
@@ -3,7 +3,8 @@
    <view class="body">
      <view class="top-view">
        <view class="title">{{coupon.title}}</view>
-        <view class="price"><text>￥</text>{{coupon.price | unitPrice}}</view>
+        <view class="price" v-if="coupon.couponType =='PRICE'"><text>￥</text>{{coupon.price | unitPrice}}</view>
+        <view class="price" v-if="coupon.couponType =='DISCOUNT'">{{coupon.discount}}折</view>
        <view class="text">满{{coupon.consumeThreshold}}元可用</view>
        <view class="bg-quan">
          券
@@ -13,8 +14,8 @@
        </view>
      </view>
      <view class="bottom-view">
-        <view class="text">• 使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+        <view class="text">• 使用范围：{{
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                      ? "全平台"
                      : coupon.scopeType == "PORTION_CATEGORY"
                      ? "仅限品类"
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -34,8 +34,8 @@
      <view class="right">
        <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>
+            <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
+            <span v-if="item.scopeType == 'PORTION_GOODS_CATEGORY'">仅限品类</span>
            <view v-else
              >{{
                item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -2,28 +2,63 @@
  <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>
+        }}</text></view
+      >
    </view>
-    <swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-      <swiper-item class="tab-content" v-for="(navItem, navIndex) in navList" :key="navIndex">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+    <swiper
+      :current="tabCurrentIndex"
+      class="swiper-box"
+      duration="300"
+      @change="changeTab"
+    >
+      <swiper-item
+        class="tab-content"
+        v-for="(navItem, navIndex) in navList"
+        :key="navIndex"
+      >
+        <scroll-view
+          class="list-scroll-content"
+          scroll-y
+          @scrolltolower="loadData"
+        >
          <!-- 空白页 -->
-          <u-empty mode="coupon" text="暂无优惠券了" v-if="navItem.wheterEmpty"></u-empty>
+          <u-empty
+            mode="coupon"
+            text="暂无优惠券了"
+            v-if="navItem.whetherEmpty"
+          ></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>
+                <view
+                  class="wave"
+                  v-for="(item, index) in 12"
+                  :key="index"
+                ></view>
              </view>
              <view class="message">
-                <view class="price" v-if="coupon.couponType == 'DISCOUNT'">{{ coupon.discount }}折</view>
+                <view class="price" v-if="coupon.couponType == 'DISCOUNT'"
+                  >{{ coupon.discount }}折</view
+                >
                <view class="price" v-else>{{ coupon.price }}元</view>
-                <view class="sub-price">满{{ coupon.consumeThreshold | unitPrice }}可用</view>
+                <view class="sub-price"
+                  >满{{ coupon.consumeThreshold | unitPrice }}可用</view
+                >
              </view>
              <view class="circle circle-top"></view>
              <view class="circle circle-bottom"></view>
@@ -31,27 +66,47 @@
            <view class="right" v-if="coupon">
              <view class="content">
                <view class="title-1">{{ coupon.title }}</view>
-                <view class="title-2">使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                <view class="title-2"
+                  >使用范围：{{
+                    coupon.scopeType == "ALL" && coupon.storeId == "0"
                      ? "全平台"
                      : coupon.scopeType == "PORTION_CATEGORY"
                      ? "仅限品类"
-                      : coupon.storeName == 'platform' ? '全平台' :coupon.storeName+''
-                  }}使用</view>
-                <view v-if="coupon.endTime">{{
-                  coupon.endTime
-                  }}</view>
-                <view @click="couponDetail(coupon)">详细说明
-                  <u-icon style="float: right; margin-top: 10rpx" name="arrow-right"></u-icon>
+                      : coupon.storeName == "platform"
+                      ? "全平台"
+                      : coupon.storeName + ""
+                  }}使用</view
+                >
+                <view v-if="coupon.endTime">{{ coupon.endTime }}</view>
+                <view @click="couponDetail(coupon)"
+                  >详细说明
+                  <u-icon
+                    style="float: right; margin-top: 10rpx"
+                    name="arrow-right"
+                  ></u-icon>
                </view>
              </view>
              <view class="jiao-1" v-if="navIndex == 0">
                <text class="text-1">新到</text>
-                <text class="text-2" v-if="coupon.used_status == 1">将过期</text>
+                <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="@/static/img/overdue.png"></image>
-              <view class="receive" v-if="navIndex == 0" @click="useItNow(coupon)">
+              <image
+                class="no-icon"
+                v-if="navIndex == 1"
+                src="@/static/img/used.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>
              </view>
@@ -84,7 +139,7 @@ export default {
            pageSize: 10,
            status: 1,
          },
-          wheterEmpty: false,
+          whetherEmpty: false,
        },
        {
          text: "已使用",
@@ -96,7 +151,7 @@ export default {
            pageSize: 10,
            status: 2,
          },
-          wheterEmpty: false,
+          whetherEmpty: false,
        },
        {
          text: "已过期",
@@ -108,7 +163,7 @@ export default {
            pageSize: 10,
            status: 3,
          },
-          wheterEmpty: false,
+          whetherEmpty: false,
        },
      ],
      couponList: [], //优惠券列表
@@ -116,7 +171,7 @@ export default {
  },

  onShow() {
-    this.navList[this.tabCurrentIndex].params.pageNumber = 1
+    this.navList[this.tabCurrentIndex].params.pageNumber = 1;
    this.navList[this.tabCurrentIndex].dataList = [];
    this.getData();
  },
@@ -151,7 +206,7 @@ export default {
          let data = res.data.result.records;
          if (data.length == 0) {
            if (res.data.pageNumber == 1) {
-              this.navList[index].wheterEmpty = true;
+              this.navList[index].whetherEmpty = true;
            } else {
              this.navList[index].loadStatus = "noMore";
            }
@@ -162,7 +217,7 @@ export default {
            this.navList[index].dataList.push(...data);
          }
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },

@@ -188,15 +243,9 @@ export default {
     * 立即使用优惠券
     */
    useItNow(item) {
-      if (item.storeId && item.storeId!='platform') {
      uni.navigateTo({
-          url: `/pages/product/shopPage?id=${item.storeId}`,
+        url: `/pages/navigation/search/searchPage?promotionsId=${item.couponId}&promotionType=COUPON`,
      });
-      } else {
-        uni.switchTab({
-          url: "/pages/navigation/search/searchPage",
-        });
-      }
    },

    /**
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -104,7 +104,7 @@
 								});
 							}
 							else{
-				uni.redirectTo({
+							uni.navigateTo({
 								url: "/pages/order/myOrder?status=0",
 							});
 							}
@@ -139,6 +139,7 @@
 					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
 					this.orderType = "RECHARGE";
+					
 				} else if (this.routerVal.trade_sn) {
 					this.sn = this.routerVal.trade_sn;
 					this.orderType = "TRADE";
@@ -161,7 +162,7 @@
 					});
 					// #endif

-					// #ifndef MP-WEIXIN
+					
 				  if(this.routerVal.recharge_sn){
 						this.payList = res.data.result.support.filter((item) => {
 						return item != "WALLET";
@@ -170,7 +171,7 @@
 					 else{
 						this.payList = res.data.result.support;
 					}
-					// #ifndef APP-PLUS
+					// #ifdef H5
 					//判断是否微信浏览器
 					var ua = window.navigator.userAgent.toLowerCase();
 					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
@@ -178,11 +179,17 @@
 						this.payList = res.data.result.support.filter((item) => {
 							return item != "ALIPAY";
 						});
+						// 充值的话仅保留微信支付
+						if(this.orderType == "RECHARGE"){
+							this.payList = res.data.result.support.filter((item) => {
+								return item == "WECHAT";
+							});
+						}
 						
 					}
 					// #endif
 					
-					// #endif
+				
 					

 					this.walletValue = res.data.result.walletValue;
@@ -227,12 +234,17 @@
 				// 客户端类型 APP/NATIVE/JSAPI/H5
 				const paymentClient = this.paymentClient;
 				
+				uni.showLoading({
+				  title: "正在唤起支付...",
+				  mask:true
+				});
+				
 				// #ifdef APP-PLUS
 				//APP pay
 				// 初始化支付签名
 				await API_Trade.initiatePay(paymentMethod, paymentClient, params).then(
 					(signXml) => {
-
+						 if (this.$store.state.isShowToast){ uni.hideLoading() };
 						//如果支付异常
 						if (!signXml.data.success) {
 							uni.showToast({
@@ -245,19 +257,24 @@
 						let payForm = signXml.data.result;
 						
 						let paymentType = paymentMethod === "WECHAT" ? "wxpay" : "alipay";
-						uni.requestPayment({
-							provider: paymentType,
-							orderInfo: payForm,
-							success: (e) => {
-								console.log(e);
+						
+						if(paymentMethod === "WALLET"){
+							uni.showToast({
+								icon: "none",
+								title: "支付成功!",
+							});
+							this.callback(paymentMethod)
+						}
+						else{
+							uni.requestPayment({
+								provider: paymentType,
+								orderInfo: payForm || '',
+								success: (e) => {
 									uni.showToast({
 										icon: "none",
 										title: "支付成功!",
 									});
-
 									this.callback(paymentMethod)
-								
-								 
 								},
 								fail: (e) => {
 									console.log(this);
@@ -269,6 +286,7 @@
 								},
 							});
 						}
+					}
 				);
 				//APP pay
 				// #endif
@@ -316,8 +334,25 @@
 										}
 									}
 								);
+								 if (this.$store.state.isShowToast){ uni.hideLoading() };
 							} else {
 								window.location.href = JSON.parse(response.result).h5_url;
+								const searchParams = {
+									...params,
+									price:this.cashierParams,
+								}
+								const timer = setInterval(()=>{
+									payCallback(searchParams).then(res=>{
+									if(res.data.result){
+										clearTimeout(timer);
+										uni.navigateTo({
+											url:"/pages/order/myOrder"
+										})
+									}
+								})
+								},3000)
+								
+								 if (this.$store.state.isShowToast){ uni.hideLoading() };		
 							}
 						} else if (paymentMethod === "WALLET") {
 							uni.showToast({
--- a/pages/cart/payment/shareOrderGoods.vue
+++ b/pages/cart/payment/shareOrderGoods.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="wrapper" v-if="flage">
+  <view class="wrapper" v-if="flag">
    <div class='goods' v-if="selectedGoods">
      <image class="goods-image" :src="selectedGoods.thumbnail" alt="">
        <p class="goodsName">{{selectedGoods.goodsName}}</p>
@@ -58,7 +58,7 @@

    <popupGoods :addr="addr" ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="goodsDetail" :goodsSpec="goodsSpec" v-if="goodsDetail.id " @handleClickSku="getGoodsDetail" />
    <shares @close="closeShare" :link="'/pages/cart/payment/shareOrderGoods?sn='+this.routers.sn+'&sku='+this.routers.sku+'&goodsId='+this.routers.goodsId" type="pintuan"
-      :thumbnail="data.promotionGoods.thumbnail" :goodsName="data.promotionGoods.goodsName" v-if="shareFlage " />
+      :thumbnail="data.promotionGoods.thumbnail" :goodsName="data.promotionGoods.goodsName" v-if="shareFlag " />
  </view>
 </template>

@@ -72,13 +72,13 @@ import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 export default {
  data() {
    return {
-      flage: false, //判断接口是否正常请求
+      flag: false, //判断接口是否正常请求
      addr: {
        id: "",
      },
      maskFlag: false, //商品弹框
      timeStamp: 0,
-      shareFlage: false,
+      shareFlag: false,
      data: "",
      isMaster: true,
      selectedGoods: "", //选择的商品规格昵称
@@ -116,7 +116,7 @@ export default {
  },
  methods: {
    closeShare() {
-      this.shareFlage = false;
+      this.shareFlag = false;
    },
    // 这里的话得先跳到商品详情才能购买商品
    toBuy() {
@@ -131,7 +131,7 @@ export default {
    },
    // 分享
    share() {
-      this.shareFlage = true;
+      this.shareFlag = true;
    },
    closePopupBuy(val) {
      this.maskFlag = false;
@@ -140,7 +140,7 @@ export default {
    async init(sn, sku) {
      let res = await getPinTuanShare(sn, sku);
      if (res.data.success && res.data.result.promotionGoods) {
-        this.flage = true;
+        this.flag = true;
        this.data = res.data.result;
        this.selectedGoods = res.data.result.promotionGoods;
        let endTime = Date.parse(
@@ -204,7 +204,7 @@ export default {
        this.goodsDetail = response.data.result.data;
        this.selectedGoods = response.data.result.data;
        this.goodsSpec = response.data.result.specs;
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        this.PromotionList = response.data.result.promotionMap;

        // 判断是否拼团活动 如果有则显示拼团活动信息
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -2,9 +2,11 @@
  <view class="add-address">
    <div class="uForm">
      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
+				<!-- #ifndef H5 -->
        <view class="selectAddress" @click="clickUniMap">
          选择收货地址
        </view>
+				<!-- #endif -->
        <u-form-item class="border" label="收货人" label-width="130" prop="name">
          <u-input v-model="form.name" clearable placeholder="请输入收货人姓名" />
        </u-form-item>
@@ -31,18 +33,18 @@
      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
      </m-city>

-      <uniMap v-if="mapFlage" @close="closeMap" @callback="callBackAddress" />
+      <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" />
    </div>
  </view>
 </template>
 <script>
 import { addAddress, editAddress, getAddressDetail } from "@/api/address.js";
-import gkcity from "@/components/m-city/m-city.vue";
-import uniMap from "./uniMap";
+import city from "@/components/m-city/m-city.vue";
+import uniMap from "@/components/uniMap";
 import permision from "@/js_sdk/wa-permission/permission.js";
 export default {
  components: {
-    "m-city": gkcity,
+    "m-city": city,
    uniMap,
  },
  onShow() {
@@ -51,7 +53,7 @@ export default {
  methods: {
    // 关闭地图
    closeMap() {
-      this.mapFlage = false;
+      this.mapFlag = false;
    },
    // 打开地图并访问权限
    clickUniMap() {
@@ -59,8 +61,8 @@ export default {
      if (plus.os.name == "iOS") {
        // ios系统
        permision.judgeIosPermission("location")
-          ? (this.mapFlage = true)
-          : this.refuseMapOuther();
+          ? (this.mapFlag = true)
+          : this.refuseMap();
      } else {
        // 安卓
        this.requestAndroidPermission(
@@ -70,12 +72,12 @@ export default {
      // #endif

      // #ifndef APP-PLUS
-      this.mapFlage = true;
+      this.mapFlag = true;
      // #endif
    },

    // 如果拒绝权限 提示区设置
-    refuseMapOuther() {
+    refuseMap() {
      uni.showModal({
        title: "温馨提示",
        content: "您已拒绝定位,请开启",
@@ -111,14 +113,15 @@ export default {
      var result = await permision.requestAndroidPermission(permisionID);

      if (result == 1) {
-        this.mapFlage = true;
+        this.mapFlag = true;
      } else {
-        this.refuseMapOuther();
+        this.refuseMap();
      }
    },

    // 选择地址后数据的回调
    callBackAddress(val) {
+      console.log(val)
      uni.showLoading({
        title: "加载中",
      });
@@ -134,7 +137,7 @@ export default {
         uni.hideLoading();
      }

-      this.mapFlage = !this.mapFlage; //关闭地图
+      this.mapFlag = !this.mapFlag; //关闭地图
    },

    // 保存当前 地址
@@ -160,9 +163,7 @@ export default {
            delete this.form.updateTime;
            editAddress(this.form).then((res) => {
              if (res.data.success) {
-                uni.navigateTo({
-                  url: `/${beforePage.route}`,
-                });
+                uni.navigateBack();
              }
            });
          }
@@ -206,7 +207,7 @@ export default {
  data() {
    return {
      lightColor: this.$lightColor, //高亮颜色
-      mapFlage: false, // 地图选择开
+      mapFlag: false, // 地图选择开
      routerVal: "",
      form: {
        detail: "", //地址详情
@@ -276,7 +277,7 @@ export default {
        params.___path = params.consigneeAddressPath;
        this.$set(this, "form", params);

-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    }
     uni.hideLoading();
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -101,7 +101,7 @@ export default {
        this.addressList = res.data.result.records;
        console.log(this.addressList);

-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
    //删除地址
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -1,6 +1,6 @@
 <template>
  <view class="address">
-    <u-empty class="empty" v-if="this.addressList == 0" text="暂无收货地址" mode="address"></u-empty>
+    <u-empty class="empty" v-if="this.addressList.length === 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">
@@ -86,22 +86,8 @@ export default {
   * 进入页面检测当前账户是否登录
   */
  onShow() {
-    let that = this;
-    if (this.$options.filters.isLogin("auth")) {
+    if (this.$options.filters.tipsToLogin()) {
      this.getAddressList();
-    } else {
-      uni.showModal({
-        title: "提示",
-        content: "检测到您的账号还未登录,是否去登录？",
-        confirmColor: this.$lightColor,
-        success: function (res) {
-          if (res.confirm) {
-            that.$options.filters.navigateToLogin();
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
    }
  },
  methods: {
@@ -117,7 +103,7 @@ export default {
        });
        this.addressList = res.data.result.records;

-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
    //删除地址
--- a/pages/mine/address/storeAddress.vue
+++ b/pages/mine/address/storeAddress.vue
@@ -0,0 +1,88 @@
+<template>
+  <view class="address">
+
+    <u-empty class="empty" v-if="storeAddressList.length == 0" text="暂无自提地址" mode="address"></u-empty>
+    <view class="list" v-else>
+      <view class="item c-content" v-for="(item, index) in storeAddressList" :key="index">
+        <view class="basic" @click="selectAddressData(item)">
+          <text>{{ item.addressName }}</text>
+          <text>{{ item.mobile }}</text>
+          <view>
+            <div class="region">
+              <span>{{ item.address }}</span>
+            </div>
+          </view>
+        </view>
+      </view>
+      <view style="height: 100px"></view>
+    </view>
+    <u-action-sheet :list="removeList" :tips="tips" v-model="showAction" @click="deleteAddressMessage"></u-action-sheet>
+  </view>
+</template>
+
+<script>
+import * as API_Trade from "@/api/trade";
+import * as API_Store from "@/api/store.js";
+export default {
+  data() {
+    return {
+      storeAddressList: [], //地址列表
+      showAction: false, //是否显示下栏框
+      removeList: [
+        {
+          text: "确定",
+        },
+      ],
+      tips: {
+        text: "确定要删除该收货人信息吗？",
+      },
+      removeId: "", //删除的地址id
+      routerVal: "",
+      params: {
+        pageNumber: 1,
+        pageSize: 1000,
+      },
+    };
+  },
+  onPullDownRefresh() {
+    //下拉刷新
+    this.storeAddressList = [];
+    this.getAddressList();
+  },
+  onLoad: function (val) {
+    this.routerVal = val;
+  },
+  onShow() {
+    this.storeAddressList = [];
+    this.getAddressList();
+  },
+  onHide() {},
+  methods: {
+    async selectAddressData(val) {
+      await API_Trade.setStoreAddressId(val.id, this.routerVal.way);
+
+      uni.navigateBack({
+        delta: 1,
+      });
+    },
+    //获取地址列表
+    getAddressList() {
+      uni.showLoading();
+
+      API_Store.getStoreAddress(
+        this.routerVal.storeId,
+        this.params
+      ).then((res) => {
+        this.storeAddressList = res.data.result.records;
+        console.log(this.storeAddressList);
+
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./address.scss";
+</style>
--- a/pages/mine/deposit/index.vue
+++ b/pages/mine/deposit/index.vue
@@ -1,6 +1,6 @@
 <template>
  <view class="wap">
-    <u-navbar back-text="" title="预存款列表">
+    <u-navbar  title="预存款列表">
    </u-navbar>
    <view class="wrapper-show-money">
      <view class="money-view">
@@ -14,7 +14,7 @@
      <swiper class="swiper-box"  :current="swiperCurrent">
        <swiper-item class="swiper-item" v-for="index in list.length" :key="index">
          <scroll-view class="scroll-v view-wrapper" enableBackToTop="true" scroll-with-animation scroll-y @scrolltolower="loadMore">
-            <view v-if="datas.length!=0" class="view-item" v-for="(logItem, logIndex) in datas" :key="logIndex">
+            <view v-if="depositData.length!=0" class="view-item" v-for="(logItem, logIndex) in depositData" :key="logIndex">
              <view class="view-item-detail">
                <view class="-title">{{logItem.detail}}</view>
                <!-- <view class="-number">{{logItem.detail}}</view> -->
@@ -27,8 +27,8 @@
              </view>
            </view>

-            <u-empty v-if="datas.length==0" mode="history" text="暂无记录" />
-            <u-loadmore v-else bg-color='#f8f8f8' :status="status" />
+            <u-empty v-if="depositData.length==0" mode="history" text="暂无记录" />
+      
          </scroll-view>

        </swiper-item>
@@ -45,7 +45,6 @@ export default {
  data() {
    return {
      walletNum: 0,
-      status: "loadmore",
      current: 0,
      swiperCurrent: 0,
      userInfo: "", //用户详情信息
@@ -54,7 +53,7 @@ export default {
        pageSize: 10,
        order: "desc",
      },
-      datas: [], //遍历的数据集合
+      depositData: [], //遍历的数据集合
      rechargeList: "", //充值明细列表
      walletLogList: "", //钱包变动列表
      list: [
@@ -82,27 +81,21 @@ export default {
   
    /**分页获取预存款充值记录 */
    getRecharge() {
-      this.status = "loading";
      getUserRecharge(this.params).then((res) => {
        if (res.data.success) {
          if (res.data.result.records.length != 0) {
-            this.status = "loadmore";
-            this.datas.push(...res.data.result.records);
-          } else {
-            this.status = "nomore";
+            this.depositData.push(...res.data.result.records);
          }
        }
      });
    },

    getWallet() {
-      this.status = "loading";
+    
      getWalletLog(this.params).then((res) => {
        if (res.data.success) {
          if (res.data.result.records.length != 0) {
-            this.datas.push(...res.data.result.records);
-          } else {
-            this.status = "nomore";
+            this.depositData.push(...res.data.result.records);
          }
        }
      });
@@ -110,7 +103,7 @@ export default {

  
    changed(index) {
-      this.datas = [];
+      this.depositData = [];
      this.swiperCurrent = index;
      this.params.pageNumber = 1;
      if (index == 0) {
--- a/pages/mine/deposit/operation.vue
+++ b/pages/mine/deposit/operation.vue
@@ -5,11 +5,11 @@
      <div class="deposit">预存款金额</div>
      <div class="money">￥{{walletNum | unitPrice }}</div>
      <div class="operation-btns">
-        <div class="operation-btn light" @click="navgition('/pages/mine/deposit/withdrawal')">提现</div>
-        <div class="operation-btn" @click="navgition('/pages/mine/deposit/recharge')">充值</div>
+        <div class="operation-btn light" @click="navigateTo('/pages/mine/deposit/withdrawal')">提现</div>
+        <div class="operation-btn" @click="navigateTo('/pages/mine/deposit/recharge')">充值</div>
      </div>
    </div>
-    <div class="box list" @click="navgition('/pages/mine/deposit/index')">
+    <div class="box list" @click="navigateTo('/pages/mine/deposit/index')">
      <div class="list-left">预存款明细</div>
      <div class="list-right">
        <u-icon name="arrow-right"></u-icon>
@@ -31,12 +31,6 @@ export default {
      let result = await getUserWallet(); //预存款
      this.walletNum = result.data.result.memberWallet;
    } else {
-      uni.showToast({
-        icon: "none",
-        duration: 3000,
-        title: "请先登录！",
-      });
-
      this.$options.filters.navigateToLogin("redirectTo");
    }
  },
@@ -49,7 +43,7 @@ export default {
    /**
     * 跳转
     */
-    navgition(url) {
+    navigateTo(url) {
      uni.navigateTo({
        url,
      });
--- a/pages/mine/deposit/recharge.vue
+++ b/pages/mine/deposit/recharge.vue
@@ -1,3 +1,4 @@
+
 <template>
  <view>
    <view class="-list">
@@ -5,7 +6,8 @@
      <view class="content">
        <view class="price">
          <span> ￥</span>
-          <u-input v-model="price" placeholder="" type="number" />
+          <u-input v-model="price" placeholder='金额' type="number" />
+					
        </view>

      </view>
--- a/pages/mine/deposit/withdrawal.vue
+++ b/pages/mine/deposit/withdrawal.vue
@@ -1,5 +1,13 @@
 <template>
  <view>
+    <view class="-list">
+      <view class="title">提现类型</view>
+      <view class="content">
+        <view class="price">
+          <u-input disabled :value="type === 'ALI' ? '支付宝' : '微信'" placeholder="" />
+        </view>
+	  </view>
+    </view>
 	<view class="-list">
 	  <view class="title">提现金额</view>
 	  <view class="content">
@@ -15,7 +23,23 @@
 	
 	  </view>
 	  <view class="tips">
-        最低提现金额为1.00元
+	    最低提现金额为 {{ minPrice }} 元
+	  </view>
+	</view>
+	<view class="-list" v-if="type === 'ALI'">
+	  <view class="title">真实姓名</view>
+	  <view class="content">
+		<view class="price">
+		  <u-input v-model="realName" placeholder="" />
+		</view>
+	  </view>
+	</view>
+	<view class="-list" v-if="type === 'ALI'">
+	  <view class="title">第三方登录账号</view>
+	  <view class="content">
+		<view class="price">
+		  <u-input v-model="connectNumber" placeholder="" />
+		</view>
 	  </view>
 	</view>

@@ -23,17 +47,24 @@
  </view>
 </template>
 <script>
-import { getUserWallet, withdrawalApply } from "@/api/members";
+import { getUserWallet, withdrawalApply, withdrawalSettingVO } from "@/api/members";
 export default {
  data() {
    return {
      price: 0,
      walletNum: 0,
+	  minPrice: 0,
+	  type: '',
+	  connectNumber: '',
+	  realName: ''
    };
  },
  async mounted() {
    let result = await getUserWallet(); //预存款
+	let res = await withdrawalSettingVO();
    this.walletNum = result.data.result.memberWallet;
+	this.minPrice = res.data.result.minPrice;
+	this.type = res.data.result.type;
  },

  methods: {
@@ -41,7 +72,20 @@ export default {
      this.price = this.price + "";

      if (this.$u.test.amount(parseInt(this.price))) {
-        withdrawalApply({ price: this.price }).then((res) => {
+		let params = { price: this.price };
+		if (this.type === 'ALI') {
+			if (!this.connectNumber || !this.realName) {
+				uni.showToast({
+				  title: "请输入真实姓名和第三方登录账号",
+				  duration: 2000,
+				  icon: "none",
+				});
+				return;
+			}
+			params.connectNumber = this.connectNumber;
+			params.realName = this.realName;
+		}
+        withdrawalApply(params).then((res) => {
          if (res.data.success) {
            uni.showToast({
              title: "提现成功!",
--- a/pages/mine/distribution/history.vue
+++ b/pages/mine/distribution/history.vue
@@ -1,18 +1,13 @@
 <template>
  <view class="log-list">
    <!-- 提现记录 -->
-    <view
-      class="log-way"
-      v-if="cashLogData.length != 0"
-      v-for="(item, index) in cashLogData"
-      :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">{{
            item.distributionCashStatus == "APPLY"
              ? "待处理"
-              : item.distributionCashStatus == "PASS"
+              : item.distributionCashStatus == "VIA_AUDITING"
                ? "通过"
                : "拒绝"
          }}</view>
@@ -25,12 +20,7 @@
      </view>
    </view>
    <!-- 分销业绩 -->
-    <view
-      class="log-way"
-      v-if="achievementData.length != 0"
-      v-for="(item, index) in achievementData"
-      :key="index"
-    >
+    <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>
@@ -42,7 +32,6 @@
        </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>
@@ -57,7 +46,7 @@
 <script>
 import { cashLog, distributionOrderList } from "@/api/goods";
 export default {
-  data() {
+  data () {
    return {
      cashLogData: [], //提现记录数据集合
      achievementData: [], //分销业绩数据合集,
@@ -77,7 +66,7 @@ export default {
      },
    };
  },
-  onLoad(option) {
+  onLoad (option) {
    let title;
    option.type == 0 ? (title = "分销业绩") : (title = "提现记录");

@@ -88,15 +77,15 @@ export default {
    this.type = option.type;
    option.type == 0 ? this.achievement() : this.history();
  },
-  mounted() {},
-  onReachBottom() {
+  mounted () { },
+  onReachBottom () {
    this.status = "loading";
    this.type == 0 ? this.achParams.pageNumber++ : this.params.pageNumber++;
    this.type == 0 ? this.achievement() : this.history();
  },
  methods: {
    // 业绩
-    achievement() {
+    achievement () {
      uni.showLoading({
        title: "加载中",
      });
@@ -107,11 +96,11 @@ export default {
          this.status = "nomore";
          this.empty = true;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
    // 初始化提现历史
-    history() {
+    history () {
      uni.showLoading({
        title: "加载中",
      });
@@ -122,7 +111,7 @@ export default {
          this.status = "nomore";
          this.empty = true;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
  },
@@ -132,15 +121,18 @@ export default {
 .empty {
  margin: 40rpx 0;
 }
+
 .price {
  color: $main-color;
  font-weight: bold;
 }
+
 .log-list {
  padding: 0 8rpx;
  overflow: hidden;
  margin: 20rpx 0;
 }
+
 .log-way {
  margin: 10rpx 0;
  overflow: hidden;
@@ -148,22 +140,26 @@ export default {
  border-radius: 10rpx;
  padding: 20rpx 0;
 }
+
 .title {
  font-size: 30rpx;
  font-weight: bold;
 }
+
 .log-item-view {
  padding: 8rpx 32rpx;
  display: flex;
  font-size: 13px;
  justify-content: space-between;
 }
+
 .log-item-footer {
  padding: 8rpx 32rpx;
  display: flex;
  font-size: 13px;
  justify-content: space-between;
 }
+
 .log-item-footers {
  padding: 8rpx 32rpx;
  display: flex;
--- a/pages/mine/distribution/home.vue
+++ b/pages/mine/distribution/home.vue
@@ -78,7 +78,7 @@ export default {
        if (res.data.result) {
          this.distributionData = res.data.result;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
  },
@@ -98,7 +98,7 @@ export default {
 .nav-list {
  color: #fff;
  padding: 40rpx 0;
-  background: $aider-light-color;
+  background: linear-gradient(91deg, $light-color 1%, $aider-light-color 99%);
 }
 .total {
  padding: 10rpx 0;
--- a/pages/mine/distribution/withdrawal.vue
+++ b/pages/mine/distribution/withdrawal.vue
@@ -75,7 +75,7 @@ export default {
        if (res.data.result) {
          this.distributionData = res.data.result;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
  },
--- a/pages/mine/help/tips.vue
+++ b/pages/mine/help/tips.vue
@@ -1,37 +1,42 @@
 <template>
  <div class="wrapper">
-    <u-parse v-html="res.content"></u-parse>
+    <u-parse :show-with-animation="true" :lazy-load="true" :selectable="true" :html="res.content" v-if="res"></u-parse>

  </div>
 </template>
 <script>
-import { getArticleDetail } from "@/api/article";
+import { getArticleDetailByType } from "@/api/article";
 export default {
  data() {
    return {
      res: "",
      way: {
-        user: {
-          title: "用户协议",
+        USER_AGREEMENT: {
+          title: "服务协议",
          type: "USER_AGREEMENT",
        },
-        privacy: {
+        PRIVACY_POLICY: {
          title: "隐私政策",
          type: "PRIVACY_POLICY",
        },
-        message: {
+        LICENSE_INFORMATION: {
          title: "证照信息",
          type: "LICENSE_INFORMATION",
        },
-        about: {
+        ABOUT: {
          title: "关于我们",
          type: "ABOUT",
        },
+        STORE_REGISTER: {
+          title: "店铺入驻协议",
+          type: "STORE_REGISTER",
+        },
      },
    };
  },
  mounted() {},
  onLoad(option) {
+    console.log(this.way)
    uni.setNavigationBarTitle({
      title: this.way[option.type].title,
    });
@@ -40,9 +45,10 @@ export default {

  methods: {
    init(option) {
-      getArticleDetail(this.way[option.type].type).then((res) => {
+      getArticleDetailByType(this.way[option.type].type).then((res) => {
        if (res.data.success) {
          this.res = res.data.result;
+          console.log(res)
        }
      });
    },
--- a/pages/mine/im/index-app.scss
+++ b/pages/mine/im/index-app.scss
--- a/pages/mine/im/index.vue
+++ b/pages/mine/im/index.vue
@@ -0,0 +1,878 @@
+<template>
+  <view class="wrapper">
+    <u-navbar class="my-title" title-size="32" :title="toUser.name"></u-navbar>
+    <!-- 空盒子用来防止消息过少时 拉起键盘会遮盖消息 -->
+    <view :animation="anData" style="height:0;">
+    </view>
+    <!-- 消息体 -->
+    <!-- 用来获取消息体高度 -->
+    <view id="msgList">
+      <!-- 消息 -->
+      <view class="flex-column-start" v-if="msgList.length" v-for="(item, index) in msgList" :key="index">
+        <view class="flex-row-start column-time">
+          <!--  <view v-show="compareTime(index, item.createTime)" class="flex-row-start date-text"
+            v-text="beautifyTime(item.createTime)">
+          </view> -->
+        </view>
+        <!-- 用户消息 头像可选加入-->
+        <view v-if="item.my" class="flex justify-end padding-right one-show  align-start  padding-top">
+          <view class="flex justify-end" style="width: 400rpx;margin-top: 12px;">
+            <view>
+              <view class="user-name">{{ user.nickName }}</view>
+              <view class="margin-left padding-chat bg-user-orang" style="border-radius: 35rpx; ">
+                <text style="word-break: break-all;"
+                  v-if="item.messageType === 'MESSAGE' && !emojistwo.includes(item.text)">{{ item.text }}</text>
+                <view v-if="item.messageType === 'MESSAGE' && emojistwo.includes(item.text)"
+                  v-html="textReplaceEmoji(item.text)"></view>
+                <view v-if="item.messageType == 'GOODS'">
+                  <view class="goods-card u-flex u-row-between u-p-b-0" style="width:100%;margin: 0 0; ">
+                    <view class="image-box" @click="jumpGoodDesc(item)">
+                      <image class="image" :src="JSON.parse(item.text)['thumbnail']" mode="widthFix"></image>
+                    </view>
+                    <view class="goods-desc" @click="jumpGoodDesc(item)">
+                      <view class="goods-desc-name">
+                        <text class="goods-card-goods-name">{{
+                          JSON.parse(item.text)['goodsName']
+                        }}</text>
+                      </view>
+                      <view class="goods-desc-rice" >￥{{
+                            JSON.parse(item.text)['price'] | unitPrice
+                          }}
+                      </view>
+                    </view>
+                  </view>
+                </view>
+          
+                <view v-if="item.messageType == 'ORDER'" @click="linkTosOrders(item.text)">
+                  <view class="order-sn">
+                    <div class="wes">订单号：{{ JSON.parse(item.text)['sn'] }}</div>
+                    <div class='order-item flex' v-if="JSON.parse(item.text).orderItems.length"  v-for='(order,orderIndex) in JSON.parse(item.text).orderItems'>
+                      <u-image  mode="widthFix" width='120rpx' height='120rpx' :src="order.image" />
+                       <view class="name-or-time">
+                        <div class="wes-2" >{{
+                        order.name
+                        }}</div>
+                        <div class="main-color goods-desc-rice">{{
+                          order.goodsPrice | unitPrice("￥")
+                        }}</div>
+                        
+                      </view>
+                    </div>
+                    <view class="order-list">
+                      <view class="order-time">
+                          <text>{{ JSON.parse(item.text)['paymentTime'] }}</text>
+                        </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view>
+            <u-avatar :src="user.face" :text="user.face ? '' : user.name" bg-color="#DDDDDD"></u-avatar>
+          </view>
+        </view>
+        <!-- 接收人消息 -->
+        <view v-else class="flex-row-start margin-left margin-top one-show">
+          <view class="chat-img flex-row-center">
+            <u-avatar :src="toUser.face" :text="toUser.face ? '' : toUser.name" bg-color="#DDDDDD">
+            </u-avatar>
+          </view>
+          <view class="flex" style="width: 500rpx;">
+            <view>
+              <view class="other-name">{{ toUser.name }}</view>
+              <view class="margin-left padding-chat flex-column-start bg-to-color" style="border-radius: 35rpx;">
+                <text style="word-break: break-all;"
+                  v-if="item.messageType === 'MESSAGE' && !emojistwo.includes(item.text)">{{ item.text }}</text>
+                <view v-if="item.messageType === 'MESSAGE' && emojistwo.includes(item.text)"
+                  v-html="textReplaceEmoji(item.text)"></view>
+                <view v-if="item.messageType === 'GOODS'">
+                  <view class="goods-card u-flex u-row-between u-p-b-0" style="width:100%;margin: 0 0; ">
+                    <view class="image-box" @click="jumpGoodDesc(item)">
+                      <image class="image" :src="JSON.parse(item.text)['thumbnail']" mode="widthFix"></image>
+                    </view>
+                    <view class="goods-desc" @click="jumpGoodDesc(item)">
+                      <view class="goods-desc-name">
+                        <text class="goods-card-goods-name">{{
+                          JSON.parse(item.text)['goodsName']
+                        }}</text>
+                      </view>
+                        <view class="goods-desc-rice" >¥{{
+                            JSON.parse(item.text)['price']
+                          }}
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <view v-if="item.messageType === 'ORDER'">
+                  <view class="order-sn">
+                    <text>订单号：{{ JSON.parse(item.text)['sn'] }}</text>
+                    <view class="order-list">
+                      <img style="height: 120rpx; width: 120rpx; margin-top: 15rpx;"
+                        :src="JSON.parse(item.text)['groupImages']" mode="widthFix" />
+                      <view class="name-or-time">
+                        <text @click="linkTosOrders(item.text)">{{
+                          JSON.parse(item.text)['groupName']
+                        }}</text>
+                        <view class="order-time">
+                          <text>{{ JSON.parse(item.text)['paymentTime'] }}</text>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+          </view>
+        </view>
+      </view>
+      <!-- 防止消息底部被遮 -->
+      <view v-if="showHide && !localImGoodsId && showHideModel" class="flex-row-start margin-left margin-top"
+        style="height: 120rpx;">
+      </view>
+      <!-- 如果没有聊天记录，定位到底部 -->
+      <view
+        :style="{ position:'fixed' , bottom:(inputHeight+66)+'px' , width:  '100%' }">
+        <view class="cart-message" v-if="showHide && !localImGoodsId && showHideModel">
+          <view class="goods-card u-flex u-row-between u-p-b-0">
+            <view class="image-box" @click="jumpGoodDesc(item)">
+              <image class="image" :src="goodListData.thumbnail" mode="widthFix"></image>
+            </view>
+            <view class="goods-desc" @click="jumpGoodDesc(item)">
+              <view class="goods-desc-name">
+                <text class="goods-card-goods-name">{{
+                  goodListData.goodsName
+                }}</text>
+              </view>
+              <view class="goods-desc-rice" > ￥{{
+                goodListData.price | unitPrice
+              }}
+              </view>
+            </view>
+            <view class="cancel" @click="cancelModel">X</view>
+            <view class="send-goods" @click="sendGoodsMessage">
+              <view>发送商品</view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- loading是显示 -->
+      <!-- <view v-show="msgLoad" class=" margin-left margin-top">
+        <view class="chat-img flex-row-center">
+          <image style="height: 75rpx;width: 75rpx;" src="../../static/image/robt.png" mode="aspectFit"></image>
+        </view>
+        <view class="flex" style="width: 500rpx;">
+          <view class="margin-left padding-chat flex-column-start"
+            style="border-radius: 35rpx;background-color: #f9f9f9;">
+            <view class="cuIcon-loading turn-load" style="font-size: 35rpx;color: #3e9982;">
+
+            </view>
+          </view>
+        </view>
+      </view> -->
+      <!-- 防止消息底部被遮 -->
+      <view style="height: 120rpx;">
+      </view>
+    </view>
+    <!-- 底部导航栏 -->
+    <view :style="{position: 'fixed',bottom:inputHeight+'px'}" class="flex-column-center"  :animation="animationData">
+      <view class="bottom-dh-char flex-row-around" style="font-size: 55rpx;">
+        <!-- vue无法使用软键盘"发送" -->
+        <input @focus="inputBindFocus" @blur="eventHandle"  :adjust-position="false" v-model="msg" class="dh-input" type="text" style="background-color: #f0f0f0;" @confirm="sendMessage"
+          confirm-type="send"  placeholder="用一句简短的话描述您的问题" />
+        <view @click="sendMessage" class="cu-tag bg-main-color send round">
+          发送
+        </view>
+        <!-- <text @click="ckAdd" class="cuIcon-roundaddfill text-brown"></text> -->
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+// rpx和px的比率
+var l
+// 可用窗口高度
+var wh
+// 顶部空盒子的高度
+var mgUpHeight
+import {
+  getTalkMessage,
+  getTalkByUser,
+  jumpObtain
+} from "@/api/im.js";
+import SocketService from "@/utils/socket_service.js";
+import storage from "@/utils/storage.js";
+import {
+  beautifyTime
+} from "@/utils/filters.js"
+import config from '@/config/config.js'
+import { textReplaceEmoji, emojistwo } from '@/utils/emojis.js';
+export default {
+  // 页面卸载后清除imGoodId
+  onUnload () {
+    // #ifdef H5
+    uni.setStorageSync("imGoodId", '');
+    // #endif
+
+    if (this.socketOpen == true) {
+      uni.closeSocket();
+    }
+  },
+  onLoad (options) {
+    // 没有goodsid则不显示 发送商品弹窗
+    this.showHideModel = options.goodsid
+    // 发送后刷新页面不显示 发送商品弹窗 local里面imGoodId不为空显示
+    // #ifdef H5
+    this.localImGoodsId = uni.getStorageSync("imGoodId");
+    // #endif
+    this.resolve = options
+    // 请求商品信息
+    if (this.resolve.goodsid) {
+      this.commodityDetails()
+    }
+    // 如果需要缓存消息缓存msgList即可
+    // 监听键盘拉起
+    // 因为无法控制键盘拉起的速度,所以这里尽量以慢速处理
+    uni.onKeyboardHeightChange(res => {
+      const query = uni.createSelectorQuery()
+      query.select('#msgList').boundingClientRect(data => {
+        // 若消息体没有超过2倍的键盘则向下移动差值,防止遮住消息体
+        var up = res.height * 2 - data.height - l * 110
+        if (up > 0) {
+          // 动态改变空盒子高度
+          this.messageBoxMove(up, 300)
+          // 记录改变的值,若不收回键盘且发送了消息用来防止消息过多被遮盖
+          mgUpHeight = up
+        }
+        // 收回
+        if (res.height == 0) {
+          this.messageBoxMove(0, 0)
+        }
+      }).exec();
+    })
+    var query = uni.getSystemInfoSync()
+
+    l = query.screenWidth / 750
+    wh = query.windowHeight
+    this.scrollHeight = (query.windowHeight - 44) + "px"
+    this.user = storage.getUserInfo()
+    this.toUser = storage.getTalkToUser()
+
+    if (options.talkId) {
+      this.params.talkId = options.talkId;
+      this.getTalkMessage()
+    } else {
+      this.getTalk(options.userId)
+
+    }
+
+    // this.ws.connect();
+    this.sokcet();
+  },
+  // 页面隐藏
+  onHide () {
+    uni.closeSocket();
+  },
+  onUnload () {
+    uni.closeSocket();
+  },
+  onPullDownRefresh () {
+    this.params.pageNumber = this.params.pageNumber + 1
+    this.getTalkMessage()
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+
+  data () {
+    return {
+      textReplaceEmoji,
+      emojistwo,
+      socketOpen: false, //是否连接
+      storage,
+      fixed: 'fixed',
+      bottom: '50px',
+      width: '100%',
+      showHideModel: undefined,
+      localImGoodsId: '',
+      showHide: true,
+      msgLoad: false,
+      anData: {},
+      animationData: {},
+      msgList: [],
+      oldHeight: 0,
+      params: { //搜索条件
+        talkId: '',
+        pageSize: 10,
+        pageNumber: 1,
+      },
+      goToIndex: 0, // 前往位置
+      msg: "",
+      go: 0,
+      newMessageNum: 0,
+      user: {},
+      toUser: {},
+      scrollHeight: 0,
+      ws: new SocketService(),
+      resolve: {},
+      goodListData: {},
+      count: 0, //判断socket断开连接请求次数
+      inputHeight:0,
+    }
+  },
+  // watch: {
+  //   'ws.callBackMapping': {
+  //     handler: function (val) {
+  //       val = JSON.parse(val)
+  //       if (val.messageResultType == 'MESSAGE') {
+  //         this.msgList.push(val.result)
+  //       }
+  //       this.newMessageNum++;
+  //       //接收到消息后发送已读
+  //       let msg = val
+  //       msg.operation_type = 'READ'
+  //       this.ws.send(JSON.stringify(msg))
+  //     }
+  //   }
+  // },
+  methods: {
+    eventHandle(){
+      this.inputHeight = 0
+    },
+    inputBindFocus(e){
+       if (e.detail.height) {
+           this.inputHeight = e.detail.height //这个高度就是软键盘的高度
+       }
+    },
+    sendMessage () {
+      if (this.msg == "") {
+        return 0;
+      }
+      if (this.socketOpen == false) {
+        return
+      }
+      let msg = {
+        operation_type: "MESSAGE",
+        to: this.toUser.userId,
+        from: this.user.id,
+        message_type: "MESSAGE",
+        context: this.msg,
+        talk_id: this.params.talkId,
+      }
+      let data = JSON.stringify(msg);
+      uni.sendSocketMessage({
+        data: data,
+      });
+      this.msgList.push({
+        "text": this.msg,
+        "my": true,
+        "messageType": 'MESSAGE'
+      })
+      let type = 'down';
+      this.msgGo(type)
+      this.msg = ""
+    },
+    sendGoodsMessage () {
+      let msg = {
+        operation_type: "MESSAGE",
+        to: this.toUser.userId,
+        from: this.user.id,
+        message_type: "GOODS",
+        context: this.goodListData,
+        talk_id: this.params.talkId,
+      }
+      let data = JSON.stringify(msg);
+      uni.sendSocketMessage({
+        data: data
+      });
+      this.msgList.push({
+        "text": JSON.stringify(this.goodListData),
+        "my": true,
+        "messageType": 'GOODS'
+      })
+      this.showHide = false
+      // #ifdef H5
+      uni.setStorageSync("imGoodId", 1111111);
+      // #endif
+      this.$nextTick(() => {
+        uni.pageScrollTo({
+          scrollTop: 2000000,
+          duration: 300
+        });
+      })
+    },
+    sokcet () {
+      var _this = this;
+      uni.closeSocket();
+      this.socketOpen = false;
+      try {
+        //WebSocket的地址
+        var url = config.baseWsUrl + '/' + storage.getAccessToken();
+        // 连接
+        uni.connectSocket({
+          url: url,
+        });
+        // 监听WebSocket连接已打开
+        uni.onSocketOpen(function (res) {
+          _this.socketOpen = true;
+        });
+        if (!this.socketOpen) {
+          // 监听连接失败
+
+          uni.onSocketError(function (err) {
+            if (this.count < 3) {
+              if (err && err.code != 1000) {
+                _this.socketOpen = true;
+                setTimeout(() => {
+                  uni.connectSocket({
+                    url: url,
+                  });
+                }, 2000)
+              }
+            } else {
+              uni.closeSocket();
+            }
+            this.count++
+          });
+        }
+        // 监听收到信息
+        uni.onSocketMessage(function (res) {
+          res.data = JSON.parse(res.data)
+          console.log(res.data.result);
+          if (res.data.messageResultType == 'MESSAGE') {
+            _this.msgList.push(res.data.result)
+            console.log(_this.msgList)
+          }
+          console.log(res.data)
+          _this.msgGo()
+        })
+      } catch (e) {
+        uni.closeSocket();
+      }
+      // 监听是否断线，断线进行重新连接
+      uni.onSocketClose((res) => {
+        if (res.code != null && res.code != 1000) {
+          this.sokcet()
+        }
+      })
+    },
+    beautifyTime,
+    //订单详情
+    linkTosOrders (val) {
+      let order = JSON.parse(val)
+      uni.navigateTo({
+        url: '/pages/order/orderDetail?sn=' + order.sn,
+      });
+
+    },
+    // 跳转商品详情页
+    jumpGoodDesc (item) {
+      let info = JSON.parse(item.text)
+      uni.navigateTo({
+        url: `/pages/product/goods?id=${info.id}&goodsId=${info.goodsId}`,
+      });
+    },
+
+    //取消发送
+    cancelModel () {
+      this.showHide = false
+    },
+    // 请求商品详情
+    commodityDetails () {
+      jumpObtain(this.resolve.skuid, this.resolve.goodsid).then((res) => {
+        this.goodListData = res.data.result.data
+      })
+    },
+    // 切换输入法时移动输入框(按照官方的上推页面的原理应该会自动适应不同的键盘高度-->官方bug)
+    goPag (kh) {
+      this.retractBox(0, 250)
+      if (this.keyHeight != 0) {
+        if (kh - this.keyHeight > 0) {
+          this.retractBox(this.keyHeight - kh, 250)
+        }
+      }
+    },
+    // 移动顶部的空盒子
+    messageBoxMove (x, t) {
+      var animation = uni.createAnimation({
+        duration: t,
+        timingFunction: 'linear',
+      })
+      this.animation = animation
+      animation.height(x).step()
+      this.anData = animation.export()
+    },
+    // 保持消息体可见
+    msgGo (type) {
+      const query = uni.createSelectorQuery()
+      // 延时100ms保证是最新的高度
+      setTimeout(() => {
+        // 获取消息体高度
+        query.select('#msgList').boundingClientRect(data => {
+          // 如果超过scorll高度就滚动scorll
+          if (type == 'up') {
+            this.go = data.height - this.oldHeight
+          } else if (type == 'down') {
+            this.go = data.height - wh + 120
+          }
+          // if (this.oldHeight > 0) {
+          // 	this.go = data.height - this.oldHeight
+          // } else {
+          // 	// if (data.height - (wh - 32) > 0) {
+          // 	this.go = data.height - wh + 120
+          // }
+          // 保证键盘第一次拉起时消息体能保持可见
+          var moveY = wh - data.height
+          // 超出页面则缩回空盒子
+          if (moveY - mgUpHeight < 0) {
+            // 小于0则视为0
+            if (moveY < 0) {
+              this.messageBoxMove(0, 200)
+            } else {
+              // 否则缩回盒子对应的高度
+              this.messageBoxMove(moveY, 200)
+            }
+          }
+          uni.pageScrollTo({
+            scrollTop: this.go,
+            duration: 0
+          })
+          this.oldHeight = data.height
+        }).exec();
+      }, 100)
+    },
+    // 回答问题的业务逻辑
+    answer (id) {
+      // 这里应该传入问题的id,模拟就用index代替了
+
+    },
+    // 不建议输入框聚焦时操作此动画
+    ckAdd () {
+      if (!this.showTow) {
+        this.retractBox(-180, 350)
+      } else {
+        this.retractBox(0, 200)
+      }
+      this.showTow = !this.showTow
+    },
+    hideKey () {
+      uni.hideKeyboard()
+    },
+    // 拉起/收回附加栏
+    retractBox (x, t) {
+      var animation = uni.createAnimation({
+        duration: t,
+        timingFunction: 'ease',
+      })
+      this.animation = animation
+      animation.translateY(x).step()
+      this.animationData = animation.export()
+    },
+    async getTalkMessage () {
+      let type = '';
+      await getTalkMessage(this.params).then(res => {
+        if (res.data.success) {
+          if (this.msgList.length >= 10) {
+            this.msgList.unshift(...res.data.result)
+            type = 'up'
+          } else {
+            this.msgList.unshift(...res.data.result)
+            type = 'down'
+          }
+          this.msgList.forEach(item => {
+            if (item.fromUser === this.user.id) {
+              item.my = true
+            }
+          })
+        }
+      })
+      console.log(this.msgList);
+      this.msgGo(type)
+    },
+    // 上拉加载
+    touchMoreMessage (e) {
+      if (e.target.scrollTop == 0) {
+        this.params.pageNumber = this.params.pageNumber + 1
+        this.getTalkMessage()
+      }
+    },
+    async getTalk (userId) {
+      getTalkByUser(userId).then(res => {
+        if (res.data.success) {
+          this.toUser = res.data.result
+          this.params.talkId = res.data.result.id
+          this.getTalkMessage()
+        }
+      })
+    },
+    // 处理消息时间是否显示
+    compareTime (index, datetime) {
+      if (datetime == undefined) {
+        return false;
+      }
+      if (typeof datetime == "number") {
+        datetime = this.unixToDate(datetime, "yyyy-MM-dd hh:mm");
+      }
+
+      if (this.msgList[index].is_revoke == 1) {
+        return false;
+      }
+      if (datetime) {
+        datetime = datetime.replace(/-/g, "/");
+      }
+
+      let time = Math.floor(Date.parse(datetime) / 1000);
+      let currTime = Math.floor(new Date().getTime() / 1000);
+
+      // 当前时间5分钟内时间不显示
+      if (currTime - time < 300) return false;
+      // 判断是否是最后一条消息,最后一条消息默认显示时间
+      if (index == this.msgList.length - 1) {
+        return true;
+      }
+      let nextDate
+      if (this.msgList[index + 1] && this.msgList[index + 1].createTime) {
+        nextDate = this.msgList[index + 1].createTime.replace(/-/g, "/");
+        if (nextDate - datetime < 300) return false;
+      }
+
+      return !(
+        this.unixToDate(new Date(datetime), "{y}-{m}-{d} {h}:{i}") ==
+        this.unixToDate(new Date(nextDate), "{y}-{m}-{d} {h}:{i}")
+      );
+    },
+
+    /**
+     * 将unix时间戳转换为指定格式
+     * @param unix   时间戳【秒】
+     * @param format 转换格式
+     * @returns {*|string}
+     */
+    unixToDate (unix, format) {
+      if (!unix) return unix;
+      let _format = format || "yyyy-MM-dd hh:mm:ss";
+      const d = new Date(unix);
+      const o = {
+        "M+": d.getMonth() + 1,
+        "d+": d.getDate(),
+        "h+": d.getHours(),
+        "m+": d.getMinutes(),
+        "s+": d.getSeconds(),
+        "q+": Math.floor((d.getMonth() + 3) / 3),
+        S: d.getMilliseconds(),
+      };
+      if (/(y+)/.test(_format))
+        _format = _format.replace(
+          RegExp.$1,
+          (d.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
+      for (const k in o)
+        if (new RegExp("(" + k + ")").test(_format))
+          _format = _format.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ?
+              o[k] :
+              ("00" + o[k]).substr(("" + o[k]).length)
+          );
+      return _format;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.send{
+  font-size: 24rpx !important;
+}
+.order-time {
+  margin-top: 15rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.wrapper {
+  height: auto !important;
+}
+
+.order-list {
+  display: flex;
+  color: black;
+  font-size: 20rpx;
+  font-weight: bold;
+  width: 95%;
+}
+
+.order-sn {
+  width: 350rpx;
+
+}
+
+.name-or-time {
+  width: 200rpx;
+  margin: 15rpx 15rpx;
+
+}
+
+
+.goods-card {
+  border-radius: 20rpx;
+  margin-top: 15rpx;
+  background-color: #ffffff;
+  padding-left: 12rpx;
+  width: 95%;
+  height: 120rpx;
+  display: flex;
+  flex-wrap: wrap;
+  color: #302c2b;
+
+
+
+  .image-box {
+    width: 122rpx;
+    height: 122rpx;
+    overflow: hidden;
+
+    .image {
+      width: 122rpx;
+      border-radius: 10rpx;
+    }
+  }
+
+  .goods-desc {
+    flex: 1;
+    overflow: hidden;
+    margin-left: 12rpx;
+    width: 400rpx;
+
+    .goods-desc-name {
+      font-size: 30rpx;
+      line-height: 1.5;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      margin-bottom: 20rpx;
+
+
+      .goods-card-goods-name {
+        color: black;
+        text-overflow: ellipsis;
+        font-size: 26rpx;
+        font-weight: bold;
+      }
+    }
+
+    .price {
+      margin-top: 50rpx;
+      line-height: 2;
+      margin-left: 5px;
+      font-size: 26rpx;
+      font-weight: 700;
+    }
+  }
+
+  .send-goods {
+    color: #ffffff;
+    height: 50rpx;
+    width: 130rpx;
+    background-color: #f21c0c;
+    font-size: 24rpx;
+    border-radius: 17rpx;
+    text-align: center;
+    line-height: 50rpx;
+    padding: 0 10rpx;
+    position: relative;
+    top: 20rpx;
+    right: 20rpx;
+  }
+}
+
+.cancel {
+  color: #737373;
+  position: relative;
+  bottom: 40rpx;
+  left: 12%;
+}
+
+.cart-message {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.bottom-dh-char {
+  background-color: #f9f9f9;
+  width: 750rpx;
+  height: 110rpx;
+}
+
+.user-name {
+  text-align: right;
+  font-size: 24rpx;
+  color: #737373;
+  margin-bottom: 10rpx;
+  margin-right: 10rpx;
+}
+
+.other-name {
+  text-align: left;
+  font-size: 24rpx;
+  color: #737373;
+  margin-bottom: 10rpx;
+  margin-left: 10rpx;
+}
+.dh-input {
+  width: 500rpx;
+  height: 65rpx;
+  border-radius: 30rpx;
+  padding-left: 15rpx;
+  font-size: 22rpx;
+  background-color: #FFFFFF;
+}
+.column-time {
+  justify-content: center;
+}
+
+
+
+.chat-img {
+  border-radius: 50%;
+  width: 100rpx;
+  height: 100rpx;
+  background-color: #f7f7f7;
+}
+
+.padding-chat {
+  padding: 17rpx 20rpx;
+}
+
+.tb-nv {
+  width: 50rpx;
+  height: 50rpx;
+}
+.goods-desc-rice{
+  font-size: 24rpx;
+  color: $main-color;
+  font-weight: bold;
+  margin-top: 10rpx;
+}
+.order-item{
+  margin: 10rpx 0
+}
+
+
+uni-page-head {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+}
+</style>
+
+<style lang="scss" scoped>
+@import "./index-app.scss";
+</style>
--- a/pages/mine/im/list.vue
+++ b/pages/mine/im/list.vue
@@ -0,0 +1,237 @@
+<template>
+  <view class="content">
+    <u-navbar class="my-title" title-size="32" :title="'消息(' + talkList.length + ')'"></u-navbar>
+    <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
+      
+      <!-- 消息列表 -->
+      <div class="iconBox">
+        <view class="icon-list">
+          <view class="icon-item" @click="cleanUnread()">
+            <div class="bag bag1">
+              <u-icon name="trash" size="50" color="#fff"></u-icon>
+            </div>
+            <view>清除未读</view>
+          </view>
+          <view class="icon-item" @click="navigateTo('/pages/tabbar/home/title')">
+            <div class="bag bag2">
+              <u-icon name="bell" size="50" color="#fff"></u-icon>
+            </div>
+            <view>系统消息</view>
+          </view>
+        </view>
+      </div>
+      <u-search class="nav-search" v-model="userName" clearabled @change="userTalkList()" placeholder="搜索用户"
+        :show-action="false"></u-search>
+      <view class="talk-view" :key="index" v-for="(item, index) in talkList">
+        <view>
+          <view @click="onclickToTalkInfo(item)">
+            <view class="talk-item-view">
+              <view class="talk-img">
+                <u-avatar :src="item.face" :text="item.face ? '' : item.name" bg-color="#DDDDDD"></u-avatar>
+              </view>
+              <view class="talk-info">
+                <view class="talk-name u-line-2">{{ item.name }}
+                  <u-tag class="talk-tag" size="mini" text="店铺" type="warning" v-if="item.storeFlag" />
+                </view>
+                <view class="talk-message">
+                  <span v-if="item.lastMessageType == 'MESSAGE'">{{ item.lastTalkMessage }}</span>
+                  <span v-if="item.lastMessageType == 'GOODS'">[商品链接]</span>
+                  <span v-if="item.lastMessageType == 'ORDER'">[订单信息]</span>
+                </view>
+              </view>
+              <view class="talk-time">
+                <view>
+                  {{ beautifyTime(item.lastTalkTime) }}
+                </view>
+                <view>
+                  <u-badge type="error" absolute :offset="[45, 20]" :count="item.unread"></u-badge>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 空白页 -->
+      <u-empty text="暂无信息" mode="list" v-if="talkList.length === 0"></u-empty>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { getTalkList, clearmeaager } from "@/api/im.js";
+import storage from "@/utils/storage.js";
+import { beautifyTime } from "@/utils/filters.js"
+export default {
+  data () {
+    return {
+      storage,
+      count: {
+        loadStatus: "more",
+      },
+      talkList: [], //聊天列表
+      userName: '',
+      pointData: {}, //累计获取 未输入 集合
+    };
+  },
+
+  onShow () {
+    this.userTalkList();
+  },
+  onPullDownRefresh () {
+    this.userTalkList()
+    console.log('下拉事件');
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+  /**
+   * 触底加载
+   */
+  onReachBottom () {
+    this.userTalkList();
+  },
+  methods: {
+    beautifyTime,
+    onclickToTalkInfo (val) {
+      storage.setTalkToUser(val)
+      uni.navigateTo({
+        url:
+          "/pages/mine/im/index?talkId=" + val.id,
+      });
+    },
+    /**
+     * 获取聊天列表
+     */
+    userTalkList () {
+      let params = {
+        userName: this.userName,
+      }
+      uni.showLoading({
+        title: "加载中",
+      });
+      getTalkList(params).then((res) => {
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
+        if (res.data.success) {
+          this.talkList = res.data.result;
+          console.log(this.talkList, 'this.talkListthis.talkList');
+        }
+      });
+    },
+    navigateTo (url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+    cleanUnread () {
+      clearmeaager().then((res) => {
+        console.log(res);
+        if (res.data.code == 200) {
+          this.userTalkList();
+          uni.showToast({
+            icon: "none",
+            title: res.data.message,
+          });
+        }
+      })
+    },
+  },
+};
+</script>
+  
+<style lang="scss" scoped>
+.talk-view {
+  border-radius: 20rpx;
+  background-color: #fff;
+
+  .talk-item-view {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    padding: 10rpx 20rpx;
+
+    .talk-img {
+      width: 100rpx;
+      height: 100rpx;
+      margin-right: 10rpx;
+      margin-bottom: 10rpx;
+    }
+
+    .talk-info {
+      padding-left: 30rpx;
+      flex: 1;
+
+      .talk-name {
+        font-size: 28rpx;
+        margin-bottom: 10rpx;
+        font-weight: bold;
+        color: #333333;
+      }
+
+      .talk-message {
+        font-size: 28rpx;
+        margin-top: 10rpx;
+        color: #888787;
+
+      }
+
+
+      .talk-tag {
+        margin-left: 10rpx;
+      }
+    }
+  }
+}
+
+.talk-time {
+  position: relative;
+}
+
+.iconBox {
+  width: 94%;
+  margin: 0 3%;
+  background: #fff;
+  border-radius: 20rpx;
+  box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);
+  // transform: translateY(-30rpx);
+}
+
+.icon-list {
+  height: 140rpx;
+  text-align: center;
+  font-size: $font-sm;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  padding: 0 3%;
+  color: #999;
+
+  .icon-item {
+    position: relative;
+    line-height: 2em;
+    width: 96rpx;
+
+    :first-child {
+      font-size: 48rpx;
+      margin-bottom: 10rpx;
+    }
+  }
+}
+
+.bag {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+
+.bag1 {
+  background: #ff0015;
+}
+
+.bag2 {
+  background: #73AF7C;
+}
+</style>
+<style lang="scss" scoped>
+@import "./index-app.scss";
+</style>
--- a/pages/mine/im/socket.js
+++ b/pages/mine/im/socket.js
@@ -0,0 +1,166 @@
+import config from '@/config/config.js'
+import storage from '@/utils/storage';
+class socketIO {
+  constructor(data, time, url) {
+    this.socketTask = null
+    this.is_open_socket = false //避免重复连接
+    this.url = config.baseWsUrl + '/' + storage.getAccessToken()  //连接地址
+    this.data = data ? data : null
+    this.connectNum = 1 // 重连次数
+    this.traderDetailIndex = 100 // traderDetailIndex ==2 重连
+    this.accountStateIndex = 100 // traderDetailIndex ==1 重连
+    this.followFlake = false // traderDetailIndex == true 重连
+    //心跳检测
+    this.timeout = time ? time : 15000 //多少秒执行检测
+    this.heartbeatInterval = null //检测服务器端是否还活着
+    this.reconnectTimeOut = null //重连之后多久再次重连
+  }
+  // 进入这个页面的时候创建websocket连接【整个页面随时使用】
+  connectSocketInit (data) {
+    this.data = data
+    this.socketTask = uni.connectSocket({
+      url: this.url,
+      success: () => {
+        console.log("正准备建立websocket中...");
+        // 返回实例
+        return this.socketTask
+      },
+    });
+    this.socketTask.onOpen((res) => {
+      this.connectNum = 1
+      console.log("WebSocket连接正常！");
+      this.send(data)
+      clearInterval(this.reconnectTimeOut)
+      clearInterval(this.heartbeatInterval)
+      this.is_open_socket = true;
+      this.start();
+      // 注：只有连接正常打开中 ，才能正常收到消息
+      this.socketTask.onMessage((e) => {
+        // 字符串转json
+        let res = JSON.parse(e.data);
+        console.log("res---------->", res) // 这里 查看 推送过来的消息
+        if (res.data) {
+          uni.$emit('getPositonsOrder', res);
+        }
+      });
+    })
+    // 监听连接失败，这里代码我注释掉的原因是因为如果服务器关闭后，和下面的onclose方法一起发起重连操作，这样会导致重复连接
+    uni.onSocketError((res) => {
+      console.log('WebSocket连接打开失败，请检查！');
+      this.socketTask = null
+      this.is_open_socket = false;
+      clearInterval(this.heartbeatInterval)
+      clearInterval(this.reconnectTimeOut)
+      uni.$off('getPositonsOrder')
+      if (this.connectNum < 6) {
+        uni.showToast({
+          title: `WebSocket连接失败，正尝试第${this.connectNum}次连接`,
+          icon: "none"
+        })
+        this.reconnect();
+        this.connectNum += 1
+      } else {
+        uni.$emit('connectError');
+        this.connectNum = 1
+      }
+    });
+    // 这里仅是事件监听【如果socket关闭了会执行】
+    this.socketTask.onClose(() => {
+      console.log("已经被关闭了-------")
+      clearInterval(this.heartbeatInterval)
+      clearInterval(this.reconnectTimeOut)
+      this.is_open_socket = false;
+      this.socketTask = null
+      uni.$off('getPositonsOrder')
+      if (this.connectNum < 6) {
+        this.reconnect();
+      } else {
+        uni.$emit('connectError');
+        this.connectNum = 1
+      }
+    })
+  }
+  // 主动关闭socket连接
+  Close () {
+    if (!this.is_open_socket) {
+      return
+    }
+    this.socketTask.close({
+      success () {
+        uni.showToast({
+          title: 'SocketTask 关闭成功',
+          icon: "none"
+        });
+      }
+    });
+  }
+  //发送消息
+  send (data) {
+    console.log("data---------->", data);
+    // 注：只有连接正常打开中 ，才能正常成功发送消息
+    if (this.socketTask) {
+      this.socketTask.send({
+        data: JSON.stringify(data),
+        async success () {
+          console.log("消息发送成功");
+        },
+      });
+    }
+  }
+  //开启心跳检测
+  start () {
+    this.heartbeatInterval = setInterval(() => {
+      this.send({
+        "traderid": 10260,
+        "type": "Ping"
+      });
+    }, this.timeout)
+  }
+  //重新连接
+  reconnect () {
+    //停止发送心跳
+    clearInterval(this.heartbeatInterval)
+    //如果不是人为关闭的话，进行重连
+    if (!this.is_open_socket && (this.traderDetailIndex == 2 || this.accountStateIndex == 0 || this
+      .followFlake)) {
+      this.reconnectTimeOut = setInterval(() => {
+        this.connectSocketInit(this.data);
+      }, 5000)
+    }
+  }
+  /**
+   * @description 将 scoket 数据进行过滤
+   * @param {array} array
+   * @param {string} type 区分 弹窗 openposition 分为跟随和我的
+   */
+  arrayFilter (array, type = 'normal', signalId = 0) {
+    let arr1 = []
+    let arr2 = []
+    let obj = {
+      arr1: [],
+      arr2: []
+    }
+    arr1 = array.filter(v => v.flwsig == true)
+    arr2 = array.filter(v => v.flwsig == false)
+    if (type == 'normal') {
+      if (signalId) {
+        arr1 = array.filter(v => v.flwsig == true && v.sigtraderid == signalId)
+        return arr1
+      } else {
+        return arr1.concat(arr2)
+      }
+    } else {
+      if (signalId > 0) {
+        arr1 = array.filter(v => v.flwsig == true && v.sigtraderid == signalId)
+        obj.arr1 = arr1
+      } else {
+        obj.arr1 = arr1
+      }
+      obj.arr2 = arr2
+      return obj
+    }
+  }
+}
+export {
+  socketIO
+}
--- a/pages/mine/msgTips/packageMsg/index.vue
+++ b/pages/mine/msgTips/packageMsg/index.vue
@@ -58,7 +58,7 @@ export default {
 			title:"加载中"
 		})
 		API_Message.getLogisticsMessages(this.params).then(async response => {
-			uni.hideLoading()
+			 if (this.$store.state.isShowToast){ uni.hideLoading() }
 		    const { data } = response
 		    if (!data || !data.length) {
 				this.messageList.push(...data.data)
--- a/pages/mine/msgTips/sysMsg/index.vue
+++ b/pages/mine/msgTips/sysMsg/index.vue
@@ -59,7 +59,7 @@ export default {
        title: "加载中"
      });
      API_Message.getMessages(this.params).then(async response => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        const { data } = response;
        if (!data || !data.length) {
          this.messageList.push(...data.data);
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -64,6 +64,7 @@
 <script>
 	import {
 		getGoodsCollection,
+		getStoreCollection,
 		deleteGoodsCollection,
 		deleteStoreCollection,
 	} from "@/api/members.js";
@@ -105,21 +106,34 @@
 				storeList: [], //店铺集合
 			};
 		},
-		onLoad() {
-			this.getGoodList();
-			this.getStoreList();
+		onShow() {
+			this.fetchReloadOrNextPage('reload')
 		},
 		onReachBottom() {
+			this.fetchReloadOrNextPage('next')
+		},
+
+		methods: {
+			// 刷新或者下一页
+			fetchReloadOrNextPage(type) {
+				if(type == 'next'){
+					this.navList[this.tabCurrentIndex].params.pageNumber ++;
 					if (this.tabCurrentIndex == 0) {
-				this.navList[0].params.pageNumber++;
 					this.getGoodList();
 					} else {
-				this.navList[1].params.pageNumber++;
+						this.getStoreList();
+					}
+				}
+				else{
+					this.navList[0].params.pageNumber = 1;
+					this.navList[1].params.pageNumber = 1;
+					this.goodList = [];
+					this.storeList = [];
+					this.getGoodList();
 					this.getStoreList();
 				}
 			},

-		methods: {
 			/**
 			 * 打开商品左侧取消收藏
 			 */
@@ -154,7 +168,7 @@
 			 * 点击店铺左侧取消收藏
 			 */
 			clickStoreSwiperAction(val) {
-				deleteStoreCollection(val.storeId).then((res) => {
+				deleteStoreCollection(val.id).then((res) => {
 					if (res.statusCode == 200) {
 						this.storeList = [];
 						this.getStoreList();
@@ -197,7 +211,7 @@
 					title: "加载中",
 				});
 				getGoodsCollection(this.navList[0].params, "GOODS").then((res) => {
-					uni.hideLoading();
+					 if (this.$store.state.isShowToast){ uni.hideLoading() };
 					uni.stopPullDownRefresh();
 					if (res.data.success) {
 						let data = res.data.result;
@@ -224,8 +238,8 @@
 				uni.showLoading({
 					title: "加载中",
 				});
-				getGoodsCollection(this.navList[1].params, "store").then((res) => {
-					uni.hideLoading();
+				getStoreCollection(this.navList[1].params, "STORE").then((res) => {
+					 if (this.$store.state.isShowToast){ uni.hideLoading() };
 					uni.stopPullDownRefresh();
 					if (res.data.success) {
 						let data = res.data.result;
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -1,24 +1,26 @@
 <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 class="myTracks-title" @click="navgaiteToStore(item)">{{item.storeName}}</view>
+			<view  v-if="item" v-for="(item, index) in trackList" :key="index">
+				<view class="myTracks-title" @click="navigateToStore(item)" v-if="item.storeName">{{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-group>
-            <view class="myTracks-item-img" @click.stop="navgaiteToDetail(item)">
+
+					<u-swipe-action style="width: 100%;" :show="item.show" :index="index" :key="item.id"
+						@click="delTracks" @open="open" :options="options">
+						<!-- 已失效商品 -->
+						<div class="myTracks-item lose-goods" v-if="!item.storeName && !item.goodsName && !item.price">
+							已失效商品 
+						</div>
+						<!-- 正常有效商品 -->
+						<view v-else class="myTracks-item">
+							<view class="myTracks-item-img" @click.stop="navigateToDetail(item)">
 								<image :src="item.thumbnail"></image>
 							</view>
-            <view class="myTracks-item-content" @click.stop="navgaiteToDetail(item)">
+							<view class="myTracks-item-content" @click.stop="navigateToDetail(item)">
 								<view class="myTracks-item-title">
 									{{ item.goodsName }}
 									<view class="myTracks-item-title-desc"> </view>
@@ -28,48 +30,41 @@
 								</view>
 							</view>
 						</view>
+					</u-swipe-action>
+
 				</view>
 				<view class="myTracks-divider"></view>

 			</view>
-      <uni-load-more :status="loadStatus"></uni-load-more>
-    </div>
-    <view v-if="editFlag">
-      <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-group>
-        </view>

-        <view>
-          <u-button type="warning"  @click="delAllTracks" class="myTracks-action-btn">
-            删除
-          </u-button>
-        </view>
-      </view>
-    </view>
+		</div>
+
 	</view>
 </template>

 <script>
-import { myTrackList, deleteHistoryListId } from "@/api/members.js";
+	import {
+		myTrackList,
+		deleteHistoryListId
+	} from "@/api/members.js";

-export default {
+	export default {
 		data() {
 			return {
-      edit: "编辑",
-      editFlag: false, //是否编辑
-      allChecked: false, //是否全选
-      loadStatus: "more", //底部下拉加载状态
+
 				whetherEmpty: false, //是否数据为空
 				params: {
 					pageNumber: 1,
 					pageSize: 10,
+					order: "desc",
+					sort: "updateTime",
 				},
-
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#dd524d'
+					}
+				}],
 				trackList: [], //足迹列表
 			};
 		},
@@ -78,12 +73,12 @@ export default {
 		 * 滑到底部加载下一页数据
 		 */
 		onReachBottom() {
-    if (this.loadStatus != "noMore") {
 			this.params.pageNumber++;
 			this.getList();
-    }
 		},
-  onLoad() {
+		onShow() {
+			this.params.pageNumber = 1
+			this.trackList = [];
 			this.getList();
 		},
 		onPullDownRefresh() {
@@ -94,44 +89,23 @@ export default {
 			/**
 			 * 导航到店铺
 			 */
-    navgaiteToStore(val) {
+			navigateToStore(val) {
 				uni.navigateTo({
 					url: "/pages/product/shopPage?id=" + val.storeId,
 				});
 			},
-
-    /**
-     * 设置右侧导航栏文本
-     */
-    setStyle(text) {
-      //导航按钮文本设置
-      let pages = getCurrentPages();
-      let page = pages[pages.length - 1];
-      // #ifdef APP-PLUS
-      let currentWebview = page.$getAppWebview();
-      let titleNView = currentWebview.getStyle().titleNView;
-      titleNView.buttons[0].text = text;
-      if (text == "完成") {
-        this.trackList.forEach((key) => {
-          key.history.forEach((item) => {
-            this.$set(item, "___isDel", false);
-          });
-        });
-      }
-      currentWebview.setStyle({
-        titleNView: titleNView,
-      });
-      // #endif
-      // #ifdef H5
-      // h5 临时方案
-      document.getElementsByClassName("uni-btn-icon")[1].innerText = text;
-      // #endif
+			open(index) {
+				// 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
+				// 原本为'false'，再次设置为'false'会无效
+				this.trackList[index].show = true;
+				this.trackList.map((val, idx) => {
+					if (index != idx) this.trackList[idx].show = false;
+				})
 			},
-
 			/**
 			 * 跳转详情
 			 */
-    navgaiteToDetail(item) {
+			navigateToDetail(item) {
 				uni.navigateTo({
 					url: "/pages/product/goods?id=" + item.id + "&goodsId=" + item.goodsId,
 				});
@@ -146,82 +120,31 @@ export default {
 				});
 				myTrackList(this.params).then((res) => {
 					uni.stopPullDownRefresh();
-        uni.hideLoading();
+					 if (this.$store.state.isShowToast){ uni.hideLoading() };
 					if (res.statusCode == 200) {
-          res.data.result &&
-            res.data.result.forEach((item) => {
-              item.___isDel = false;
+						res.data.result.records.length &&
+							res.data.result.records.forEach((item) => {
+								item.show = false;
 							});

-          let data = res.data.result;
+						let data = res.data.result.records;
 						if (data.total == 0) {
 							this.whetherEmpty = true;
-          } else if (data.total < 10) {
-            this.loadStatus = "noMore";
-            this.trackList.push(...data);
 						} else {
 							this.trackList.push(...data);
-            if (data.length < 10) this.loadStatus = "noMore";
 						}
 					}
 				});
 			},

-    /**
-     * 点击后判断是不是全选
-     */
-    
-    changeChecked(val) {
-      var opt = null;
-      const isCheckedAll = this.trackList.every((key) => {
-        key.___isDel == val.___isDel;  
-        opt = key.___isDel;
-        return opt;
-      });
-      if(opt){
-        this.allChecked = isCheckedAll;
-      }else{
-        this.allChecked = false;
-      }     
-    },
-
-    /**
-     * 右侧标签栏切换
-     */
-    changeRightBtn(e) {
-      if (!this.editFlag) {
-        this.edit = "完成";
-      } else {
-        this.edit = "编辑";
-      }
-      this.editFlag = !this.editFlag;
-    },
-
-    /**
-     * 点击全选按钮
-     */
-    checkedAllitem() {
-      //全选按钮
-      this.trackList.forEach((key) => {
-        this.$set(key, "___isDel", this.allChecked);
-      });
-    },

 			/**
 			 * 删除足迹
 			 */
-    delAllTracks() {
-      let way = [];
-      this.trackList.forEach((key) => {
-        if (key.___isDel) {
-          way.push(key.goodsId);
-        }
-      });
-      if (way.length == 0) return false;
-      deleteHistoryListId(way).then((res) => {
+			delTracks(index) {
+				deleteHistoryListId(this.trackList[index].goodsId).then((res) => {
 					if (res.data.code == 200) {
 						this.trackList = [];
-          this.allChecked = false;
 						this.getList();
 					} else {
 						uni.showToast({
@@ -233,16 +156,20 @@ export default {
 				});
 			},
 		},
-};
+	};
 </script>

 <style lang="scss" scoped>
-.myTracks {
+	.lose-goods{
+		color: $main-color;
+		padding-left: 50rpx !important;
+	}
+	.myTracks {
 		width: 100%;
 		padding-top: 2rpx;
-}
+	}

-.myTracks-title {
+	.myTracks-title {
 		width: 100%;
 		height: 110rpx;
 		padding-left: 20rpx;
@@ -254,18 +181,18 @@ export default {
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: flex;
-}
+	}

-.myTracks-items {
+	.myTracks-items {
 		padding-top: 2rpx;
 		align-items: center;
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: flex;
 		flex-direction: column;
-}
+	}

-.myTracks-item {
+	.myTracks-item {
 		width: 100%;
 		height: 226rpx;
 		padding-left: 20rpx;
@@ -278,63 +205,39 @@ export default {
 		display: -webkit-box;
 		display: -webkit-flex;
 		display: flex;
-}
+	}

-.myTracks-item-img {
+	.myTracks-item-img {
 		margin-right: 20rpx;
 		border-radius: 8rpx;
+
 		image {
 			width: 130rpx;
 			height: 130rpx;
 			border-radius: 8rpx;
 		}
-}
+	}

-.myTracks-item-title {
+	.myTracks-item-title {
 		font-size: 28rpx;
 		color: #333;
-}
+	}

-.myTracks-item-title-desc {
+	.myTracks-item-title-desc {
 		font-size: 28rpx;
 		color: #999;
-}
+	}

-.myTracks-item-price {
+	.myTracks-item-price {
 		font-size: 28rpx;
 		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;
-  height: 60rpx;
-  line-height: 60rpx;
-}

-.myTracks-divider {
+	.myTracks-divider {
 		width: 100%;
 		height: 20rpx;
-}
+	}

-
-
-.myTracks-action-check {
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
 </style>
--- a/pages/mine/point/myPoint.vue
+++ b/pages/mine/point/myPoint.vue
@@ -11,21 +11,21 @@
    <u-row class="portrait-box2">
      <u-col span="6" class="portrait-box2-col" :gutter="16">
        <text>累计获得：</text>
-        <text class="pcolor">{{ pointData.point || 0 }}</text>
+        <text class="pcolor">{{ pointData.totalPoint || 0 }}</text>
      </u-col>
      <u-col span="6" class="portrait-box2-col">
-        <text>未使用：</text>
-        <text class="pcolor">{{ pointData.variablePoint || 0 }}</text>
+        <text>剩余积分：</text>
+        <text class="pcolor">{{ pointData.point || 0 }}</text>
      </u-col>
    </u-row>

    <div class="point-list">
      <view class="point-item" v-for="(item, index) in pointList" :key="index">
        <view>
-          <view>{{ item.content }}</view>
+          <view class="point-label">{{ item.content }}</view>
          <view>{{ item.createTime}}</view>
        </view>
-        <view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
+        <view :class="[item.pointType == 'INCREASE' ? 'plus' : 'reduce']"><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
      </view>
      <uni-load-more :status="count.loadStatus"></uni-load-more>
    </div>
@@ -72,7 +72,7 @@ export default {
        title: "加载中",
      });
      getPointsData(params).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        if (res.data.success) {
          let data = res.data.result.records;
          if (data.length < 10) {
@@ -109,6 +109,14 @@ export default {
  font-size: 32rpx;
  font-weight: bold;
 }
+.plus{
+  color: $light-color;
+  font-weight: bold;
+}
+.reduce{
+  color: $weChat-color;
+  font-weight: bold;
+}

 .point-item {
  width: 100%;
@@ -150,7 +158,7 @@ export default {
    border-right: 1px solid $border-color-light;
  }
  .pcolor {
-    color: #4ebb9d;
+    color: $light-color;
  }
 }

@@ -168,7 +176,7 @@ export default {
 .portrait-box {
  background-color: $main-color;
  height: 250rpx;
-  background: linear-gradient(134deg, #28d094 2%, #1abc9c 98%);
+   background: linear-gradient(91deg, $light-color 1%, $aider-light-color 99%);
  border-radius: 20rpx 20rpx 0 0;
  margin: 20rpx 20rpx 0;
  position: relative;
@@ -212,5 +220,10 @@ export default {
  .point {
    font-size: 56rpx;
  }
+  
+}
+.point-label{
+    font-weight: bold;
+    margin-bottom: 10rpx;
 }
 </style>
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -7,6 +7,9 @@
      <!-- #ifdef APP-PLUS -->
      Version {{localVersion.version}}
      <!-- #endif -->
+	  <!-- #ifdef MP-WEIXIN -->
+	  小程序版本: {{localVersion.version}}  {{ localVersion.envVersion}}
+	  <!--  #endif -->
    </view>

    <!-- {{localVersion}} -->
@@ -16,10 +19,11 @@
      <u-cell-item title="功能介绍" @click="navigateTo('/pages/mine/set/versionFunctionList')"></u-cell-item>
      <u-cell-item title="检查更新" @click="checkUpdate"></u-cell-item>
      <!--  #endif -->
-      <u-cell-item title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=message')"></u-cell-item>
-      <u-cell-item title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=user')"></u-cell-item>
-      <u-cell-item title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=privacy')"></u-cell-item>
-      <u-cell-item title="关于我们" :border-bottom="false" @click="navigateTo('/pages/mine/help/tips?type=about')"></u-cell-item>
+	 
+      <u-cell-item title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=LICENSE_INFORMATION')"></u-cell-item>
+      <u-cell-item title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=USER_AGREEMENT')"></u-cell-item>
+      <u-cell-item title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=PRIVACY_POLICY')"></u-cell-item>
+      <u-cell-item title="关于我们" :border-bottom="false" @click="navigateTo('/pages/mine/help/tips?type=ABOUT')"></u-cell-item>

    </u-cell-group>

@@ -28,8 +32,8 @@
      <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')">《{{config.name}}用户协议》</view>
-        <view>CopyRight @{{config.name}} </view>
+        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=USER_AGREEMENT')">《{{config.name}}用户协议》</view>
+        <view>CopyRight ©{{config.name}} </view>
      </view>
    </view>
  </view>
@@ -74,6 +78,19 @@ export default {
      };
    });
    // #endif
+	
+	
+	// #ifdef MP-WEIXIN
+	const accountInfo = wx.getAccountInfoSync();
+	console.log("===========accountInfo==============");
+	console.log(accountInfo);
+	this.version_number = accountInfo.miniProgram.version // 小程序 版本号
+	this.localVersion = {
+	  versionCode: accountInfo.miniProgram.version.replace(/\./g, ""),
+	  version: accountInfo.miniProgram.version ,// 小程序 版本号,
+	  envVersion:accountInfo.miniProgram.envVersion, //判断小程序是开发版本还是release版本
+	};
+	// #endif
  },

  methods: {
--- a/pages/mine/set/feedBack.vue
+++ b/pages/mine/set/feedBack.vue
@@ -16,9 +16,9 @@
    <!-- 上传凭证 -->
    <div class="feedBack-box">
      <view class="opt-view">
-        <view class="img-title">上传凭证（最多5张）</view>
+        <view class="img-title">上传凭证（最多2张）</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="2" :show-progress="false"></u-upload>
        </view>
      </view>
    </div>
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -23,9 +23,10 @@
        <u-input v-model="form.___path" disabled @click="clickRegion" />
      </u-form-item>
      <view class="submit" @click="submit">保存</view>
+	    <view class="submit" @click="quiteLoginOut">退出登录</view>
    </u-form>

-    <m-city :provinceData="region" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4"></m-city>
+    <m-city :provinceData="region" headTitle="区域选择" ref="cityPicker" @funcValue="getPickerParentValue" pickerSize="4"></m-city>
  </view>
 </template>
 <script>
@@ -33,9 +34,9 @@ import { saveUserInfo } from "@/api/members.js";
 import { upload } from "@/api/common.js";
 import storage from "@/utils/storage.js";
 import uFormItem from "@/uview-ui/components/u-form-item/u-form-item.vue";
-import gkcity from "@/components/m-city/m-city.vue";
+import city from "@/components/m-city/m-city.vue";
 export default {
-  components: { uFormItem, "m-city": gkcity },
+  components: { uFormItem, "m-city": city },
  data() {
    return {
      lightColor: this.$lightColor, //高亮颜色
@@ -65,10 +66,17 @@ export default {
    };
  },
  methods: {
+	  /**
+	   * 退出登录
+	   */
+	  quiteLoginOut() {
+      this.$options.filters.quiteLoginOut();
+	  },
+	  
    /**
     * 选择地址回调
     */
-    getpickerParentValue(e) {
+    getPickerParentValue(e) {
      this.form.region = [];
      this.form.regionId = [];
      let name = "";
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -1,12 +1,13 @@
 <template>
 	<view class="box">
 		<view class="box-tips">
-      <h2>
+			<h2 class='h2'>
 				{{verificationTitle[validateFlage==false ? 0 : 1].title}}
 			</h2>
 			<view class="verification">{{verificationTitle[step].desc}}</view>
 		</view>
-    <u-form :model="codeForm" class="form" ref="validateCodeForm">
+		<view class="form">
+			<u-form :model="codeForm" ref="validateCodeForm">
 				<view v-if="!validateFlage">
 					<u-form-item label-width="120" label="手机号" prop="mobile">
 						<u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
@@ -14,12 +15,14 @@

 					<u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
 						<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>
+						<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="FIND_USER" />
+					<myVerification keep-running @send="verification" class="verification" ref="verification"
+						business="FIND_USER" />
 				</view>
 				<view v-if="validateFlage">
 					<u-form-item label-width="120" label="旧密码">
@@ -36,15 +39,22 @@
 				</view>
 			</u-form>
 		</view>
+	</view>
 </template>

 <script>
-import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
+	import {
+		sendMobile,
+		resetByMobile,
+		modifyPass
+	} from "@/api/login";

-import { md5 } from "@/utils/md5.js"; // md5
-import myVerification from "@/components/verification/verification.vue"; //验证
-import uuid from "@/utils/uuid.modified.js";
-export default {
+	import {
+		md5
+	} from "@/utils/md5.js"; // md5
+	import myVerification from "@/components/verification/verification.vue"; //验证
+	import uuid from "@/utils/uuid.modified.js";
+	export default {
 		components: {
 			myVerification,
 		},
@@ -52,8 +62,7 @@ export default {
 			return {
 				uuid,
 				validateFlage: false, //是否进行了手机号验证
-      verificationTitle: [
-        {
+				verificationTitle: [{
 						title: "安全验证",
 						desc: "请输入当前手机号进行安全验证",
 					},
@@ -72,28 +81,24 @@ export default {
 				newPassword: "", //新密码
 				password: "", //密码
 				tips: "", //提示
-      seconds: 60, // 60s等待时间
+				seconds: 69, // 60s等待时间

 				// 验证码登录校验
 				codeRules: {
-        mobile: [
-          {
+					mobile: [{
 						validator: (rule, value, callback) => {
 							return this.$u.test.mobile(value);
 						},
 						message: "手机号码不正确",
 						trigger: ["blur"],
-          },
-        ],
-        code: [
-          {
+					}, ],
+					code: [{
 						min: 4,
 						max: 6,
 						required: true,
 						message: "请输入验证码",
 						trigger: ["blur"],
-          },
-        ],
+					}, ],
 				},
 			};
 		},
@@ -104,14 +109,15 @@ export default {
 		watch: {
 			flage(val) {
 				if (val) {
+
 					if (this.$refs.uCode.canGetCode) {
 						uni.showLoading({
 							title: "正在获取验证码",
 						});
 						sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
-            uni.hideLoading();
+							 if (this.$store.state.isShowToast){ uni.hideLoading() };
 							// 这里此提示会被this.start()方法中的提示覆盖
-            if (res.data.code == 200) {
+							if (res.data.success) {
 								this.$refs.uCode.start();
 							} else {
 								uni.showToast({
@@ -119,8 +125,10 @@ export default {
 									duration: 2000,
 									icon: "none",
 								});
+								this.flage = false;
+								this.$refs.verification.getCode();
 							}
-          });
+						})
 					} else {
 						this.$u.toast("请倒计时结束后再发送");
 					}
@@ -176,7 +184,11 @@ export default {
 			codeChange(text) {
 				this.tips = text;
 			},
-    end() {},
+			end() {
+				
+				this.flage = false;
+					this.$refs.verification.getCode()
+			},

 			/**判断是否是当前用户的手机号 */
 			isUserPhone() {
@@ -198,7 +210,7 @@ export default {
 			getCode() {
 				if (this.isUserPhone()) {
 					if (this.tips == "重新获取") {
-          this.flage = true;
+						this.$refs.verification.error(); //发送
 					}
 					if (!this.$u.test.mobile(this.codeForm.mobile)) {
 						uni.showToast({
@@ -208,44 +220,58 @@ export default {
 						return false;
 					}
 					if (!this.flage) {
-          this.$refs.verification.hide();
+						this.$refs.verification.error(); //发送
 						return false;
 					}
 				}
 			},
 			start() {
 				this.$u.toast("验证码已发送");
-      this.flage = false;
+				this.flage = true;
+
+				this.$refs.verification.hide();
 			},
 		},
-};
+	};
 </script>
 <style lang="scss" scoped>
-@import url("../../../passport/login.scss");
-.u-form-item {
+	@import url("@/pages/passport/login.scss");
+
+	/deep/ .u-form-item {
 		margin: 40rpx 0;
-}
-.sendCode {
+	}
+
+	.sendCode {
 		/deep/ .u-form-item--right__content__slot {
 			display: flex;
 		}
-}
-page {
+	}
+
+	.h2 {
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+
+	page {
 		background: #fff;
-}
-.box {
+	}
+
+	.box {
 		padding: 80rpx 0;
 		border-radius: 20rpx;
-}
-.submit {
+	}
+
+	.submit {
 		background: $light-color;
-}
-.box-tips {
+	}
+
+	.box-tips {
 		margin: 0 72rpx;
-}
-.verification {
+	}
+
+	.verification {
 		font-size: 24rpx;
 		color: #999;
 		margin-top: 10rpx;
-}
+	}
 </style>
--- a/pages/mine/set/securityCenter/securityCenter.vue
+++ b/pages/mine/set/securityCenter/securityCenter.vue
@@ -2,6 +2,7 @@
  <view class="securityCenter">
    <u-cell-group>
      <u-cell-item title="修改密码" @click="navigateTo('/pages/mine/set/securityCenter/editPassword')"></u-cell-item>
+      <u-cell-item title="注销账户" @click="zhuxiao"></u-cell-item>
    </u-cell-group>
  </view>
 </template>
@@ -15,6 +16,35 @@ export default {
  },

  methods: {
+    zhuxiao(){
+
+      uni.showModal({
+        title: "警告",
+        content: "您确定要注销当前账号吗？",
+        confirmText: "确定注销",
+        confirmColor: "#FF0000",
+        cancelText: "取消",
+        success: (res) => {
+          if (res.confirm) {
+            uni.showModal({
+              title: "谨慎操作",
+              content: "再次向您确认，您确定要注销当前账号吗？",
+              confirmText: "坚持注销",
+              confirmColor: "#FF0000",
+              cancelText: "取消",
+              success: (res) => {
+                if (res.confirm) {
+                  uni.showToast({
+                    title: "您的注销申请已经提交，待管理员审核后。会自动注销当前账号",
+                    duration: 10000,
+                  });
+                }
+              },
+            });
+          }
+        },
+      });
+    },
    navigateTo(url) {
      uni.navigateTo({
        url: url,
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -1,10 +1,9 @@
 <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 width=140 height="140" shape="circle" :src="userInfo.face || userImage" mode="">
      </u-image>
      <view class="user-name">
-
        {{ userInfo.id ? userInfo.nickName || '' : '暂未登录'  }}
      </view>
      <u-icon color="#ccc" name="arrow-right"></u-icon>
@@ -16,28 +15,25 @@
      <!-- #ifdef APP-PLUS -->
      <u-cell-item title="清除缓存" :value="fileSizeString" @click="clearCache"></u-cell-item>
      <!-- #endif -->
+      <!-- #ifndef MP-WEIXIN -->
      <u-cell-item title="安全中心" @click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"></u-cell-item>
+      <!-- #endif -->
      <u-cell-item title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell-item>
      <!-- #ifndef H5 -->
      <!-- #endif -->
      <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>
+    <view class="submit" v-if="userInfo.id" @click="quiteLoginOut">退出登录</view>
  </view>
 </template>

 <script>
-import { logout } from "@/api/login";
-import storage from "@/utils/storage.js";
 import config from "@/config/config";
 export default {
  data() {
    return {
      config,
-      lightColor: this.$lightColor,
-      quitShow: false,
+      userImage:config.defaultUserPhoto,
      isCertificate: false,
      userInfo: {},
      fileSizeString: "0B",
@@ -53,28 +49,14 @@ export default {
        url: url,
      });
    },
-    clear() {
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-      this.$options.filters.navigateToLogin("redirectTo");
+     /**
+	   * 退出登录
+	   */
+	  quiteLoginOut() {
+      this.$options.filters.quiteLoginOut();
 	  },
  
-    /**
-     * 确认退出
-     * 清除缓存重新登录
-     */
-    async confirm() {
-      await logout();
-      this.clear();
-    },

-    /**
-     * 显示退出登录对话框
-     */
-    showModalDialog() {
-      this.quitShow = true;
-    },

    /**
     * 读取当前缓存
@@ -106,11 +88,7 @@ export default {
      if (this.$options.filters.isLogin("auth")) {
        this.navigateTo("/pages/mine/set/personMsg");
      } else {
-        uni.showToast({
-          title: "当前暂无用户请登录后重试",
-          duration: 2000,
-          icon: "none",
-        });
+        this.$options.filters.tipsToLogin();
      }
    },

--- a/pages/navigation/search/search.scss
+++ b/pages/navigation/search/search.scss
@@ -22,19 +22,6 @@
  }
 }

-.promotion {
-  margin-top: 4rpx;
-  display: flex;
-  div {
-    span {
-      font-size: 24rpx;
-      color: $light-color;
-      margin-right: 10rpx;
-      padding: 0 4rpx;
-      border-radius: 2rpx;
-    }
-  }
-}
 .status_bar {
  height: var(--status-bar-height);
  background: #fff !important;
@@ -437,180 +424,13 @@ view {
      margin-left: 4rpx;
      font-size: 26rpx;
      color: #888;
-
-    
    }

    .xia {
      transform: scaleY(-1);
    }
  }
-
-  .cate-item {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    width: 80rpx;
-    position: relative;
-    font-size: 44rpx;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      border-left: 1px solid #ddd;
-      width: 0;
-      height: 36rpx;
-    }
-  }
 }
-
-/* 分类 */
-.cate-mask {
-  position: fixed;
-  left: 0;
-  top: var(--window-top);
-  bottom: 0;
-  width: 100%;
-  background: rgba(0, 0, 0, 0);
-  z-index: 95;
-  transition: 0.3s;
-
-  .cate-content {
-    width: 630rpx;
-    height: 100%;
-    background: #fff;
-    float: right;
-    transform: translateX(100%);
-    transition: 0.3s;
-  }
-
-  &.none {
-    display: none;
-  }
-
-  &.show {
-    background: rgba(0, 0, 0, 0.4);
-
-    .cate-content {
-      transform: translateX(0);
-    }
-  }
-}
-
-.cate-list {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-
-  .cate-item {
-    display: flex;
-    align-items: center;
-    height: 90rpx;
-    padding-left: 30rpx;
-    font-size: 28rpx;
-    color: #555;
-    position: relative;
-  }
-
-  .two {
-    height: 64rpx;
-    color: #303133;
-    font-size: 30rpx;
-    background: #f8f8f8;
-  }
-}
-.price-box {
-  margin-top: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-right: 10rpx;
-  font-size: 24rpx;
-  color: $font-color-light;
-}
-
-.price {
-  font-size: 26rpx;
-  line-height: 1;
-  color: $main-color;
-  font-weight: bold;
-  /deep/ span:nth-of-type(1) {
-    font-size: 38rpx;
-  }
-}
-/* 商品列表 */
-.goods-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 10rpx 20rpx 284rpx;
-
-
-  // background: #fff;
-  width: 100%;
-  .goods-item {
-    background-color: #ffffff;
-    display: flex;
-    border-radius: 16rpx;
-    flex-direction: column;
-    width: calc(50% - 30rpx);
-    margin-bottom: 20rpx;
-    padding-bottom: 20rpx;
-
-    &:nth-child(2n + 1) {
-      margin-right: 20rpx;
-    }
-
-    .goods-detail {
-      margin: 0 20rpx;
-    }
-  }
-
-  .image-wrapper {
-    width: 100%;
-    height: 330rpx;
-    border-radius: 16rpx 16rpx 0 0;
-    overflow: hidden;
-    padding: 0;
-    image {
-      width: 100%;
-      height: 100%;
-      opacity: 1;
-      border-radius: 16rpx 16rpx 0 0;
-    }
-  }
-
-  .title {
-    font-size: $font-base;
-    color: $font-color-dark;
-    line-height: 1.5;
-    height: 84rpx;
-    padding: 10rpx 0 0;
-    display: -webkit-box;
-
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  .count-config,
-  .store-seller-name {
-    font-size: $font-sm;
-  }
-
-  .text-hidden {
-    
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
 .status_bar {
  height: var(--status-bar-height);
  width: 100%;
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -1,41 +1,43 @@
 <template>
 	<view class="content">
 		<u-navbar :background="navObj" :is-back="false">
-      <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>
+			<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">
 			<scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
 				<block v-for="(row, index) in keywordList" :key="index">
 					<view class="keyword-entry" hover-class="keyword-entry-tap">
-            <view class="keyword-text" @tap.stop="doSearch(keywordList[index].words)">
-              <rich-text :nodes="row.words"></rich-text>
-            </view>
+						<view class="keyword-text" @tap.stop="doSearch(keywordList[index].words)"><rich-text :nodes="row.words"></rich-text></view>
 					</view>
 				</block>
 			</scroll-view>
 			<div class="keyword-box" v-show="!isShowKeywordList">
 				<view class="keyword-block add1">
-          <view class="keyword-list-header">
-            <view class="u-tips">热门搜索</view>
-          </view>
+					<view class="keyword-list-header"><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>
+					<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)">
-              <span>{{ keyword }} </span>
+						<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 @click="showMore" v-if="oldKeywordIndex > loadIndex" class="oldKeyItem">展示更多</div>
 					</div>
 				</view>

@@ -50,13 +52,11 @@
 					<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>
@@ -65,13 +65,11 @@
 					<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,113 +78,32 @@
 			</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="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>
-                  <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>
-
-            </div>
-          </div>
+				<scroll-view
+					:style="{ height: goodsHeight }"
+					enableBackToTop="true"
+					lower-threshold="250"
+					@scrolltolower="loadmore()"
+					scroll-with-animation
+					scroll-y
+					class="scoll-page"
+				>
+					<goodsList :res="goodsList" type="oneColumns" :keyword="keyword" />
 					<uni-load-more :status="loadingType" @loadmore="loadmore()"></uni-load-more>
 				</scroll-view>
 			</div>
-      <div class="empty" v-if="goodsList == [] || goodsList == '' || goodsList == null">
-        <view>
-          <image style="width: 320rpx; height: 240rpx" src="/static/nodata.png">
-
-          </image>
-        </view>
-        <view>
-          <p>没有找到相关的商品信息</p>
-          <p>请换一个关键词试试吧</p>
-        </view>
-      </div>
-
 			<!-- 一行两个商品展示 -->
-      <div v-if="
-          !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">
-          <view class="goods-list">
-            <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" @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>
-                <div class="count-config" @click="navigateToDetailPage(item)">
-                  <span>已售 {{ item.content.buyCount || "0" }}</span>
-                  <span>{{ item.content.commentNum || "0" }}条评论</span>
-                </div>
-                <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>
-                  </span>
-                </div>
-              </view>
-            </view>
-          </view>
+			<div v-if="!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"
+				>
+					<goodsList :res="goodsList" :keyword="keyword" />
 					<uni-load-more :status="loadingType"></uni-load-more>
 				</scroll-view>
 			</div>
@@ -197,13 +114,15 @@
 			<view class="sort-box  ">
 				<view class="sort-list">
 					<view class="sort-item">
-            <view class="sort-title"> 品牌 </view>
+						<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-radius" :class="{
-                    'sort-active': brand.__selected,
-                  }">
+							<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
+									}"
+								>
 									{{ brand.name }}
 								</view>
 							</view>
@@ -211,14 +130,20 @@
 						<!-- <u-empty v-else text="暂无品牌" mode="list"></u-empty> -->
 					</view>
 					<view class="sort-item">
-            <view class="sort-title"> 全部分类 </view>
+						<view class="sort-title">全部分类</view>
 						<view class="flex" style="flex-wrap: wrap;" v-if="sortData.categories">
-              <view class="sort-brand-item" :key="categoriesIndex"
+							<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,
-                  }">
+								@click="handleSort(categoryId, categoriesIndex, 'categoryId')"
+							>
+								<view
+									class="sort-radius"
+									:class="{
+										'sort-active': categoryId.__selected
+									}"
+								>
 									{{ categoryId.name }}
 								</view>
 							</view>
@@ -228,18 +153,14 @@
 				</view>
 				<view class="sort-list">
 					<view class="sort-item">
-            <view class="sort-title"> 价格区间 </view>
+						<view class="sort-title">价格区间</view>
 						<view style="display:flex;  margin-top:20rpx;    align-items: center;">
 							<view class="sort-brand-item uinput">
-                <view class="sort-radius">
-                  <u-input v-model="minPrice" type="number" placeholder="最低价" input-align="center" />
-                </view>
+								<view class="sort-radius"><u-input v-model="minPrice" type="number" placeholder="最低价" input-align="center" /></view>
 							</view>
 							<view>-</view>
 							<view class="sort-brand-item uinput">
-                <view class="sort-radius">
-                  <u-input v-model="maxPrice" type="number" placeholder="最高价" input-align="center" />
-                </view>
+								<view class="sort-radius"><u-input v-model="maxPrice" type="number" placeholder="最高价" input-align="center" /></view>
 							</view>
 						</view>
 					</view>
@@ -247,13 +168,15 @@

 				<view class="sort-list" v-if="sortData.paramOptions">
 					<view class="sort-item" :key="paramIndex" v-for="(param, paramIndex) in sortData.paramOptions">
-            <view class="sort-title"> {{ param.key }} </view>
+						<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-radius" :class="{
-                    'sort-active': value.__selected,
-                  }">
+							<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
+									}"
+								>
 									{{ value.title }}
 								</view>
 							</view>
@@ -268,53 +191,61 @@
 				</view>
 			</view>
 		</u-popup>
+		<div class="empty" v-if="empty">
+			<view><image style="width: 320rpx; height: 240rpx" src="/static/nodata.png"></image></view>
+			<view>
+				<p>没有找到相关的商品信息</p>
+				<p>请换一个关键词试试吧</p>
+			</view>
+		</div>
 		<u-back-top :scroll-top="scrollTop"></u-back-top>
 	</view>
 </template>

 <script>
-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";
+import { getGoodsList, getGoodsRelated } from '@/api/goods.js';
+import goodsList from '@/components/m-goods-list/list.vue';
+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 {
+			empty: false,
 			scrollTop: 0,
 			loadIndex: 10,
-      oldKeywordIndex: "",
+			oldKeywordIndex: 0,
 			selectedWay: {
 				brand: [],
 				categoryId: [],
-        prop: [],
+				prop: []
 			},

 			sortPopup: false, //筛选的开关
 			navObj: {
-        background: "#fff",
+				background: '#fff'
 			},
 			typeSortData: {
-        type: "",
-        index: "",
+				type: '',
+				index: ''
 			},
-      goodsHeight: "",
-      defaultKeyword: "",
-      keyword: "",
+			goodsHeight: '',
+			defaultKeyword: '',
+			keyword: '',
 			oldKeywordList: [],
 			hotKeywordList: [],
 			keywordList: [],
 			goodsList: [],

 			cateMaskState: 0, //分类面板展开状态
-      loadingType: "more", //加载更多状态
+			loadingType: 'more', //加载更多状态
 			filterIndex: 0,
 			cateId: 0, //已选三级分类id
 			priceOrder: 0, //1 价格从低到高 2价格从高到低
 			cateList: [],
 			isShowSeachGoods: false,
 			isShowKeywordList: false,
-      sortData: "",
+			sortData: '',
 			isSWitch: false,

 			params: {
@@ -322,10 +253,10 @@ export default {
 				pageSize: 10,
 				// sort: 'grade_asc',

-        keyword: "",
+				keyword: ''
 			},
-      minPrice: "",
-      maxPrice: "",
+			minPrice: '',
+			maxPrice: '',
 			sortParams: {
 				pageNumber: 1,
 				pageSize: 10,
@@ -333,12 +264,13 @@ export default {
 				// price: "", //价格,示例值(10_30)
 				// prop: "", //属性:参数名_参数值@参数名_参数值,示例值(屏幕类型_LED@屏幕尺寸_15英寸)
 				// brandId:"", //品牌,可以多选 品牌Id@品牌Id@品牌Id
-        categoryId: "",
+				categoryId: ''
 			},

-      routerVal: "",
+			routerVal: ''
 		};
 	},
+
 	onPageScroll(e) {
 		console.log(e);
 		this.scrollTop = e.scrollTop;
@@ -355,9 +287,9 @@ export default {
 			this.params.categoryId = this.routerVal.category;
 			this.sortParams.categoryId = this.routerVal.category;
 			this.isShowSeachGoods = true;
-      this.$nextTick(()=>{
+			this.$nextTick(() => {
 				this.$refs.mSearch.isShowSeachGoods = true;
-      })
+			});
 		}
 		if (this.routerVal.keyword) {
 			this.params.keyword = this.routerVal.keyword;
@@ -367,10 +299,19 @@ export default {
 			this.params.storeId = this.routerVal.storeId;
 			this.isShowSeachGoods = true;
 		}
+		if (this.routerVal.promotionType) {
+			this.params.promotionType = this.routerVal.promotionType;
+			this.isShowSeachGoods = true;
+		}
+		if (this.routerVal.promotionsId) {
+			this.params.promotionsId = this.routerVal.promotionsId;
+			this.isShowSeachGoods = true;
+		}
 		this.loadData();
 	},
 	components: {
 		mSearch,
+		goodsList
 	},
 	watch: {
 		/**
@@ -382,15 +323,14 @@ export default {
 					this.defaultKeyword = val;
 				}
 			} else {
-        this.defaultKeyword = "请输入搜索商品";
+				this.defaultKeyword = '请输入搜索商品';
 			}
 		},
 		sortPopup(val) {
 			if (val) {
 				this.selectedWay = { brand: [], categoryId: [], prop: [] };
-        console.log(this.selectedWay);
 			}
-    },
+		}
 	},

 	onReachBottom() {
@@ -405,34 +345,30 @@ export default {
 		let navHeight = 0;

 		uni.getSystemInfo({
-      success: function (res) {
+			success: function(res) {
 				// res - 各种参数

-        let top = uni.createSelectorQuery().select(".u-navbar");
-        top
-          .boundingClientRect(function (data) {
+				let top = uni.createSelectorQuery().select('.u-navbar');
+				top.boundingClientRect(function(data) {
 					if (data && data.height) {
 						//data - 各种参数
 						topHeight = data.height; // 获取元素宽度
 					}
-          })
-          .exec();
-        let nav = uni.createSelectorQuery().select(".navbar");
-        nav
-          .boundingClientRect(function (data) {
+				}).exec();
+				let nav = uni.createSelectorQuery().select('.navbar');
+				nav.boundingClientRect(function(data) {
 					if (data && data.height) {
 						//data - 各种参数
 						navHeight = data.height; // 获取元素宽度
 					}
-          })
-          .exec();
-      },
+				}).exec();
+			}
 		});
 		this.goodsHeight = windowHeight - navHeight - topHeight;
 		// #ifdef APP-PLUS
 		this.goodsHeight = this.goodsHeight - 100;
 		// #endif
-    this.goodsHeight += "px";
+		this.goodsHeight += 'px';
 	},

 	methods: {
@@ -440,24 +376,15 @@ export default {
 		getPromotion(item) {
 			if (item.promotionMap) {
 				let array = [];
-        Object.keys(item.promotionMap).forEach((child) => {
-          if (!array.includes(child.split("-")[0])) {
-            array.push(child.split("-")[0]);
+				Object.keys(item.promotionMap).forEach(child => {
+					if (!array.includes(child.split('-')[0])) {
+						array.push(child.split('-')[0]);
 					}
 				});

 				return array;
 			}
 		},
-
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
 		// 展示更多数据
 		showMore() {
 			this.loadOldKeyword(this.oldKeywordIndex);
@@ -473,18 +400,17 @@ export default {
 			}

 			// 如果选中品牌 赋值
-      this.selectedWay["brand"].forEach((item) => {
+			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;
+			if (this.selectedWay['categoryId'][0]) {
+				this.params.categoryId = this.selectedWay['categoryId'][0].value;
 			}
 			if (!this.params.prop) {
 				this.params.prop = [];
@@ -492,12 +418,12 @@ export default {
 				this.params.prop = [this.params.prop];
 			}

-      this.selectedWay["prop"].forEach((item) => {
+			this.selectedWay['prop'].forEach(item => {
 				if (item.__selected) {
 					this.params.prop.push(`${item.parent}_${item.title}`);
 				}
 			});
-      this.params.prop = this.params.prop.join("@");
+			this.params.prop = this.params.prop.join('@');
 			// 处理价格
 			if (this.minPrice || this.maxPrice) {
 				this.params.price = `${this.minPrice}_${this.maxPrice}`;
@@ -510,7 +436,6 @@ export default {
 			this.params.pageNumber = 1;
 			this.sortParams = this.params;

-     
 			this.loadData();
 			this.sortPopup = false;
 		},
@@ -520,16 +445,16 @@ export default {
 			this.sortParams = {
 				pageNumber: 1,
 				pageSize: 10,
-        categoryId: this.routerVal.category || "",
+				categoryId: this.routerVal.category || ''
 			};
 			this.sortPopup = false;
 			this.initSortGoods();
-      this.minPrice = "";
-      this.maxPrice = "";
+			this.minPrice = '';
+			this.maxPrice = '';
 			this.params = {
 				pageNumber: 1,
 				pageSize: 10,
-        categoryId: this.routerVal.category || "",
+				categoryId: this.routerVal.category || ''
 			};
 			this.goodsList = [];
 			this.loadData();
@@ -537,12 +462,12 @@ export default {

 		// 点击筛选的内容
 		handleSort(val, index, type, parent) {
-      if (type == "prop") {
+			if (type == 'prop') {
 				val.parent = parent.key;
 			}
 			this.selectedWay[type].push(val);
-      if (type == "categoryId") {
-        this.sortData.categories.forEach((item) => {
+			if (type == 'categoryId') {
+				this.sortData.categories.forEach(item => {
 					item.__selected = false;
 				});
 				val.__selected = true;
@@ -562,19 +487,19 @@ export default {
 		},
 		back() {
 			uni.navigateBack({
-        delta: 1,
+				delta: 1
 			});
 		},
 		// 跳转到商品详情
 		navigateToDetailPage(item) {
 			uni.navigateTo({
-        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+				url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`
 			});
 		},
 		// 跳转地址
 		navigateToStoreDetailPage(item) {
 			uni.navigateTo({
-        url: `/pages/product/shopPage?id=${item.content.storeId}`,
+				url: `/pages/product/shopPage?id=${item.storeId}`
 			});
 		},
 		loadmore() {
@@ -582,17 +507,17 @@ export default {
 			this.loadData();
 		},
 		initSortGoods() {
-      getGoodsRelated(this.sortParams).then((res) => {
+			getGoodsRelated(this.sortParams).then(res => {
 				if (res.data.success) {
 					for (let item of Object.keys(res.data.result)) {
-            res.data.result[item].forEach((child) => {
+						res.data.result[item].forEach(child => {
 							child.__selected = false;

 							// 循环出和品牌分类一样的数据格式
 							if (child.values) {
-                child.values = child.values.map((item) => ({
+								child.values = child.values.map(item => ({
 									title: item,
-                  __selected: false,
+									__selected: false
 								}));
 							}
 						});
@@ -612,30 +537,28 @@ export default {
 			this.params.pageSize = 10;
 			// this.params.order = "desc";
 			if (this.params.sort == type) {
-        this.params.order == "asc"
-          ? (this.params.order = "desc")
-          : (this.params.order = "asc");
+				this.params.order == 'asc' ? (this.params.order = 'desc') : (this.params.order = 'asc');

-        this.$set(this.params, "sort", type);
+				this.$set(this.params, 'sort', type);
 			} else {
-        this.params.order = "desc";
-        this.$set(this.params, "sort", type);
+				this.params.order = 'desc';
+				this.$set(this.params, 'sort', type);
 			}

 			if (index == 0) {
-        this.params.sort = "releaseTime";
-        this.params.order = "desc";
+				this.params.sort = 'releaseTime';
+				this.params.order = 'desc';
 			}

 			this.filterIndex = index;

 			uni.pageScrollTo({
 				duration: 300,
-        scrollTop: 0,
+				scrollTop: 0
 			});
-      this.loadData("refresh", 1);
+			this.loadData('refresh', 1);
 			uni.showLoading({
-        title: "正在加载",
+				title: '正在加载'
 			});
 		},
 		//加载默认搜索关键字
@@ -648,21 +571,21 @@ export default {
 				//
 				this.defaultKeyword = this.hotKeywordList[0];
 			} else {
-        this.defaultKeyword = "请输入搜索商品";
+				this.defaultKeyword = '请输入搜索商品';
 			}
 		},
 		//加载历史搜索,自动读取本地Storage
 		loadOldKeyword(index) {
 			this.oldKeywordList = [];
 			uni.getStorage({
-        key: "OldKeys",
-        success: (res) => {
+				key: 'OldKeys',
+				success: res => {
 					var OldKeys = JSON.parse(res.data);
-          this.oldKeywordIndex = res.data.length;
+					this.oldKeywordIndex = OldKeys.length;
 					for (let i = 0; i < index; i++) {
 						this.oldKeywordList.push(OldKeys[i]);
 					}
-        },
+				}
 			});
 		},

@@ -673,27 +596,24 @@ export default {
 		 */
 		async loadHotKeyword() {
 			this.hotKeywordList = [];
-      if (
-        !storage.getHotWords().time ||
-        storage.getHotWords().time <= new Date().getTime() / 1000
-      ) {
+			if (!storage.getHotWords().time || storage.getHotWords().time <= new Date().getTime() / 1000) {
 				// 没有缓存或者第一次进入请求接口保存缓存
 				let res = await getHotKeywords(10);
 				let keywords = res.data.result;

-        keywords.forEach((item) => {
+				keywords.forEach(item => {
 					this.hotKeywordList.push(item);
 				});

 				let hotData = {
 					time: new Date().getTime() / 1000 + 30 * 5,
-          keywords: keywords,
+					keywords: keywords
 				};
 				storage.setHotWords(hotData);
 			} else {
 				let keywords = storage.getHotWords().keywords;

-        keywords.forEach((item) => {
+				keywords.forEach(item => {
 					this.hotKeywordList.push(item);
 				});
 			}
@@ -701,19 +621,22 @@ export default {
 		},
 		//加载商品 ，带下拉刷新和上滑加载
 		async loadData(type, loading) {
-      this.loadingType = "loading";
-      if (type == "refresh") {
+			this.loadingType = 'loading';
+			if (type == 'refresh') {
 				this.goodsList = [];
 			}
 			//没有更多直接返回 #TODO
 			let goodsList = await getGoodsList(this.params);
-
-      if (goodsList.data.result.content.length < 10) {
-        this.loadingType = "noMore";
+			if (goodsList.data.result.records.length < 10) {
+				this.loadingType = 'noMore';
+				this.empty = true;
+			} else {
+				this.empty = false;
 			}
-      this.goodsList.push(...goodsList.data.result.content);
+			this.goodsList.push(...goodsList.data.result.records);
+			
 			this.initSortGoods();
-      uni.hideLoading();
+			 if (this.$store.state.isShowToast){ uni.hideLoading() };
 		},

 		//高亮关键字
@@ -723,14 +646,11 @@ export default {
 			for (var i = 0; i < len; i++) {
 				var row = keywords[i];
 				//定义高亮#9f9f9f
-        var html = row[0].replace(
-          keyword,
-          "<span style='color: #9f9f9f;'>" + keyword + "</span>"
-        );
-        html = "<div>" + html + "</div>";
+				var html = row[0].replace(keyword, "<span style='color: #9f9f9f;'>" + keyword + '</span>');
+				html = '<div>' + html + '</div>';
 				var tmpObj = {
 					keyword: row[0],
-          htmlStr: html,
+					htmlStr: html
 				};
 				keywordArr.push(tmpObj);
 			}
@@ -743,15 +663,15 @@ export default {
 		//清除历史搜索
 		oldDelete() {
 			uni.showModal({
-        content: "确定清除历史搜索记录？",
-        success: (res) => {
+				content: '确定清除历史搜索记录？',
+				success: res => {
 					if (res.confirm) {
 						this.oldKeywordList = [];
 						uni.removeStorage({
-              key: "OldKeys",
+							key: 'OldKeys'
 						});
 					}
-        },
+				}
 			});
 		},

@@ -759,6 +679,9 @@ export default {
 		doSearchSwitch() {
 			this.isSWitch = !this.isSWitch;
 			this.isShowSeachGoods = true;
+			this.params.pageNumber = 1;
+			this.params.pageSize = 10;
+			this.loadData('refresh', 1);
 		},

 		/**
@@ -774,25 +697,27 @@ export default {
 				 * 第一次搜索如果没有关键词会将热门搜索中第一个热词进行判定
 				 * 如果没有热词则会展示一个空词搜索
 				 */
-        keyword = (this.hotKeywordList.length && this.hotKeywordList[0]) || "";
+				keyword = (this.hotKeywordList.length && this.hotKeywordList[0]) || '';
 			}
-      this.defaultKeyword == "请输入搜索商品" ? (keyword = "") : "";
-      // this.keyword = keyword;
-      keyword ? (this.keyword = keyword) : "";
+			this.defaultKeyword == '请输入搜索商品' ? (keyword = '') : '';
+			
+		
+			keyword ? (this.keyword = keyword) : '';
 			this.saveKeyword(keyword); //保存为历史
 			this.isShowSeachGoods = true;
 			this.$refs.mSearch.isShowSeachGoods = true;
+			this.$refs.mSearch.inputVal = keyword;
 			this.params.keyword = this.keyword;
 			this.params.pageNumber = 1;
-      this.$set(this.sortParams, "keyword", keyword);
-      this.loadData("refresh", 1);
+			this.$set(this.sortParams, 'keyword', keyword);
+			this.loadData('refresh', 1);
 		},
 		//保存关键字到历史记录
 		saveKeyword(keyword) {
 			if (!keyword) return false;
 			uni.getStorage({
-        key: "OldKeys",
-        success: (res) => {
+				key: 'OldKeys',
+				success: res => {
 					var OldKeys = JSON.parse(res.data);
 					var findIndex = OldKeys.indexOf(keyword);
 					if (findIndex == -1) {
@@ -805,24 +730,24 @@ export default {
 					OldKeys.length > 10 && OldKeys.pop();

 					uni.setStorage({
-            key: "OldKeys",
-            data: JSON.stringify(OldKeys),
+						key: 'OldKeys',
+						data: JSON.stringify(OldKeys)
 					});
 					this.oldKeywordList = OldKeys; //更新历史搜索
 				},
-        fail: (e) => {
+				fail: e => {
 					var OldKeys = [keyword];
 					uni.setStorage({
-            key: "OldKeys",
-            data: JSON.stringify(OldKeys),
+						key: 'OldKeys',
+						data: JSON.stringify(OldKeys)
 					});
 					this.oldKeywordList = OldKeys; //更新历史搜索
-        },
+				}
 			});
-    },
-  },
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
-@import "./search.scss";
+@import './search.scss';
 </style>
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -1,31 +1,54 @@
 <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>
+      <u-search
+        placeholder="请输入订单编号"
+        @search="submitSearchOrderList(current)"
+        @clear="submitSearchOrderList(current)"
+        @custom="submitSearchOrderList(current)"
+        v-model="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">
+      <view
+        class="seller-view"
+        v-for="(order, orderIndex) in orderList"
+        :key="orderIndex"
+      >
        <!-- 店铺名称 -->
        <view class="seller-info u-flex u-row-between" v-if="current == 0">
          <view class="seller-name">
            <view class="name">{{ order.storeName }}</view>
          </view>
-          <view class="order-sn">订单编号:{{order.sn}}</view>
+          <view class="order-sn">订单编号:{{ order.sn }}</view>
        </view>
        <!-- 申请记录 选项卡 -->
        <view class="seller-info u-flex u-row-between" v-if="current != 0">
-          <view class="order-sn">售后单号：{{ order.service_sn || order.sn }}</view>
+          <view class="order-sn"
+            >售后单号：{{ order.service_sn || order.sn }}</view
+          >
          <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(order,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>
+              <u-image
+                border-radius="6"
+                width="100%"
+                height="100%"
+                :src="sku.image"
+              ></u-image>
            </view>
            <view class="goods-info">
              <view class="goods-title u-line-2">{{ sku.name }}</view>
@@ -38,80 +61,139 @@
              <view>x{{ sku.num }}</view>
            </view>
          </view>
-          <view class="btn-view u-flex u-row-between">
          <view class="description">
            <!-- 售后申请  -->
-              <view v-if="
-                  current === 0 &&  order.groupAfterSaleStatus &&
-                 order.groupAfterSaleStatus.includes('ALREADY_APPLIED') 
-                " class="cannot_apply">
+            <view v-if="current === 0 && sku.afterSaleStatus">
+              <view
+                v-if="sku.afterSaleStatus.includes('ALREADY_APPLIED')"
+                class="cannot_apply not_center"
+              >
                <u-icon class="icon" name="info-circle-fill"></u-icon>
                该商品已申请售后服务
              </view>
-              <view class="cannot_apply"
-                v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('EXPIRED')  "
-                @click="tipsShow = true">
+            </view>
+            <view v-if="current === 0 && sku.afterSaleStatus">
+              <view
+                v-if="sku.afterSaleStatus.includes('EXPIRED')"
+                class="cannot_apply not_center"
+                @click="tipsShow = true"
+              >
                <u-icon class="icon" name="info-circle-fill"></u-icon>
                该商品无法申请售后
              </view>
+            </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 not_center"
+                v-if="order.serviceType == 'RETURN_GOODS'"
+              >
+                退货处理-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'"
+              >
+                补发商品-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'RETURN_MONEY'"
+              >
+                退款-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'EXCHANGE_GOODS'"
+              >
+                换货-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'CANCEL'"
+              >
+                取消订单-{{ order.serviceStatus | serviceStatusList }}</view
+              >
            </div>

            <!-- 申请记录 -->
          </view>
+          <view class="btn-view u-flex u-row-right">
            <!-- 售后申请  -->
-              <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 class="sale" v-if="current === 0 && sku.afterSaleStatus">
+              <div
+                v-if="
+									order.flowPrice != 0 &&
+                  sku.afterSaleStatus.includes('NOT_APPLIED') ||
+                  sku.afterSaleStatus.includes('PART_AFTER_SALE')
+                "
+                @click="applyService(sku.sn, order, sku)"
+              >
+                <view class="default-btn border"> 申请售后 </view>
+              </div>
            </div>
            <view class="after-line">
-
              <!-- 申请中 -->
-              <view class="default-btn border" v-if="
+              <view
+                class="default-btn border"
+                v-if="
                  current === 2 &&
                  order.serviceStatus &&
                  order.serviceStatus == 'PASS' &&
                  order.serviceType != 'RETURN_MONEY'
-                " @click="onExpress(order, sku)">
+                "
+                @click="onExpress(order, sku)"
+              >
                提交物流
              </view>
-              <view @click="close(order,sku)" v-if="current === 1" class="default-btn close">
+              <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
+                @click="afterDetails(order, sku)"
+                v-if="current === 1 || current === 2"
+                class="default-btn border"
+              >
                售后详情
              </view>
            </view>
          </view>
        </view>
-        <view v-if="
-            current === 0 && order.groupAfterSaleStatus &&
+        <view
+          v-if="
+            current === 0 &&
+            order.groupAfterSaleStatus &&
            order.groupAfterSaleStatus != 'ALREADY_APPLIED' &&
            order.orderItems.length >= 1
-          " class="btn-view u-flex u-row-between">
+          "
+          class="btn-view u-flex u-row-between"
+        >
          <!-- 多个商品显示订单总价格 -->
          <view class="cannot_apply">
-            订单总金额:<span class="countMoney">￥{{ order.flowPrice | unitPrice }}</span>
+            订单总金额:<span class="countMoney"
+              >￥{{ order.flowPrice | unitPrice }}</span
+            >
          </view>
        </view>
      </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>
+    <u-modal
+      show-cancel-button
+      @confirm="closeService"
+      v-model="cancelShow"
+      content="确认取消售后"
+    ></u-modal>
+    <u-modal
+      v-model="tipsShow"
+      content="当订单未确认收货|已过售后服务有效期|已申请售后服务时，不能申请售后"
+    ></u-modal>
  </view>
 </template>

@@ -148,7 +230,7 @@ export default {
        pageNumber: 1,
        pageSize: 10,
        sort: "createTime",
-        flowPrice:  1,
+        flowPrice: 0,
        order: "desc",
      },

@@ -157,21 +239,27 @@ export default {
        pageSize: 10,
      },
      status: "loadmore",
+      orderSn: "", // 搜索订单sn
    };
  },
  onLoad(options) {
    this.orderList = [];
    this.params.pageNumber = 1;
    if (options.orderSn) this.params.orderSn = options.orderSn;
-    this.getOrderList(this.current);
+    this.searchOrderList(this.current);
  },
  onPullDownRefresh() {
    this.change(this.current);
  },
  methods: {
-    handleGetOrderList(current) {
+    /**
+     * 点击搜索执行搜索
+     */
+    submitSearchOrderList(current) {
+      this.params.pageNumber = 1;
+      this.logParams.pageNumber = 1;
      this.orderList = [];
-      this.getOrderList(current);
+      this.searchOrderList(current);
    },
    /**
     * 切换tab页时，初始化数据
@@ -184,8 +272,18 @@ export default {
      };
      this.orderList = [];
      //如果是2 则读取售后申请记录列表
+      this.searchOrderList(index);
+      uni.stopPullDownRefresh();
+    },
+
+    /**
+     * 搜索初始化
+     * 根据当前tab传值的索引进行更改
+     */
+    searchOrderList(index) {
      if (index == 0) {
-        this.getOrderList(index);
+        this.orderSn ? (this.params.orderSn = this.orderSn) : "";
+        this.getOrderList();
      } else {
        this.logParams = {
          pageNumber: 1,
@@ -196,22 +294,22 @@ export default {
        if (index === 1) {
          this.logParams.serviceStatus = "APPLY";
        }
+        this.orderSn ? (this.logParams.orderSn = this.orderSn) : "";
        this.orderList = [];
        this.getAfterSaleLogList();
      }
-      uni.stopPullDownRefresh();
    },

    /**
     * 获取订单列表
     */
-    getOrderList(index) {
+    getOrderList() {
      uni.showLoading({
        title: "加载中",
        mask: true,
      });
      getOrderList(this.params).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        const orderList = res.data.result.records;
        if (orderList.length > 0) {
          this.orderList = this.orderList.concat(orderList);
@@ -245,9 +343,9 @@ export default {
        });
      }
      this.orderList = [];
-      this.getOrderList(this.current);
+      this.searchOrderList(this.current);

-      uni.hideLoading();
+       if (this.$store.state.isShowToast){ uni.hideLoading() };
    },

    /**
@@ -307,6 +405,10 @@ export default {
     */
    onExpress(order, sku) {
      sku.storeName = order.storeName;
+      let data = {
+        ...order,
+        ...sku,
+      };

      storage.setAfterSaleData(data);
      uni.navigateTo({
@@ -361,31 +463,38 @@ page,
  overflow-y: auto;
  height: calc(100vh - 44px - 80rpx - 104rpx);
 }
+
 .u-tabs-search {
  padding: 20rpx;
  background: #fff;
 }
+
 .countMoney {
  margin-left: 7rpx;
  color: $main-color;
  font-size: 28rpx;
 }
+
 .seller-view {
  background-color: #fff;
  margin: 20rpx 0rpx;
  padding: 0rpx 20rpx;
  border-radius: 20rpx;
+
  .seller-info {
    height: 70rpx;
+
    .seller-name {
      font-size: 28rpx;
      display: flex;
      flex-direction: row;
+
      .name {
        margin-left: 15rpx;
        margin-top: -2rpx;
      }
    }
+
    .order-sn {
      font-size: 22rpx;
      color: #909399;
@@ -429,6 +538,7 @@ page,
      color: $main-color;
    }
  }
+
  .btn-view {
    padding: 16rpx 0;

@@ -438,10 +548,12 @@ page,
    }
  }
 }
+
 .description {
  color: #909399;
  size: 25rpx;
 }
+
 .cannot_apply {
  text-align: center;
  font-size: 22rpx;
@@ -450,6 +562,10 @@ page,
  height: 70rpx;
  line-height: 70rpx;
 }
+.not_center {
+  text-align: left;
+}
+
 .icon {
  margin-right: 10rpx;
 }
@@ -459,6 +575,7 @@ page,
  display: flex;
  justify-content: flex-end;
 }
+
 .default-btn {
  background-color: #ffffff;
  margin-left: 15rpx;
@@ -469,9 +586,11 @@ page,
  padding: 0 24rpx;
  border-radius: 200px;
 }
+
 .close {
  color: $light-color;
 }
+
 .border {
  border: 2rpx solid $light-color;
  color: $light-color;
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -224,7 +224,7 @@ export default {
          this.reasonList = action;
        }
      });
-      uni.hideLoading();
+       if (this.$store.state.isShowToast){ uni.hideLoading() };
    },
    //打开地区选择器
    showCitySelect() {
@@ -288,7 +288,7 @@ export default {
      this.form.applyRefundPrice = this.applyInfo.applyRefundPrice;

      applyReturn(this.sn, this.form).then((resp) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        if (resp.data.success) {
          this.$refs.uToast.show({ title: "提交成功", type: "success" });
          uni.redirectTo({
@@ -335,12 +335,6 @@ export default {
            type: "error",
          });
          return false;
-        } else if (checkBankno(this.form.bankAccountNumber) === false) {
-          this.$refs.uToast.show({
-            title: "银行卡卡号不正确",
-            type: "error",
-          });
-          return false;
        } else if (this.$u.test.chinese(this.form.bankAccountName) === false) {
          this.$refs.uToast.show({
            title: "银行开户名输入错误",
--- a/pages/order/afterSales/afterSalesDetailExpress.vue
+++ b/pages/order/afterSales/afterSalesDetailExpress.vue
@@ -128,7 +128,7 @@ export default {
      });
      delete this.form.courierCompany;
      fillShipInfo(this.serviceDetail.sn, this.form).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        if (res.statusCode === 200) {
          this.$refs.uToast.show({
            title: "提交成功",
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -352,7 +352,7 @@ export default {
        title: "加载中",
      });
      getServiceDetail(this.sn).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        this.serviceDetail = res.data.result;
        if (
          this.serviceDetail.serviceType == "RETURN_GOODS" ||
--- a/pages/order/complain/complain.vue
+++ b/pages/order/complain/complain.vue
@@ -45,13 +45,13 @@
      <view class="cell-item">
        <view class="cell-title"> 投诉凭证 </view>
        <view class="cell-view">
-          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }" upload-text=""  :action="action" width="100" @on-uploaded="onUploaded" :max-count="5">
+          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }"   :action="action" width="200" @on-uploaded="onUploaded" :max-count="5">
          </u-upload>
        </view>
      </view>
    </view>

-    <view class="submit-btn" @click="handleSumit">提交</view>
+    <view class="submit-btn" @click="handleSubmit">提交</view>
  </view>
 </template>

@@ -109,7 +109,15 @@ export default {
    /**
     * 提交
     */
-    handleSumit() {
+    handleSubmit() {
+      if(!this.images.length && !this.complainValue){
+        uni.showToast({
+          title:'请上传图片凭证和投诉内容',
+          icon:'none'
+        })
+        return
+
+      }
      // 循环出商品
      let goods = this.orderGoodsList.filter((item) => {
        return item.skuId == this.skuId;
@@ -170,7 +178,7 @@ export default {
        this.order = order.order;
        this.orderGoodsList = order.orderItems;
        this.orderDetail = res.data.result;
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },

--- a/pages/order/complain/complainInfo.vue
+++ b/pages/order/complain/complainInfo.vue
@@ -49,11 +49,13 @@ export default {
    return {
      complainDetail: "", //投诉详情
      statusData: {
+         NEW: "新投诉",
        NO_APPLY: "未申请",
        APPLYING: "申请中",
-        COMPLETE: "已完成，此时可申请",
-        EXPIRED: "已失效，不可申请",
+        COMPLETE: "已完成",
+        EXPIRED: "已失效",
        CANCEL: "已取消",
+        WAIT_ARBITRATION:"等待仲裁"
      },
    };
  },
@@ -93,7 +95,7 @@ export default {
            icon: "none",
          });
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
  },
--- a/pages/order/complain/complainList.vue
+++ b/pages/order/complain/complainList.vue
@@ -48,12 +48,13 @@ export default {
  data() {
    return {
      statusData: {
-        NEW: "新订单",
+        NEW: "新投诉",
        NO_APPLY: "未申请",
        APPLYING: "申请中",
        COMPLETE: "已完成",
        EXPIRED: "已失效",
        CANCEL: "已取消",
+        WAIT_ARBITRATION:"等待仲裁"
      },
      show: false,
      content: "是否撤销投诉？",
@@ -139,7 +140,7 @@ export default {
        } else {
          this.empty = true;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },
  },
--- a/pages/order/evaluate/evaluateDetail.vue
+++ b/pages/order/evaluate/evaluateDetail.vue
@@ -3,7 +3,7 @@
    <view class="exaluate-member-view">
      <view class="member-view">
        <view class="member-img">
-          <u-image width="82rpx" style="border: 1px solid #ededed" height="82rpx" shape="circle" :src="comment.memberProfile || '/static/missing-face.png'"></u-image>
+          <u-image width="82rpx" style="border: 1px solid #ededed" height="82rpx" shape="circle" :src="comment.memberProfile || userImage"></u-image>
        </view>
        <view class="member-info">
          <view class="memName">{{ comment.memberName }}</view>
@@ -41,9 +41,13 @@
 </template>

 <script>
+import configs from '@/config/config'
 export default {
  data() {
    return {
+      configs,
+      userImage:configs.defaultUserPhoto,
+
      comment: {}, //评论信息
      gradeList: {
        //评价grade
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -202,7 +202,7 @@ export default {
        title: "加载中",
      });
      getOrderList(this.params).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        const orderList = res.data.result.records;
        if (orderList.length < 10) {
          this.params.loadStatus = "noMore";
@@ -234,7 +234,7 @@ export default {
        title: "加载中",
      });
      getComments(this.params).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        let orderList = res.data.result.records;
        if (orderList.length < 10) {
          this.params.loadStatus = "noMore";
--- a/pages/order/evaluate/releaseEvaluate.vue
+++ b/pages/order/evaluate/releaseEvaluate.vue
@@ -137,7 +137,7 @@ export default {
        title: "加载中",
      });
      commentsMemberOrder(this.form).then((res) => {
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        if (res.data.success) {
          uni.showToast({
            title: "发布评价成功",
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -1,7 +1,11 @@
 <template>
  <div class="wrapper">
    <!-- 选择地址 -->
-    <div class="address-box" @click="clickToAddress()">
+    <div
+      class="address-box"
+      @click="clickToAddress()"
+      v-if="shippingText == 'LOGISTICS' && orderMessage.cartTypeEnum != 'VIRTUAL'"
+    >
      <div class="user-box flex">
        <div class="flex-8">
          <div v-if="!address.id">请选择地址</div>
@@ -10,7 +14,10 @@
              <!-- 省市区 -->
              <div class="flex flex-a-c">
                <span class="default" v-if="address.isDefault">默认</span>
-                <div class="address-list" v-if="address.consigneeAddressPath.length != 0">
+                <div
+                  class="address-list"
+                  v-if="address.consigneeAddressPath.length != 0"
+                >
                  <span
                    class="address-item"
                    v-for="(item, index) in address.consigneeAddressPath"
@@ -37,6 +44,29 @@
      <!-- 背景 -->
      <div class="bar"></div>
    </div>
+    <!-- 选择自提点 -->
+    <div class="address-box" v-if="shippingText == 'SELF_PICK_UP'">
+      <div @click="clickToStoreAddress()">
+        <div class="user-box flex">
+          <div class="flex-8">
+            <div v-if="storeAddress">
+              <div class="user-address">
+                <!-- 自提点地址 -->
+                <div class="user-address-detail wes-2">
+                  {{ storeAddress.address }}
+                </div>
+                <!-- 联系手机号 -->
+                <div></div>
+              </div>
+            </div>
+            <div v-else>请选择自提点</div>
+          </div>
+          <u-icon name="arrow-right" style="color: #bababa"></u-icon>
+        </div>
+        <!-- 背景 -->
+        <div class="bar"></div>
+      </div>
+    </div>

    <!-- 开团信息 -->
    <view class="group-box" v-if="isAssemble">
@@ -55,7 +85,7 @@
            class="head-img"
            width="81rpx"
            height="81rpx"
-            :src="masterWay.face || '/static/missing-face.png'"
+            :src="masterWay.face || userImage"
          ></u-image>
          <view class="btn-one">团长</view>
        </view>
@@ -80,7 +110,7 @@
            v-else
            width="81rpx"
            height="81rpx"
-            :src="endWay.face || '/static/missing-face.png'"
+            :src="endWay.face || userImage"
          ></u-image>

          <view class="wait">{{ endWay.nickname || "等待参团" }}</view>
@@ -89,14 +119,23 @@
    </view>

    <!-- 店铺商品信息 -->
-    <div class="box box2" v-for="(item, index) in orderMessage.cartList" :key="index">
+    <div
+      class="box box2"
+      v-for="(item, index) in orderMessage.cartList"
+      :key="index"
+    >
+      <div v-if="item.checked">
        <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="flex goods-item"
+          v-for="(val, i) in item.checkedSkuList"
+          :key="i"
+        >
          <div
            class="goods-image"
            @click="
@@ -134,16 +173,28 @@
            </div>
            <p class="goods-prices">
              <span>￥</span>
-            <span class="goods-price">{{ formatPrice(val.goodsSku.price)[0] }}</span>
-            <span>.{{ formatPrice(val.goodsSku.price)[1] }}</span>
+              <span class="goods-price">{{
+                $options.filters.goodsFormatPrice(val.purchasePrice)[0]
+              }}</span>
+              <span
+                >.{{
+                  $options.filters.goodsFormatPrice(val.purchasePrice)[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()">
+          <u-col
+            :span="8"
+            class="tipsColor"
+            textAlign="right"
+            @click.native="invoice()"
+          >
            <span v-if="receiptList"
-            >{{ receiptList.receiptTitle }} - {{ receiptList.receiptContent }}</span
+              >{{ receiptList.receiptTitle }} -
+              {{ receiptList.receiptContent }}</span
            >
            <span v-else>不开发票</span>
          </u-col>
@@ -170,7 +221,9 @@
          </u-col>
        </u-row>
        <u-row>
-        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
+          <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"
@@ -180,42 +233,67 @@
          </u-col>
        </u-row>
      </div>
+    </div>

    <!-- 发票信息 -->
-    <invoices :res="receiptList" @callbackInvoice="callbackInvoice" v-if="invoiceFlag" />
-    <u-select v-model="shippingFlag" :list="shippingMethod"></u-select>
+    <invoices
+      :res="receiptList"
+      @callbackInvoice="callbackInvoice"
+      v-if="invoiceFlag"
+    />
+    <u-select
+      @confirm="confirmDistribution"
+      v-model="shippingFlag"
+      v-if="shippingMethod.length != 0"
+      :list="shippingMethod"
+    ></u-select>

    <div class="box box5" v-if="orderMessage.priceDetailDTO">
      <div>
        <u-row>
          <u-col :span="9">商品合计</u-col>
          <u-col :span="3" textAlign="right">
-            <span>￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}</span>
+            <span
+              >￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}</span
+            >
          </u-col>
        </u-row>
      </div>
      <div>
-        <u-row>
-          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
+        <u-row v-if="shippingText == 'LOGISTICS'">
+          <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-if="orderMessage.priceDetailDTO.freightPrice == 0"
+              >包邮</span
+            >
            <span v-else
-              >￥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }}</span
+              >￥{{
+                orderMessage.priceDetailDTO.freightPrice | unitPrice
+              }}</span
            >
          </u-col>
        </u-row>
      </div>
-      <u-row>
+      <u-row
+        v-if="
+          orderMessage.priceDetailDTO.goodsPrice != 0 &&
+          orderMessage.priceDetailDTO.goodsPrice != null
+        "
+      >
        <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
-
        <u-col
          :span="3"
-          v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice"
+          v-if="
+            orderMessage.priceDetailDTO &&
+            orderMessage.priceDetailDTO.couponPrice
+          "
          textAlign="right"
          @click="GET_Discount()"
        >
@@ -239,8 +317,8 @@
          >
            <span class="main-color">
              -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
-            ></u-col
            >
+          </u-col>
          <u-col :span="3" textAlign="right" v-else>0.00</u-col>
        </u-row>
      </div>
@@ -249,7 +327,9 @@
          <u-col :span="6">活动优惠</u-col>
          <u-col :span="6" class="tr tipsColor" textAlign="right">
            <span v-if="orderMessage.priceDetailDTO.discountPrice"
-              >-￥{{ orderMessage.priceDetailDTO.discountPrice | unitPrice }}</span
+              >-￥{{
+                orderMessage.priceDetailDTO.discountPrice | unitPrice
+              }}</span
            >
            <span v-else>0.00</span>
          </u-col>
@@ -275,9 +355,17 @@
        <div v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
          <span>¥</span>
          <span class="price">{{
-            formatPrice(orderMessage.priceDetailDTO.flowPrice)[0]
+            $options.filters.goodsFormatPrice(
+              orderMessage.priceDetailDTO.flowPrice
+            )[0]
          }}</span>
-          <span>.{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} </span>
+          <span
+            >.{{
+              $options.filters.goodsFormatPrice(
+                orderMessage.priceDetailDTO.flowPrice
+              )[1]
+            }}
+          </span>
        </div>
        <span v-else class="number"
          ><span style="margin-right: 10rpx">{{
@@ -302,9 +390,9 @@ import * as API_Trade from "@/api/trade";
 import * as API_Address from "@/api/address";
 import * as API_Order from "@/api/order";
 import invoices from "@/pages/order/invoice/setInvoice";
-
+import { mapState } from "vuex";
 import LiLiWXPay from "@/js_sdk/lili-pay/wx-pay.js";
-
+import configs from "@/config/config";
 export default {
  onLoad: function (val) {
    this.routerVal = val;
@@ -313,20 +401,27 @@ export default {
    invoices,
  },

-  watch: {},
  data() {
    return {
+      configs,
+      userImage: configs.defaultUserPhoto,
      invoiceFlag: false, //开票开关
      shippingText: "LOGISTICS",
      shippingFlag: false,
-      shippingMethod: [
+      shippingMethod: [],
+      shippingWay: [
        {
          value: "LOGISTICS",
          label: "物流",
        },
+        {
+          value: "SELF_PICK_UP",
+          label: "自提",
+        },
      ],
      isAssemble: false, //是否拼团
-      couponNums: "", //结算页面优惠券数量
+      // 判断是否填写过备注
+      remarkFlag: false,
      selectAddressId: "",
      routerVal: "",
      params: {},
@@ -334,6 +429,7 @@ export default {
      couponList: "",
      // 已选地址
      address: "",
+      shopAddress: "",
      // 发票信息
      receiptList: "",
      // 店铺信息
@@ -341,14 +437,29 @@ export default {
      data: "",
      // 存储备注
      remarkVal: [],
+      remarkVal1: "",
      detail: "", //返回的所有数据
      endWay: "", //最后一个参团人
      masterWay: "", //团长信息
      pintuanFlage: true, //是开团还是拼团
      notSupportFreight: [], //不支持运费
      notSupportFreightGoodsList: ["以下商品超出配送范围："],
+      storeAddress: "",
    };
  },
+  watch: {
+    // 监听备注 并在 vuex 中存储
+    remarkVal: {
+      handler(val) {
+        this.$store.commit("setRemark", val);
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  computed: {
+    ...mapState(["remark"]),
+  },
  filters: {
    /**
     * 发票收据类型
@@ -379,7 +490,7 @@ export default {
          item.route == "pages/tabbar/cart/cartList" ||
          item.route.indexOf("pages/product/goods") != -1
        ) {
-          uni.redirectTo({
+          uni.navigateTo({
            url: item.route,
          });
        }
@@ -396,12 +507,19 @@ export default {
    }
  },

-  onShow() {
+  async onShow() {
+    // 判断是否存在写过备注信息的商品
+    if (this.remark && this.remark.length > 0) {
+      this.remarkFlag = true;
+    }
    uni.showLoading({
      mask: true,
    });
-    this.getOrderList();
+    await this.getOrderList();
+    await this.getDistribution();
+    if (this.$store.state.isShowToast) {
      uni.hideLoading();
+    }
    if (this.routerVal.way == "PINTUAN") {
      this.isAssemble = true;
      this.routerVal.parentOrder = JSON.parse(
@@ -413,13 +531,6 @@ 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;
@@ -448,7 +559,14 @@ 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)
+        )}`
+      );
+    },
+    clickToStoreAddress() {
+      this.navigateTo(
+        `/pages/mine/address/storeAddress?from=cart&way=${this.routerVal.way}&storeId=${this.remarkVal[0].storeId}`
      );
    },

@@ -483,9 +601,11 @@ export default {
        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;
+        let storeMemberCouponsId = Object.keys(
+          this.orderMessage.storeCoupons
+        )[0];
+        let storeCouponId =
+          this.orderMessage.storeCoupons[storeMemberCouponsId].memberCoupon.id;
        selectedCoupon.push(storeCouponId);
      }
      this.orderMessage.cartList.forEach((item) => {
@@ -522,6 +642,16 @@ export default {
    createTradeFun() {
      // 防抖
      this.$u.throttle(() => {
+        if (this.shippingText === "SELF_PICK_UP") {
+          if (!this.storeAddress.id) {
+            uni.showToast({
+              title: "请选择提货点",
+              duration: 2000,
+              icon: "none",
+            });
+            return false;
+          }
+        } else if (this.shippingText === "LOGISTICS" && this.orderMessage.cartTypeEnum != 'VIRTUAL') {
          if (!this.address.id) {
            uni.showToast({
              title: "请选择地址",
@@ -530,6 +660,8 @@ export default {
            });
            return false;
          }
+        }
+
        //  创建订单
        let client;
        // #ifdef H5
@@ -565,7 +697,7 @@ export default {
            });
            // 如果当前价格为0跳转到订单列表
            if (this.orderMessage.priceDetailDTO.billPrice == 0) {
-              uni.redirectTo({
+              uni.navigateTo({
                url: "/pages/order/myOrder?status=0",
              });
            } else {
@@ -608,30 +740,80 @@ export default {
      // 如果没有商品选择地址的话 则选择 默认地址
      API_Address.getAddressDefault().then((res) => {
        if (res.data.result) {
-          res.data.result.consigneeAddressPath = res.data.result.consigneeAddressPath.split(
-            ","
-          );
+          res.data.result.consigneeAddressPath =
+            res.data.result.consigneeAddressPath.split(",");
          this.address = res.data.result;
        }
      });
    },
+    // 获取配送列表
+    async getDistribution() {
+      let shopRes = await API_Trade.shippingMethodList({
+        way: this.routerVal.way,
+      });
+      let shopList;
+      if (shopRes.data.success) {
+        shopList = shopRes.data.result;
+        let way = [];
+        console.log(shopList);
+        this.shippingWay.forEach((item) => {
+          shopList.forEach((child) => {
+            if (item.value == child) {
+              way.push(item);
+            }
+          });
+        });
+        this.shippingMethod = way;
+      }
+    },
+
+    // 选择配送
+    async confirmDistribution(val) {
+      let res = await API_Trade.setShipMethod({
+        shippingMethod: val[0].value,
+        way: this.routerVal.way,
+      });
+
+      this.shippingText = val[0].value;
+      if (res.data.success) {
+        this.getOrderList();
+      }
+    },

    // 获取结算参数
-    getOrderList() {
+    async getOrderList() {
      this.notSupportFreight = [];
      // 获取结算参数
      API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
+        if (
+          !res.data.result.checkedSkuList ||
+          res.data.result.checkedSkuList.length === 0
+        ) {
+          uni.switchTab({
+            url: "/pages/tabbar/cart/cartList",
+          });
+        }
        if (res.data.result.skuList.length <= 0) {
-          uni.redirectTo({
+          uni.navigateTo({
            url: "/pages/order/myOrder?status=0",
          });
        }
+
+        let repeatData;
        res.data.result.cartList.forEach((item, index) => {
-          this.remarkVal[index] = {
-            remark: item.remark,
+          // 如果已经写过备注信息的话赋值
+          repeatData = {
+            remark: this.remarkFlag
+              ? this.remark[index].storeId == item.storeId
+                ? this.remark[index].remark
+                : item.remark
+              : item.remark,
            storeId: item.storeId,
          };
+
+          this.$set(this.remarkVal, index, repeatData);
        });
+
        this.orderMessage = res.data.result;
        /**
         * 为了避免路径传值在h5中超出限制问题
@@ -640,16 +822,18 @@ export default {
        this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
        this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;

-        if (!res.data.result.memberAddress.id) {
+        if (!res.data.result.memberAddress) {
          // 获取会员默认地址
          this.getUserAddress();
        } else {
          this.address = res.data.result.memberAddress;
-          res.data.result.memberAddress.consigneeAddressPath = res.data.result.memberAddress.consigneeAddressPath.split(
-            ","
-          );
+          res.data.result.memberAddress.consigneeAddressPath =
+            res.data.result.memberAddress.consigneeAddressPath.split(",");
+        }
+        if (res.data.result.storeAddress) {
+          this.storeAddress = res.data.result.storeAddress;
+          console.log("storeAddress", this.storeAddress);
        }
-
        if (
          res.data.result.notSupportFreight &&
          res.data.result.notSupportFreight.length != 0
@@ -669,7 +853,7 @@ export default {
 </script>
 <style scoped>
 page {
-  background: #ededed !important;
+  background: #f7f7f7;
 }
 </style>
 <style scoped lang="scss">
@@ -678,24 +862,29 @@ page {
 }

 .main-color {
+  color: $main-color;
  font-weight: bold;
 }
+
 .uinput {
  /deep/ input {
    text-align: right;
  }
 }
+
 .promotionNotice {
  font-size: 24rpx;
  margin: 20rpx 0;
  color: $aider-light-color;
 }
+
 .nums {
  flex: 2;
  color: $light-color;

  text-align: center;
 }
+
 .wait {
  font-size: 22rpx;
  font-family: PingFang SC, PingFang SC-Regular;
@@ -711,6 +900,7 @@ page {
  width: 143rpx;
  border-bottom: 2px dotted #999;
 }
+
 .tabbar-left {
  margin-left: 32rpx;
 }
@@ -763,6 +953,7 @@ page {
  align-items: center;
  justify-content: center;
 }
+
 .tr {
  text-align: right;
 }
@@ -785,6 +976,7 @@ page {
 .box2 {
  margin-top: 20rpx;
 }
+
 .notSupportFreight {
  position: fixed;

@@ -804,6 +996,7 @@ page {
    margin: 0 32rpx;
  }
 }
+
 /deep/ .u-notice-bar-wrap {
  width: 100% !important;
 }
@@ -881,6 +1074,7 @@ page {
  color: $main-color;
  font-size: 26rpx;
  font-weight: bold;
+
  > span {
    font-size: 36rpx;
  }
@@ -891,6 +1085,7 @@ page {
  color: $main-color;
  font-size: 28rpx;
  font-weight: bold;
+
  > .goods-price {
    font-size: 38rpx;
    padding: 0 2rpx;
@@ -932,6 +1127,7 @@ page {
  text-align: left;
  overflow: hidden;
 }
+
 .default {
  background: $main-color;
  font-size: 24rpx;
@@ -940,6 +1136,7 @@ page {
  color: #fff;
  margin-right: 20rpx;
 }
+
 .address-box {
  border-radius: 40rpx;
  border-top-left-radius: 0 !important;
@@ -954,9 +1151,11 @@ page {
  font-weight: normal;
  letter-spacing: 1rpx;
 }
+
 .user-box {
  padding: 32rpx;
 }
+
 .user-address-detail {
  color: #333;
  font-size: 38rpx;
@@ -964,13 +1163,16 @@ page {
  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;
@@ -978,12 +1180,14 @@ page {
  justify-content: center;
  flex: 8;
  margin-left: 20rpx !important;
+
  > p {
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
  }
 }
+
 .goods-item {
  margin: 20rpx 0;
 }
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -1,19 +1,47 @@
 <template>
  <view class="content">
    <view class="navbar">
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+      <view
+        v-for="(item, index) in navList"
+        :key="index"
+        class="nav-item"
+        :class="{ current: tabCurrentIndex === index }"
+        @click="tabClick(index)"
+        >{{ item.text }}</view
+      >
    </view>
-    <swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-      <swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
+    <swiper
+      :current="tabCurrentIndex"
+      class="swiper-box"
+      duration="300"
+      @change="changeTab"
+    >
+      <swiper-item
+        class="tab-content"
+        v-for="(tabItem, tabIndex) in navList"
+        :key="tabIndex"
+      >
+        <scroll-view
+          class="list-scroll-content"
+          scroll-y
+          @scrolltolower="loadData(tabIndex)"
+        >
          <!-- 空白页 -->
-          <u-empty text="暂无订单" mode="list" v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></u-empty>
+          <u-empty
+            text="暂无订单"
+            mode="list"
+            v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+          ></u-empty>
          <!-- 订单列表 -->
-          <view class="seller-view" :key="oderIndex" v-for="(order, oderIndex) in tabItem.orderList">
+          <view
+            class="seller-view"
+            :key="oderIndex"
+            v-for="(order, oderIndex) in tabItem.orderList"
+          >
            <!-- 店铺名称 -->
            <view class="seller-info u-flex u-row-between">
-              <view class="seller-name" @click="navigateToStore(order)">
-                <view class="name">{{ order.storeName }}</view>
+              <view class="seller-name wes" @click="navigateToStore(order)">
+                <view class="name wes">{{ order.storeName }}</view>
              </view>
              <view class="order-sn">{{
                order.orderStatus | orderStatusList
@@ -21,13 +49,32 @@
            </view>
            <view>
              <view>
-                <view class="goods-item-view" @click="navigateToOrderDetail(order.sn)">
-                  <view class="goods-img" v-for="(goods, goodsIndex) in order.orderItems" :key="goodsIndex">
-                    <u-image border-radius="6" width="100%" height="100%" :src="goods.image"></u-image>
+                <view
+                  class="goods-item-view"
+                  @click="navigateToOrderDetail(order.sn)"
+                >
+                  <view
+                    class="goods-img"
+                    v-for="(goods, goodsIndex) in order.orderItems"
+                    :key="goodsIndex"
+                  >
+                    <u-image
+                      border-radius="6"
+                      width="100%"
+                      height="100%"
+                      :src="goods.image"
+                    ></u-image>
                  </view>
                  <view class="goods-info">
-                    <view v-if="order.orderItems.length <= 1" class="goods-title u-line-2">{{ order.groupName }}</view>
-                    <view v-if="order.orderItems.length <= 1" class="goods-price">
+                    <view
+                      v-if="order.orderItems.length <= 1"
+                      class="goods-title u-line-2"
+                      >{{ order.groupName }}</view
+                    >
+                    <view
+                      v-if="order.orderItems.length <= 1"
+                      class="goods-price"
+                    >
                      ￥{{ order.flowPrice | unitPrice }}
                    </view>
                  </view>
@@ -43,23 +90,59 @@
                  <div v-else>应付金额:</div>
                  <div class="price">￥{{ order.flowPrice | unitPrice }}</div>
                </view>
-                <view>
+                <view class="goods-btn flex flex-a-c">
                  <!-- 全部 -->
-                  <u-button ripple class="pay-btn" shape="circle" size="mini" v-if="order.allowOperationVO.pay" @click="waitPay(order)">立即付款</u-button>
+                  <view
+                    ripple
+                    class="pay-btn"
+                    shape="circle"
+                    size="mini"
+                    v-if="order.allowOperationVO.pay"
+                    @click="waitPay(order)"
+                    >立即付款</view
+                  >
                  <!-- 取消订单 -->
-                  <u-button ripple class="cancel-btn" shape="circle" size="mini" v-if="order.allowOperationVO.cancel" @click="onCancel(order.sn)">
+                  <view
+                    ripple
+                    class="cancel-btn"
+                    shape="circle"
+                    size="mini"
+                    v-if="order.allowOperationVO.cancel"
+                    @click="onCancel(order.sn)"
+                  >
                    取消订单
-                  </u-button>
+                  </view>
                  <!-- 等待收货 -->
-                  <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="order.allowOperationVO.showLogistics" @click="navigateToLogistics(order)">
+                  <view
+                    ripple
+                    shape="circle"
+                    class="rebuy-btn"
+                    size="mini"
+                    v-if="order.allowOperationVO.showLogistics"
+                    @click="navigateToLogistics(order)"
+                  >
                    查看物流
-                  </u-button>
-                  <u-button ripple :customStyle="{'background':lightColor,'color':'#fff' }" shape="circle" class="pay-btn" size="mini" v-if="order.allowOperationVO.rog" @click="onRog(order.sn)">
+                  </view>
+                  <view
+                    ripple
+                    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)">
+                  </view>
+                  <view
+                    ripple
+                    shape="circle"
+                    class="cancel-btn"
+                    size="mini"
+                    v-if="order.groupAfterSaleStatus && (order.groupAfterSaleStatus==='NOT_APPLIED'|| order.groupAfterSaleStatus==='PART_AFTER_SALE' )"
+                    @click="applyService(order)"
+                  >
                    退款/售后
-                  </u-button>
+                  </view>
                  <!-- TODO 后续完善 -->
                  <!-- <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
                      order.orderStatus === 'CANCELLED' ||
@@ -75,26 +158,57 @@
        </scroll-view>
      </swiper-item>
    </swiper>
-    <u-popup class="cancel-popup" v-model="cancelShow" mode="bottom" length="60%">
+    <u-popup
+      class="cancel-popup"
+      v-model="cancelShow"
+      mode="bottom"
+      length="60%"
+    >
      <view class="header">取消订单</view>
      <view class="body">
-        <view class="title">取消订单后，本单享有的优惠可能会一并取消，是否继续？</view>
+        <view class="title"
+          >取消订单后，本单享有的优惠可能会一并取消，是否继续？</view
+        >
        <view>
          <u-radio-group v-model="reason">
            <view class="value">
-              <view class="radio-view" :key="index" v-for="(item, index) in cancelList">
-                <u-radio :active-color="lightColor" label-size="25" shape="circle" :name="item.reason" @change="reasonChange">{{ item.reason }}</u-radio>
+              <view
+                class="radio-view"
+                :key="index"
+                v-for="(item, index) in cancelList"
+              >
+                <u-radio
+                  :active-color="lightColor"
+                  label-size="25"
+                  shape="circle"
+                  :name="item.reason"
+                  @change="reasonChange"
+                  >{{ item.reason }}</u-radio
+                >
              </view>
            </view>
          </u-radio-group>
        </view>
      </view>
      <view class="footer">
-        <u-button size="medium" ripple v-if="reason" shape="circle" @click="submitCancel">提交</u-button>
+        <u-button
+          size="medium"
+          ripple
+          v-if="reason"
+          shape="circle"
+          @click="submitCancel"
+          >提交</u-button
+        >
      </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>

@@ -182,6 +296,9 @@ export default {
        {
          orderStatus: "CANCELLED", //已取消
        },
+        {
+          orderStatus: "STAY_PICKED_UP", //待自提
+        },
      ],
      cancelShow: false, //是否显示取消
      orderSn: "", //ordersn
@@ -196,17 +313,28 @@ export default {
   */
  onBackPress(e) {
    if (e.from == "backbutton") {
-      uni.reLaunch({
+      uni.switchTab({
        url: "/pages/tabbar/user/my",
      });
      return true; //阻止默认返回行为
    }
  },
  onPullDownRefresh() {
-    this.loadData(this.status);
+    if (this.tabCurrentIndex) {
+      this.initData(this.tabCurrentIndex);
+    } else {
+      this.initData(0);
+    }
+    // this.loadData(this.status);
+  },
+  onShow() {
+    if(this.$options.filters.tipsToLogin()){
+      if (!this.tabCurrentIndex) {
+        this.initData(0);
+      }
+    }
+    // this.loadData(this.status);
  },
-
-  

  onLoad(options) {
    /**
@@ -215,11 +343,11 @@ export default {
     */
    let status = Number(options.status);
    this.status = status;
-    this.tabCurrentIndex = status;
-    if (status == 0) {
-      this.loadData(status);
-    }
 		
+    this.tabCurrentIndex = status;
+    // if (status == 0) {
+    //   this.loadData(status);
+    // }
  },

  watch: {
@@ -236,16 +364,11 @@ export default {
    },
  },
  methods: {
-
-
    // 售后
-    applyService(order){
-      
-      
+    applyService(order) {
      uni.navigateTo({
-         url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`
+        url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`,
      });
-
    },

    // 店铺详情
@@ -268,7 +391,7 @@ export default {
        if (res.data.result.length >= 1) {
          this.cancelList = res.data.result;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
    },

@@ -314,6 +437,7 @@ export default {
     */
    loadData(index) {
      this.params.pageNumber = this.navList[index].pageNumber;
+      // this.params.tag = this.orderStatus[index].orderStatus;
      getOrderList(this.params).then((res) => {
        uni.stopPullDownRefresh();
        if (!res.data.success) {
@@ -348,7 +472,7 @@ export default {
      });
      setTimeout(() => {
        this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      }, 600);
    },
    //取消订单
@@ -368,7 +492,7 @@ export default {
        let list = this.navList[1].orderList;
        let index = list.findIndex((val) => val.id === item.id);
        index !== -1 && list.splice(index, 1);
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      }, 600);
    },

@@ -417,13 +541,13 @@ export default {
     */
    submitCancel() {
      cancelOrder(this.orderSn, { reason: this.reason }).then((res) => {
-        if (res.statusCode == 200) {
+        if (res.data.success) {
          uni.showToast({
            title: "订单已取消",
            duration: 2000,
            icon: "none",
          });
-          this.initData(0);
+          this.initData(this.tabCurrentIndex);

          this.cancelShow = false;
        } else {
@@ -564,6 +688,7 @@ page,
    padding: 0 20rpx;

    .seller-name {
+      flex:10;
      font-size: 28rpx;
      font-weight: 600;
      display: flex;
@@ -576,6 +701,9 @@ page,
    }

    .order-sn {
+      flex:2;
+      width:120rpx;
+      text-align: center;
      color: $aider-light-color;
      font-size: 26rpx;
    }
@@ -633,6 +761,7 @@ page,
      flex: 1;
      .price {
        color: $main-color;
+        
      }
    }
  }
@@ -667,28 +796,33 @@ page,
    text-align: center;
  }
 }
-
-.cancel-btn {
-  color: #999999 !important;
-  border-color: #999999 !important;
+.goods-btn{
+  display: flex;
+}
+.cancel-btn,.pay-btn,.rebuy-btn{
+  text-align: center;
  margin-left: 15rpx;
-  height: 60rpx;
+  font-size: 24rpx;
+  padding: 14rpx 20rpx;
+  border-radius: 100px;
+
+}
+.cancel-btn {
+  color: #333639 !important;
+  background: rgba(46, 51, 56, .05) !important;
 }

 .pay-btn {
-  // #ifndef MP-WEIXIN
+
  background-color: $light-color !important;
-  // #endif
+
  color: #ffffff !important;
-  margin-left: 15rpx;
-  height: 60rpx;
 }

 .rebuy-btn {
  color: $light-color !important;
  border-color: $light-color !important;
  background-color: #ffffff !important;
-  margin-left: 15rpx;
-  height: 60rpx;
 }
 </style>
+
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -9,28 +9,28 @@

    </div>
    <!-- 物流信息 -->
-    <view class="info-view logi-view">
-      <view class="logi-List" v-if="logiList && logiList.traces.length != 0">
-        <view class="logi-List-title">
-          {{logiList.traces[logiList.traces.length-1].AcceptStation}}
+    <view class="info-view logistics-view">
+      <view class="logistics-List" v-if="logisticsList && logisticsList.traces.length != 0 ">
+        <view class="logistics-List-title">
+          {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
        </view>
-        <view class="logi-List-time">
-          {{logiList.traces[logiList.traces.length-1].AcceptTime}}
+        <view class="logistics-List-time">
+          {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptTime }}
        </view>
      </view>

-      <view class="logi-List" v-else>
-        <view class="verificationCode" v-if="order.verificationCode ">
-          券码： {{order.verificationCode}}
+      <view class="logistics-List" v-else>
+        <view class="verificationCode" v-if="order.verificationCode">
+          券码： {{ order.orderStatus == 'CANCELLED' ?  '已失效' : order.verificationCode }}
        </view>
-        <view v-else class="logi-List-title">
-          {{'暂无物流信息'}}
+        <view v-else class="logistics-List-title">
+          {{ '暂无物流信息' }}
        </view>
      </view>

    </view>
    <!-- 地址 -->
-    <view class="info-view">
+    <view class="info-view" v-if="order.deliveryMethod == 'LOGISTICS'">
      <view class="address-view">
        <view>
          <view class="address-title">
@@ -42,14 +42,33 @@
        </view>
      </view>
    </view>
+
+    <!-- 提货地址 -->
+    <view class="info-view" v-if="order.deliveryMethod == 'SELF_PICK_UP'">
+      <view class="address-view">
+        <view>
+          <view class="order-info-view">
+            <view class="title">自提点地址:</view>
+            <view class="value address-line-height">{{ order.storeAddressPath }}</view>
+          </view>
+          <view class="order-info-view" @click="callPhone" >
+            <view class="title">联系方式:</view>
+            <view class="value">{{ order.storeAddressMobile }}<u-icon name='phone-fill' ></u-icon></view>
+          </view>
+         
+        </view>
+      </view>
+    </view>
+
    <!-- 商品信息 -->
    <view>
      <view class="seller-view">
        <!-- 店铺名称 -->
        <view class="seller-info u-flex u-row-between">
-          <view class="seller-name" @click="tostore(order)">
+          <view class="seller-name" @click="goToShopPage(order)">
            <view class="name">{{ order.storeName }}</view>
-            <view class="status" v-if="orderStatusList[order.orderStatus]"> {{ orderStatusList[order.orderStatus].title }}</view>
+            <view class="status" v-if="orderStatusList[order.orderStatus]"> {{ orderStatusList[order.orderStatus].title
+            }}</view>
          </view>
          <view class="order-sn"></view>
        </view>
@@ -70,7 +89,8 @@
                <view>x{{ sku.num }}</view>

                <view class="good-complaint">
-                  <u-tag size="mini" mode="plain" @click="complaint(sku)" v-if="sku.complainStatus == 'NO_APPLY'" text="投诉" type="info" />
+                  <u-tag size="mini" mode="plain" @click="complaint(sku)" v-if="sku.complainStatus == 'NO_APPLY'"
+                    text="投诉" type="info" />
                </view>
              </view>
            </view>
@@ -91,11 +111,11 @@
        </view>
        <view class="order-info-view">
          <view class="title">优惠券：</view>
-          <view class="value">￥{{ order.couponPrice | unitPrice }}</view>
+          <view class="value main-color">-￥{{ order.priceDetailDTO.couponPrice | unitPrice }}</view>
        </view>
        <view class="order-info-view">
          <view class="title">活动优惠：</view>
-          <view class="value">￥{{ order.discountPrice | unitPrice }}</view>
+          <view class="value main-color">-￥{{ order.discountPrice | unitPrice }}</view>
        </view>
        <!-- <view class="order-info-view" v-if="order.use_point">
 					<view class="title">使用积分：</view>
@@ -104,16 +124,20 @@
      </view>
    </view>
    <!-- 客户服务， 售后，取消订单，查看物流，投诉等 -->
-    <view class="info-view"
-      v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true || order.orderStatus == 'DELIVERED' || order.orderStatus != 'UNPAID' && order.orderPromotionType =='PINTUAN'">
+    <view class="info-view">
      <view style="width: 100%">
        <view class="order-info-view">
          <view class="title">服务</view>
        </view>
        <view class="customer-list">
-          <view class="customer-service" v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true" @click="onCancel(order.sn)">取消订单</view>
+          <view class="customer-service"
+            v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true"
+            @click="onCancel(order.sn)">取消订单</view>
          <view class="customer-service" v-if="order.orderStatus == 'DELIVERED'" @click="onLogistics(order)">查看物流</view>
-          <view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType =='PINTUAN' " @click="ByUserMessage(order)">查看拼团信息</view>
+          <view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType == 'PINTUAN'"
+            @click="ByUserMessage(order)">查看拼团信息</view>
+            <view class="customer-service"
+            @click="contact(order.storeId)">联系客服</view>
        </view>
      </view>
    </view>
@@ -132,6 +156,12 @@
              order.createTime
          }}</view>
        </view>
+        <view class="order-info-view">
+          <view class="title">订单备注：</view>
+          <view class="value">{{
+              order.remark
+          }}</view>
+        </view>
        <view class="order-info-view">
          <view class="title">支付状态：</view>
          <view class="value">
@@ -145,7 +175,7 @@
        </view>
        <view class="order-info-view">
          <view class="title">支付方式：</view>
-          <view class="value">{{ orderDetail.paymentMethodValue }}</view>
+          <view class="value">{{ orderDetail.paymentMethodValue || '暂无'}}</view>
        </view>
      </view>
    </view>
@@ -153,7 +183,7 @@
    <view class="info-view" v-if="order.payStatus == 'PAID'">
      <view>
        <view class="invoice-info-view">
-          <view class="ltitle">发票信息：</view>
+          <view class="invoice-title">发票信息：</view>
          <view v-if="!order.needReceipt" class="value">无需发票</view>
          <view v-else class="value" @click="onReceipt(orderDetail.receipt)">查看发票</view>
        </view>
@@ -175,13 +205,16 @@
        <view>
          <!-- 全部 -->
          <!-- 等待付款 -->
-          <u-button type="error" ripple size="mini" v-if=" order.allowOperationVO && order.allowOperationVO.pay" @click="toPay(order)">立即付款</u-button>
+          <u-button type="error" ripple size="mini" v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.pay"
+            @click="toPay(order)">立即付款</u-button>

          <!-- <u-button class="rebuy-btn" size="mini" v-if="order.order_operate_allowable_vo.allow_service_cancel"> 提醒发货</u-button> -->
          <!-- <div class="pay-btn">确认收货</div> -->
-          <u-button shape="circle" ripple type="warning" size="mini" v-if="order.orderStatus == 'DELIVERED'" @click="onRog(order.sn)">确认收货</u-button>
+          <u-button shape="circle" ripple type="warning" size="mini" v-if="order.orderStatus == 'DELIVERED'"
+            @click="onRog(order.sn)">确认收货</u-button>
          <!-- 交易完成 未评价 -->
-          <u-button shape="circle" ripple size="mini" v-if="order.orderStatus == 'COMPLETE'" @click="onComment(order.sn)">评价商品</u-button>
+          <u-button shape="circle" ripple size="mini" v-if="order.orderStatus == 'COMPLETE'"
+            @click="onComment(order.sn)">评价商品</u-button>
        </view>
      </view>
    </view>
@@ -193,7 +226,8 @@
          <u-radio-group v-model="reason">
            <view class="value">
              <view class="radio-view" v-for="(item, index) in cancelList" :key="index">
-                <u-radio :active-color="lightColor" label-size="25" shape="circle" :name="item.reason" @change="reasonChange">{{ item.reason }}</u-radio>
+                <u-radio :active-color="lightColor" label-size="25" shape="circle" :name="item.reason"
+                  @change="reasonChange">{{ item.reason }}</u-radio>
              </view>
            </view>
          </u-radio-group>
@@ -204,10 +238,12 @@
      </view>
    </u-popup>
    <u-toast ref="uToast" />
-    <u-modal v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" :confirm-color="lightColor" @confirm="confirmRog"></u-modal>
+    <u-modal v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" :confirm-color="lightColor"
+      @confirm="confirmRog"></u-modal>

    <!-- 分享 -->
-    <shares v-if="shareFlage " :thumbnail="orderDetail.orderItems[0].image" :goodsName="orderDetail.orderItems[0].goodsName" @close="shareFlage = false" />
+    <shares v-if="shareFlag" :thumbnail="orderDetail.orderItems[0].image"
+      :goodsName="orderDetail.orderItems[0].goodsName" @close="shareFlag = false" />

  </view>
 </template>
@@ -216,7 +252,6 @@
 import { getExpress } from "@/api/trade.js";
 import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";

-import { h5Copy } from "@/js_sdk/h5-copy/h5-copy.js";
 import shares from "@/components/m-share/index"; //分享

 import { getClearReason } from "@/api/after-sale.js";
@@ -228,8 +263,8 @@ export default {
  data() {
    return {
      lightColor: this.$lightColor,
-      logiList: "", //物流信息
-      shareFlage: false, //拼团分享开关
+      logisticsList: "", //物流信息
+      shareFlag: false, //拼团分享开关
      orderStatusList: {
        UNPAID: {
          title: "未付款",
@@ -255,6 +290,10 @@ export default {
          title: "已完成",
          value: "订单已完成,祝您生活愉快",
        },
+        STAY_PICKED_UP: {
+          title: "待自提",
+          value: "商品正在等待提取",
+        },
        TAKE: {
          title: "待核验",
        },
@@ -272,11 +311,17 @@ export default {
  },
  onLoad(options) {
    this.loadData(options.sn);
-    this.loadLogistics(options.sn);
    this.sn = options.sn;
  },
  methods: {
-    tostore(val) {
+    callPhone(){
+      this.$options.filters.callPhone(this.order.storeAddressMobile )
+    },
+    //联系客服
+    contact(storeId){
+      this.$options.filters.talkIm(storeId)
+    },
+    goToShopPage(val) {
      uni.navigateTo({
        url: "/pages/product/shopPage?id=" + val.storeId,
      });
@@ -284,13 +329,13 @@ export default {
    // 获取物流信息
    loadLogistics(sn) {
      getExpress(sn).then((res) => {
-        this.logiList = res.data.result;
+        this.logisticsList = res.data.result;
      });
    },

    // 分享当前拼团信息
    inviteGroup() {
-      this.shareFlage = true;
+      this.shareFlag = true;
    },
    // #TODO 这块需要写一下 目前没有拼团的详细信息
    ByUserMessage(order) {
@@ -304,7 +349,7 @@ export default {
          this.orderGoodsList[0].goodsId,
      });
    },
-    loadData(sn) {
+    async loadData(sn) {
      uni.showLoading({
        title: "加载中",
      });
@@ -313,9 +358,12 @@ export default {
        this.order = order.order;
        this.orderGoodsList = order.orderItems;
        this.orderDetail = res.data.result;
-
-        uni.hideLoading();
+        if (this.order.deliveryMethod === 'LOGISTICS') {
+          this.loadLogistics(sn)
+        }
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });
+
    },
    onReceipt(val) {
      uni.navigateTo({
@@ -328,35 +376,7 @@ export default {
      });
    },
    onCopy(sn) {
-      // #ifdef H5
-      if (sn === null || sn === undefined) {
-        sn = "";
-      } else sn = sn + "";
-      const result = h5Copy(sn);
-      if (result === false) {
-        uni.showToast({
-          title: "不支持",
-        });
-      } else {
-        uni.showToast({
-          title: "复制成功",
-          icon: "none",
-        });
-      }
-      // #endif
-
-      // #ifndef H5
-      uni.setClipboardData({
-        data: sn,
-        success: function () {
-          uni.showToast({
-            title: "复制成功!",
-            duration: 2000,
-            icon: "none",
-          });
-        },
-      });
-      // #endif
+      this.$options.filters.setClipboard(sn)
    },

    /**
@@ -393,7 +413,7 @@ export default {
      });
      setTimeout(() => {
        this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      }, 600);
    },
    //取消订单
@@ -407,7 +427,7 @@ export default {
        if (res.data.result.length >= 1) {
          this.cancelList = res.data.result;
        }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
      });

      this.cancelShow = true;
@@ -491,9 +511,11 @@ export default {

 <style lang="scss">
@import "./goods.scss";
+
 .empty {
  width: 100%;
 }
+
 .customer-service {
  background: #ededed;
  // padding: 12rpx 40rpx;
@@ -506,51 +528,58 @@ export default {
  font-size: 24rpx;
  border-radius: 10rpx;
 }
+
 .customer-list {
  display: flex;
  flex-wrap: wrap;
 }
-.logi-view {
+
+.logistics-view {
  justify-content: space-between;
  padding: 30rpx !important;
  margin: 0 !important;
  transform: translateY(-10px);
 }
+
 .order-status {
  color: #fff;
  width: 100%;
  text-align: center;
  font-size: 36rpx;
  margin-top: 40rpx;
-  > div {
+
+  >div {
    font-size: 24rpx;
    margin-top: 10rpx;
  }
 }
-.logi-List-title {
+
+.logistics-List-title {
  margin-bottom: 10rpx;
  font-size: 26rpx;
 }
-.logi-List-time {
+
+.logistics-List-time {
  font-size: 24rpx;
  color: #999;
 }
+
 .info-detail {
  margin-right: 30rpx;
  color: #333;
 }
+
 .order-view {
  margin: 0 !important;
  border-radius: 0 !important;
  width: 100%;
  height: 200rpx;
  padding: 0 !important;
-  background-image: linear-gradient(
-    to right,
+  background-image: linear-gradient(to right,
      $light-color 0%,
-    $aider-light-color 100%
-  ) !important;
+      $aider-light-color 100%) !important;
 }
+
 page,
 .content {
  background: #f1f1f1;
@@ -575,18 +604,22 @@ page,
    padding: 16rpx 0rpx;
  }
 }
+
 .seller-view {
  margin: 20rpx 0;
  padding: 15rpx 0;
  border-radius: 30rpx;
 }
+
 .address-title {
  font-size: 26rpx;
  font-weight: bold;
-  > span {
+
+  >span {
    margin-right: 20rpx;
  }
 }
+
 .info-view {
  display: flex;
  margin: 0 0 20rpx 0;
@@ -621,11 +654,14 @@ page,
      width: 140rpx;
      font-size: 24rpx;
      font-weight: 600;
+      flex:3;
+      min-width: 160rpx;
    }

    .value {
      color: #666;
      font-size: 24rpx;
+      flex:10;
    }

    .copy {
@@ -643,7 +679,7 @@ page,
    width: 100%;
    margin: 10rpx 0rpx;

-    .ltitle {
+    .invoice-title {
      width: 550rpx;
      font-size: 28rpx;
      color: #333333;
@@ -654,10 +690,12 @@ page,
    }
  }
 }
+
 .verificationCode {
  font-weight: bold;
  letter-spacing: 2rpx;
 }
+
 .bottom_view {
  width: 100%;
  height: 100rpx;
@@ -718,4 +756,15 @@ page,
    text-align: center;
  }
 }
+.address-line-height{
+  line-height: 1.75;
+}
+.seller-name{
+  >.name{
+    flex:10 !important;
+  }
+  >.status{
+    flex:2;
+  }
+}
 </style>
--- a/pages/passport/entry/seller/control.vue
+++ b/pages/passport/entry/seller/control.vue
@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <u-navbar :border-bottom="false"></u-navbar>
+    <step1 v-if="current == 1" :companyData="companyData" @callback="next()" />
+    <step2 v-if="current == 2" :companyData="companyData" @callback="next()" />
+    <step3
+      v-if="current == 3"
+      :companyData="companyData"
+      @callback="finished()"
+    />
+  </div>
+</template>
+
+<script>
+import { getCompanyDetail } from "@/api/entry";
+import step1 from "./step1";
+import step2 from "./step2";
+import step3 from "./step3";
+export default {
+  data() {
+    return {
+      companyData: "",
+      current: 1,
+    };
+  },
+  components: {
+    step1,
+    step2,
+    step3,
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    async init(next) {
+      const res = await getCompanyDetail();
+      if (res.data.success) {
+        this.companyData = res.data.result;
+        next ? this.current++ : "";
+      }
+    },
+    next() {
+      this.init("next");
+    },
+    finished() {
+      uni.navigateTo({
+        url: "/pages/passport/entry/seller/index",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
--- a/pages/passport/entry/seller/entry.scss
+++ b/pages/passport/entry/seller/entry.scss
@@ -0,0 +1,18 @@
+.flag-title {
+    font-size: 42rpx;
+    font-weight: bold;
+}
+.submit,
+.notice {
+  font-weight: bold;
+  font-size: 28rpx;
+
+  height: 92rpx;
+  text-align: center;
+  letter-spacing: 4rpx;
+  line-height: 92rpx;
+  border-radius: 20rpx;
+}
+.wrapper {
+  padding:16rpx;
+}
--- a/pages/passport/entry/seller/index.vue
+++ b/pages/passport/entry/seller/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="wrapper">
+       <u-navbar :border-bottom="false"></u-navbar>
+    <div>
+      <div class="title">店铺入驻</div>
+      <div class="step-list">
+        <div
+          class="step-item"
+          :class="{ active: current == index }"
+          v-for="(item, index) in entrySteps"
+          :key="index"
+        >
+          {{ item.title }}
+        </div>
+      </div>
+      <div class="submit" @click="keepOn()">开始填写</div>
+      <div class="notice" @click="getEntryNotice">查看店铺入驻协议</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCompanyDetail } from "@/api/entry";
+export default {
+  components: {},
+
+  data() {
+    return {
+      current: 999,
+      entrySteps: [
+        {
+          title: "填写资质信息",
+          value: "APPLY",
+        },
+        {
+          title: "提交审核",
+          value: "APPLYING",
+        },
+      ],
+
+      storeStatusWay: [
+        {
+          title: "申请已通过，请联系管理员",
+          value: "OPEN",
+        },
+        {
+          title: "店铺已关闭，重申请联系管理员",
+          value: "CLOSED",
+        },
+        {
+          title: "审核未通过,请修改资质信息",
+          value: "REFUSED",
+        },
+      ],
+
+      companyData: "", // 公司信息
+    };
+  },
+  onShow() {
+    if(this.$options.filters.tipsToLogin()){
+        this.init();
+    }
+  },
+
+  mounted() {},
+
+  onLoad(options) {},
+  methods: {
+    getEntryNotice() {
+      uni.navigateTo({
+        url: "/pages/mine/help/tips?type=STORE_REGISTER",
+      });
+    },
+    keepOn() {
+      if (this.companyData && this.companyData.storeDisable == "OPEN") {
+        uni.showToast({
+          title:"审核已通过",
+          icon:"none"
+        })
+      } else {
+        uni.navigateTo({
+          url: "/pages/passport/entry/seller/control",
+        });
+      }
+    },
+    async init() {
+      this.entrySteps = [
+        {
+          title: "填写资质信息",
+          value: "APPLY",
+        },
+        {
+          title: "提交审核",
+          value: "APPLYING",
+        },
+      ];
+      const res = await getCompanyDetail();
+      if (res.data.success) {
+        this.companyData = res.data.result;
+
+        if (this.companyData) {
+          this.storeStatusWay.forEach((item) => {
+            if (item.value == this.companyData.storeDisable) {
+              this.entrySteps.push(item);
+            }
+          });
+
+          this.current =
+            this.entrySteps.findIndex(
+              (item) => item.value == this.companyData.storeDisable
+            ) || 0;
+        } else {
+          this.current = 0;
+        }
+      }
+    },
+  },
+};
+</script>
+<style>
+page {
+  background: #fff;
+}
+</style>
+<style lang="scss" scoped>
+@import url("./entry.scss");
+.wrapper {
+  padding: 0 80rpx;
+}
+
+.title {
+  padding-top: calc(104rpx);
+  font-style: normal;
+  line-height: 1;
+  font-weight: 500;
+  font-size: 56rpx;
+  color: #333;
+  padding-left: 20rpx;
+}
+.step-item {
+  padding: 30rpx 20rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #666;
+}
+.step-list {
+  margin: 80rpx 0;
+  overflow: hidden;
+}
+.active {
+  color: $light-color;
+  background: rgba($color: $light-color, $alpha: 0.1);
+  border-radius: 20rpx;
+}
+.submit {
+  color: #fff;
+  margin-top: 120rpx;
+  background: rgba($light-color, 0.8);
+}
+.notice {
+  margin-top: 40rpx;
+  color: #333;
+  background: $bg-color;
+}
+</style>
--- a/pages/passport/entry/seller/step1.vue
+++ b/pages/passport/entry/seller/step1.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class="wrapper">
+    <u-form label-width="200" :model="form" ref="uForm">
+      <div class="column">
+        <div class="flag-title light-color">基础信息</div>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="companyName"
+          label="公司名称"
+          ><u-input
+            v-model="form.companyName"
+            :custom-style="defaultInputStyle"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="companyAddressPath"
+          label="公司所在地"
+          ><u-input
+            type="select"
+            :custom-style="defaultInputStyle"
+            v-model="form.companyAddressPath"
+            disabled
+            @click="showPicker()"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="companyAddress"
+          label="公司详细地址"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.companyAddress"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="employeeNum"
+          label="员工人数"
+          ><u-input
+            type="number"
+            :custom-style="defaultInputStyle"
+            v-model="form.employeeNum"
+        /></u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="companyPhone"
+          label="公司电话"
+          ><u-input
+            type="number"
+            :custom-style="defaultInputStyle"
+            v-model="form.companyPhone"
+        /></u-form-item>
+        <u-form-item
+          :border-bottom="false"
+          prop="registeredCapital"
+          label="注册资金"
+          required
+          ><u-input
+            type="number"
+            :custom-style="defaultInputStyle"
+            v-model="form.registeredCapital"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="linkName"
+          label="联系人姓名"
+          ><u-input :custom-style="defaultInputStyle" v-model="form.linkName"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="linkPhone"
+          label="联系人电话"
+          ><u-input
+            type="number"
+            :custom-style="defaultInputStyle"
+            v-model="form.linkPhone"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="companyEmail"
+          label="电子邮箱"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.companyEmail"
+        /></u-form-item>
+      </div>
+      <div class="column">
+        <div class="flag-title light-color">营业执照信息</div>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="licenseNum"
+          label="营业执照号"
+          ><u-input :custom-style="defaultInputStyle" v-model="form.licenseNum"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="scope"
+          label="法定经营范围"
+          ><u-input :custom-style="defaultInputStyle" v-model="form.scope"
+        /></u-form-item>
+        <u-form-item
+          :border-bottom="false"
+          prop="licencePhoto"
+          label="营业执照电子版"
+          required
+        >
+          <div>
+            <u-upload
+              :file-list="licencePhotoFileList"
+              :header="{ accessToken: storage.getAccessToken() }"
+              :action="action"
+              width="200"
+              @on-uploaded="onUploaded($event, 'licencePhoto')"
+              :max-count="1"
+              :show-progress="false"
+            ></u-upload>
+
+            <div class="tips">
+              请压缩图片在2M以内，确保文字清晰以免上传或审核失败
+            </div>
+          </div>
+        </u-form-item>
+      </div>
+      <div class="column">
+        <div class="flag-title light-color">法人信息</div>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="legalName"
+          label="法人姓名"
+          ><u-input :custom-style="defaultInputStyle" v-model="form.legalName"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="legalId"
+          label="法人证件号"
+          ><u-input :custom-style="defaultInputStyle" v-model="form.legalId"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="legalPhoto"
+          label="法人证件电子版"
+        >
+          <div>
+            <u-upload
+              :file-list="legalPhotoFileList"
+              :header="{ accessToken: storage.getAccessToken() }"
+              :action="action"
+              width="200"
+              @on-uploaded="onUploaded($event, 'legalPhoto')"
+              :max-count="1"
+              :show-progress="false"
+            ></u-upload>
+          </div>
+        </u-form-item>
+      </div>
+    </u-form>
+    <div class="submit" @click="validatorStep1Form">提交/下一步</div>
+    <m-city
+      :provinceData="list"
+      headTitle="区域选择"
+      ref="cityPicker"
+      @funcValue="getPickerParentValue"
+      pickerSize="4"
+    >
+    </m-city>
+  </div>
+</template>
+
+<script>
+import { applyFirst } from "@/api/entry";
+import city from "@/components/m-city/m-city.vue";
+import storage from "@/utils/storage.js";
+import { upload } from "@/api/common.js";
+import * as RegExp from "@/utils/RegExp.js";
+export default {
+  components: { "m-city": city },
+  data() {
+    return {
+      storage,
+      action: upload, //图片上传数据
+      defaultInputStyle: {
+        background: "#f7f7f7",
+        padding: "0 20rpx",
+        "border-radius": "10rpx",
+      },
+      legalPhotoFileList: [],
+      licencePhotoFileList: [],
+      form: {
+        companyName: "",
+        companyAddressIdPath: [],
+        companyAddressPath: "",
+        companyAddress: "",
+        employeeNum: "",
+        registeredCapital: "",
+        linkName: "",
+        linkPhone: "",
+        companyPhone: "",
+        companyEmail: "",
+        licenseNum: "",
+        scope: "",
+        legalPhoto: "",
+        licencePhoto: "",
+        legalName: "",
+        legalId: "",
+      },
+      list: [
+        {
+          id: "",
+          localName: "请选择",
+          children: [],
+        },
+      ],
+      rules: {
+        // 验证规则
+        companyName: [{ required: true, message: "请填写公司信息" }],
+        companyAddressPath: [{ required: true, message: "请选择公司所在地" }],
+        companyAddress: [{ required: true, message: "请填写公司详细地址" }],
+        employeeNum: [{ required: true, message: "请填写公司员工总数" }],
+        registeredCapital: [{ required: true, message: "请填写公司注册资金" }],
+        linkName: [{ required: true, message: "请填写联系人姓名" }],
+        linkPhone: [
+          { required: true, message: "请填写联系人电话" },
+          {
+            // 自定义验证函数，见上说明
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.mobile(value);
+            },
+            message: "手机号码不正确",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ],
+        companyPhone: [
+          { required: true, message: "请填写公司电话" },
+          {
+            // 自定义验证函数，见上说明
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.mobile(value);
+            },
+            message: "请填写正确的号码",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ],
+        companyEmail: [
+          { required: true, message: "请填写电子邮箱" },
+          {
+            // 自定义验证函数，见上说明
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.email(value);
+            },
+            message: "请填写正确的电子邮箱",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ],
+        licenseNum: [
+          { required: true, message: "请填写营业执照号" },
+          { pattern: RegExp.licenseNum, message: "请输入正确的营业执照号" },
+        ],
+        scope: [{ required: true, message: "请填写营业执照所示经营范围" }],
+        legalPhoto: [{ required: true, message: "请上传法人身份证照片" }],
+        licencePhoto: [{ required: true, message: "请上传营业执照" }],
+        legalName: [{ required: true, message: "请输入法人姓名" }],
+        legalId: [
+          { required: true, message: "请输入法人证件号" },
+          { pattern: RegExp.IDCard, message: "请输入正确的证件号" },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.$refs.uForm.setRules(this.rules);
+  },
+  props: ["companyData"],
+  watch: {
+    companyData: {
+      handler(val) {
+        if (val) {
+          this.$set(this, "form", val);
+          // 给图片赋值
+          const judgeDeepPhoto = ["legalPhoto", "licencePhoto"];
+          judgeDeepPhoto.forEach((key) => {
+            if (this.form[key]) {
+              this.form[key].split(",").forEach((item) => {
+                this[`${key}FileList`].push({ url: item });
+              });
+            }
+          });
+        }
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    // 图片上传
+    onUploaded(lists, key) {
+      let images = [];
+      lists.forEach((item) => {
+        images.push(item.response.result);
+      });
+      this.form[key] = images;
+    },
+    getPickerParentValue(e) {
+      this.form.companyAddressIdPath = [];
+
+      let name = "";
+      e.forEach((item, index) => {
+        if (item.id) {
+          // 遍历数据
+          this.form.companyAddressIdPath.push(item.id);
+          if (index == e.length - 1) {
+            name += item.localName;
+          } else {
+            name += item.localName + ",";
+          }
+          this.form.companyAddressPath = name;
+        }
+      });
+    },
+    // 显示三级地址联动
+    showPicker() {
+      this.$refs.cityPicker.show();
+    },
+    validatorStep1Form() {
+      this.$refs.uForm.validate(async (valid) => {
+        console.log(valid);
+        if (valid) {
+          const params = { ...this.form };
+
+          params.legalPhoto = params.legalPhoto.toString();
+          params.licencePhoto = params.licencePhoto.toString();
+          params.companyAddressIdPath = params.companyAddressIdPath.toString();
+          delete params.complexAddress;
+
+          const res = await applyFirst(params);
+          if (res.data.success) {
+            uni.showToast({
+              title: "提交成功!",
+              icon: "none",
+            });
+            this.$emit("callback");
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+/* page {
+  background: #fff;
+} */
+</style>
+<style lang="scss" scoped>
+@import url("./entry.scss");
+
+.column {
+  padding: 32rpx;
+  margin-bottom: 20rpx;
+  background: #fff;
+}
+.submit {
+  color: #fff;
+  margin-top: 120rpx;
+  background: rgba($light-color, 0.8);
+}
+.tips {
+  color: #999;
+  font-size: 24rpx;
+  line-height: 1.2;
+  margin-top: 10rpx;
+}
+</style>
--- a/pages/passport/entry/seller/step2.vue
+++ b/pages/passport/entry/seller/step2.vue
@@ -0,0 +1,144 @@
+<template>
+  <div class="wrapper">
+    <u-form label-width="250" :model="form" ref="uForm">
+      <div class="column">
+        <div class="flag-title light-color">基础信息</div>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="settlementBankAccountName"
+          label="银行开户名"
+          ><u-input
+            v-model="form.settlementBankAccountName"
+            :custom-style="defaultInputStyle"
+        /></u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="settlementBankAccountNum"
+          label="银行账号"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.settlementBankAccountNum"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="settlementBankBranchName"
+          label="开户银行支行名称"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.settlementBankBranchName"
+        /></u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="settlementBankJointName"
+          label="支行联行号"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.settlementBankJointName"
+        /></u-form-item>
+      </div>
+    </u-form>
+    <div class="submit" @click="validatorStep2Form">提交/下一步</div>
+  </div>
+</template>
+
+<script>
+import { applySecond } from "@/api/entry";
+
+export default {
+  data() {
+    return {
+      defaultInputStyle: {
+        background: "#f7f7f7",
+        padding: "0 20rpx",
+        "border-radius": "10rpx",
+      },
+      form: {
+        settlementBankAccountName: "",
+        settlementBankAccountNum: "",
+        settlementBankBranchName: "",
+        settlementBankJointName: "",
+      },
+
+      rules: {
+        // 验证规则
+        settlementBankAccountName: [
+          { required: true, message: "请填写银行开户名称" },
+        ],
+        settlementBankAccountNum: [
+          { required: true, message: "请填写银行账号" },
+        ],
+        settlementBankBranchName: [
+          { required: true, message: "请填写开户银行支行名称" },
+        ],
+        settlementBankJointName: [
+          { required: true, message: "请填写支行联行号" },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.$refs.uForm.setRules(this.rules);
+  },
+  props: ["companyData"],
+  watch: {
+    companyData: {
+      handler(val) {
+        this.$set(this, "form", val);
+        console.log(this.form)
+      },
+      deep: true,
+      immediate:true
+    },
+  },
+  methods: {
+    validatorStep2Form() {
+      this.$refs.uForm.validate(async (valid) => {
+        if (valid) {
+          const params = { ...this.form };
+          const res = await applySecond(params);
+          if (res.data.success) {
+            uni.showToast({
+              title: "提交成功!",
+              icon: "none",
+            });
+            this.$emit("callback");
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+/* page {
+  background: #fff;
+} */
+</style>
+<style lang="scss" scoped>
+@import url("./entry.scss");
+.wrapper {
+  // padding: 50rpx 32rpx 16rpx 32rpx;
+}
+.column {
+  padding: 32rpx;
+  margin-bottom: 20rpx;
+  background: #fff;
+}
+.submit {
+  color: #fff;
+  margin-top: 120rpx;
+  background: rgba($light-color, 0.8);
+}
+.tips {
+  color: #999;
+  font-size: 24rpx;
+  line-height: 1.2;
+  margin-top: 10rpx;
+}
+</style>
--- a/pages/passport/entry/seller/step3.vue
+++ b/pages/passport/entry/seller/step3.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="wrapper">
+    <u-form label-width="200" :model="form" ref="uForm">
+      <div class="column">
+        <div class="flag-title light-color">基础信息</div>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeName"
+          label="店铺名称"
+          ><u-input v-model="form.storeName" :custom-style="defaultInputStyle"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeLogo"
+          label="店铺logo"
+        >
+          <div>
+            <u-upload
+              :file-list="storeLogoFileList"
+              :header="{ accessToken: storage.getAccessToken() }"
+              :action="action"
+              width="200"
+              @on-uploaded="onUploaded($event, 'storeLogo')"
+              :max-count="1"
+              :show-progress="false"
+            ></u-upload>
+          </div>
+        </u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="goodsManagementCategory"
+          label="店铺经营类目"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="goodsManagementCategory"
+            disabled
+            @click="showCategory()"
+        /></u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeAddressPath"
+          label="店铺所在地"
+        >
+          <u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.storeAddressPath"
+            disabled
+            @click="showPicker()"
+          />
+        </u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeAddressPath"
+          label="店铺定位"
+        >
+          <div class="get-center" @click="clickUniMap()">开始定位</div>
+          <div class="tips-success" v-if="form.storeCenter">已成功定位</div>
+        </u-form-item>
+
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeAddressDetail"
+          label="店铺详细地址"
+          ><u-input
+            :custom-style="defaultInputStyle"
+            v-model="form.storeAddressDetail"
+        /></u-form-item>
+        <u-form-item
+          required
+          :border-bottom="false"
+          prop="storeDesc"
+          label="店铺简介"
+          ><u-input
+            type="textarea"
+            :custom-style="defaultInputStyle"
+            v-model="form.storeDesc"
+        /></u-form-item>
+      </div>
+    </u-form>
+    <div class="submit" @click="validatorStep1Form">提交平台审核</div>
+    <m-city
+      :provinceData="list"
+      headTitle="区域选择"
+      ref="cityPicker"
+      @funcValue="getPickerParentValue"
+      pickerSize="4"
+    >
+    </m-city>
+
+    <u-select
+      v-model="enableCategory"
+      @confirm="confirmCategory"
+      :list="categoryList"
+    ></u-select>
+
+    <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" />
+  </div>
+</template>
+
+<script>
+import { applyThird } from "@/api/entry";
+import { getCategoryList } from "@/api/goods";
+import city from "@/components/m-city/m-city.vue";
+import storage from "@/utils/storage.js";
+import { upload } from "@/api/common.js";
+import uniMap from "@/components/uniMap";
+import permision from "@/js_sdk/wa-permission/permission.js";
+export default {
+  components: { "m-city": city, uniMap },
+  data() {
+    return {
+      storage,
+      mapFlag: false,
+      action: upload, //图片上传数据
+      defaultInputStyle: {
+        background: "#f7f7f7",
+        padding: "0 20rpx",
+        "border-radius": "10rpx",
+      },
+      goodsManagementCategory: "",
+      storeLogoFileList: [],
+      categoryList: [],
+      form: {
+        storeName: "",
+        storeLogo: "",
+        goodsManagementCategory: "",
+        storeAddressPath: "",
+        storeAddressDetail: "",
+        storeDesc: "",
+      },
+      list: [
+        {
+          id: "",
+          localName: "请选择",
+          children: [],
+        },
+      ],
+      rules: {
+        // 验证规则
+        goodsManagementCategory: [
+          { required: true, message: "请选择店铺经营类目" },
+        ],
+        storeName: [{ required: true, message: "请填写店铺名称" }],
+        storeLogo: [{ required: true, message: "请上传店铺logo" }],
+        storeDesc: [{ required: true, message: "请填写店铺简介" }],
+        storeCenter: [{ required: true, message: "请选择店铺位置" }],
+        storeAddressIdPath: [{ required: true, message: "请选择店铺位置" }],
+        storeAddressDetail: [{ required: true, message: "请输入店铺详细地址" }],
+      },
+      enableCategory: false,
+    };
+  },
+  mounted() {
+    this.$refs.uForm.setRules(this.rules);
+    this.fetchCategoryList();
+  },
+  props: ["companyData"],
+  watch: {
+    companyData: {
+      handler(val) {
+        this.$set(this, "form", val);
+        // 给图片赋值
+        const judgeDeepPhoto = ["storeLogo"];
+
+        judgeDeepPhoto.forEach((key) => {
+          if (this.form[key]) {
+            this.form[key].split(",").forEach((item) => {
+              this[`${key}FileList`].push({ url: item });
+            });
+          }
+        });
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+
+  methods: {
+    callBackAddress(val) {
+      console.log(val);
+      this.form.storeAddressDetail = val.address;
+      this.form.storeCenter = `${val.longitude},${val.latitude}`;
+    },
+    // 关闭地图
+    closeMap() {
+      this.mapFlag = false;
+    },
+    // 打开地图并访问权限
+    clickUniMap() {
+      console.log("click");
+      // #ifdef APP-PLUS
+      if (plus.os.name == "iOS") {
+        // ios系统
+        permision.judgeIosPermission("location")
+          ? (this.mapFlag = true)
+          : this.refuseMap();
+      } else {
+        // 安卓
+        this.requestAndroidPermission(
+          "android.permission.ACCESS_FINE_LOCATION"
+        );
+      }
+      // #endif
+
+      // #ifndef APP-PLUS
+      this.mapFlag = true;
+      // #endif
+    },
+
+    // 如果拒绝权限 提示区设置
+    refuseMap() {
+      uni.showModal({
+        title: "温馨提示",
+        content: "您已拒绝定位,请开启",
+        confirmText: "去设置",
+        success(res) {
+          if (res.confirm) {
+            //打开授权设置
+            // #ifndef MP-WEIXIN
+            uni.getSystemInfo({
+              success(res) {
+                if (res.platform == "ios") {
+                  //IOS
+                  plus.runtime.openURL("app-settings://");
+                } else if (res.platform == "android") {
+                  //安卓
+                  let main = plus.android.runtimeMainActivity();
+                  let Intent = plus.android.importClass(
+                    "android.content.Intent"
+                  );
+                  let mIntent = new Intent("android.settings.ACTION_SETTINGS");
+                  main.startActivity(mIntent);
+                }
+              },
+            });
+            // #endif
+          }
+        },
+      });
+    },
+    // 获取安卓是否拥有地址权限
+    async requestAndroidPermission(permisionID) {
+      var result = await permision.requestAndroidPermission(permisionID);
+
+      if (result == 1) {
+        this.mapFlag = true;
+      } else {
+        this.refuseMap();
+      }
+    },
+
+    confirmCategory(val) {
+      this.form.goodsManagementCategory = val[0].value;
+      this.goodsManagementCategory = val[0].label;
+    },
+    async fetchCategoryList() {
+      const res = await getCategoryList(0);
+      if (res.data.success) {
+        if (res.data.result.length) {
+          this.categoryList = res.data.result.map((item) => {
+            return { label: item.name, value: item.id };
+          });
+
+          if (this.form.goodsManagementCategory) {
+            this.goodsManagementCategory = this.categoryList.find(
+              (item) => this.form.goodsManagementCategory == item.value
+            ).label;
+          }
+        }
+      }
+    },
+    // 图片上传
+    onUploaded(lists, key) {
+      let images = [];
+      lists.forEach((item) => {
+        images.push(item.response.result);
+      });
+      this.form[key] = images;
+    },
+    getPickerParentValue(e) {
+      this.form.storeAddressIdPath = [];
+
+      let name = "";
+      e.forEach((item, index) => {
+        if (item.id) {
+          // 遍历数据
+          this.form.storeAddressIdPath.push(item.id);
+          if (index == e.length - 1) {
+            name += item.localName;
+          } else {
+            name += item.localName + ",";
+          }
+          this.form.storeAddressPath = name;
+        }
+      });
+    },
+    // 显示三级地址联动
+    showPicker() {
+      this.$refs.cityPicker.show();
+    },
+    showCategory() {
+      this.enableCategory = true;
+    },
+    validatorStep1Form() {
+      this.$refs.uForm.validate(async (valid) => {
+        console.log(valid);
+        if (valid) {
+          const params = { ...this.form };
+          params.storeLogo = params.storeLogo.toString();
+          params.storeAddressIdPath = params.storeAddressIdPath.toString();
+          const res = await applyThird(params);
+          if (res.data.success) {
+            uni.showToast({
+              title: "提交成功!",
+              icon: "none",
+            });
+            this.$emit("callback");
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+/* page {
+  background: #fff;
+} */
+</style>
+<style lang="scss" scoped>
+@import url("./entry.scss");
+.get-center {
+  padding: 12rpx 30rpx;
+  background: $light-color;
+  border-radius: 10rpx;
+  font-size: 24rpx;
+  color: #fff;
+  font-weight: bold;
+  display: inline;
+}
+.column {
+  padding: 32rpx;
+  margin-bottom: 20rpx;
+  background: #fff;
+}
+.submit {
+  color: #fff;
+  margin-top: 120rpx;
+  background: rgba($light-color, 0.8);
+}
+.tips {
+  color: #999;
+  font-size: 24rpx;
+  line-height: 1.2;
+  margin-top: 10rpx;
+}
+.tips-success {
+  color: $weChat-color;
+  font-size: 24rpx;
+}
+</style>
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -3,46 +3,77 @@
 		<div v-if="!wechatLogin">
 			<u-navbar :is-back="showBack" :border-bottom="false"></u-navbar>
 			<div>
-        <div class="title">{{loginTitleWay[current].title}}</div>
-        <div :class="current == 1 ? 'desc-light':'desc'">{{loginTitleWay[current].desc}}<span
-            v-if="current == 1">{{mobile | secrecyMobile}}</span></div>
+				<div class="title">{{ loginTitleWay[current].title }}</div>
+				<div :class="current == 1 ? 'desc-light' : 'desc'">
+					{{ loginTitleWay[current].desc
+          }}<span v-if="current == 1">{{ mobile | secrecyMobile }}</span>
+				</div>
 			</div>
 			<!-- 手机号 -->
-      <div v-show="current==0">
+			<div v-show="!enableUserPwdBox">
+				<div v-show="current == 0">
 					<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入手机号 (11位)"
-          class='mobile' focus v-model="mobile" type="number" maxlength="11" />
-        <div :class="!enabuleFetchCode ?'disable':'fetch'" @click="fetchCode" class=" btn">获取验证码</div>
-        <div class="flex">
-          <u-checkbox-group :icon-size="24" width="45rpx">
-            <u-checkbox shape="circle" v-model="enabulePrivacy" active-color="#FF5E00"></u-checkbox>
-          </u-checkbox-group>
-          <div class="tips">未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span @click="navigateToPrivacy('privacy')">《使用条款及隐私协议》</span>
+						class="mobile" focus v-model="mobile" type="number" maxlength="11" />
+					<div :class="!enableFetchCode ? 'disable' : 'fetch'" @click="fetchCode" class="btn">
+						获取验证码
 					</div>
 				</div>
-
-      </div>
 				<!-- 输入验证码 -->
-      <div v-show="current==1" class="box-code">
+				<div v-show="current == 1" class="box-code">
 					<verifyCode type="bottom" @confirm="submit" boxActiveColor="#D8D8D8" v-model="code" isFocus
 						boxNormalColor="#D8D8D8" cursorColor="#D8D8D8" />

 					<div class="fetch-btn">
 						<u-verification-code change-text="验证码已发送（x）" end-text="重新获取验证码" unique-key="page-login"
-            :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
-          <span @tap="fetchCode" :style="{color:codeColor}"> {{tips}}</span>
+							:seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange">
+						</u-verification-code>
+						<span @tap="fetchCode" :style="{ color: codeColor }">
+							{{ tips }}</span>
 					</div>
 				</div>
+			</div>
+
+			<!-- 帐号密码登录 -->
+			<div v-show="enableUserPwdBox">
+				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入用户名"
+					class="mobile" focus v-model="userData.username" />
+				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入密码"
+					class="mobile" focus v-model="userData.password" type="password" />
+
+				<div :class="!enableUserBtnColor ? 'disable' : 'fetch'" @click="passwordLogin" class="btn">
+					帐号密码登录
+				</div>
+			</div>
+
+			<div class="flex" v-show="current != 1">
+				<u-checkbox-group :icon-size="24" width="45rpx">
+					<u-checkbox shape="circle" v-model="enablePrivacy" active-color="#FF5E00"></u-checkbox>
+				</u-checkbox-group>
+				<div class="tips">
+					未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span @click="navigateToPrivacy('PRIVACY_POLICY')">《隐私协议》</span>
+					<span @click="navigateToPrivacy('USER_AGREEMENT')">
+						《用户协议》
+					</span>
+				</div>
+			</div>
+
+			<div v-if="current != 1" class="user-password-tips" @click="enableUserPwdBox = !enableUserPwdBox">
+				{{ !enableUserPwdBox ? "帐号密码" : "手机号" }}登录
+			</div>

 			<!-- 循环出当前可使用的第三方登录模式 -->
 			<div class="flex login-list">
-        <div v-if="item.code" :style="{background:item.color}" class="login-item" v-for="(item,index) in loginList" :key="index">
-          <u-icon v-if="item.title!='APPLE'" color="#fff" size="42" :name="item.icon" @click="navigateLogin(item)">
+				<div v-if="item.code" :style="{ background: item.color }" class="login-item"
+					v-for="(item, index) in loginList" :key="index">
+					<u-icon v-if="item.title != 'APPLE'" color="#fff" size="42" :name="item.icon"
+						@click="navigateLogin(item)">
 					</u-icon>
-          <u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" @click="navigateLogin(item)" width="80"
-            height="80" />
+					<u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" @click="navigateLogin(item)"
+						width="80" height="80" />
 				</div>
 			</div>
-      <myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification" business="LOGIN" />
+			<myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification"
+				business="LOGIN" />
 		</div>
 		<view v-else>
 			<wechatH5Login />
@@ -51,19 +82,40 @@
 </template>

 <script>
-import { openIdLogin, loginCallback } from "@/api/connect.js";
-import api from "@/config/api.js";
-import { sendMobile, smsLogin } from "@/api/login";
-import myVerification from "@/components/verification/verification.vue"; //验证码模块
-import uuid from "@/utils/uuid.modified.js"; // uuid
-import verifyCode from "@/components/verify-code/verify-code";
-import { getUserInfo } from "@/api/members";
-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
-import storage from "@/utils/storage.js"; //缓存
-import wechatH5Login from "./wechatH5Login.vue";
-import { webConnect } from "@/api/connect.js";
-export default {
-  components: { myVerification, verifyCode, wechatH5Login },
+	import {
+		openIdLogin,
+		loginCallback
+	} from "@/api/connect.js";
+	import api from "@/config/api.js";
+	import {
+		sendMobile,
+		smsLogin,
+		userLogin
+	} from "@/api/login";
+	import myVerification from "@/components/verification/verification.vue"; //验证码模块
+	import uuid from "@/utils/uuid.modified.js"; // uuid
+	import verifyCode from "@/components/verify-code/verify-code";
+	import {
+		getUserInfo
+	} from "@/api/members";
+	import {
+		whetherNavigate
+	} from "@/utils/Foundation"; //登录跳转
+	import storage from "@/utils/storage.js"; //缓存
+	import wechatH5Login from "./wechatH5Login.vue";
+	import {
+		webConnect
+	} from "@/api/connect.js";
+	import {
+		md5
+	} from "@/utils/md5.js";
+
+	export default {
+		components: {
+			myVerification,
+			verifyCode,
+			wechatH5Login
+		},

 		data() {
 			return {
@@ -72,12 +124,12 @@ export default {
 				flage: false, //是否验证码验证
 				codeFlag: true, //验证开关，用于是否展示验证码
 				tips: "",
+				enableUserPwdBox: false, //帐号密码登录
 				current: 0,
 				codeColor: "#999", //按钮验证码颜色
 				lightColor: this.$lightColor,
 				seconds: 60, //默认验证码等待时间
-      loginTitleWay: [
-        {
+				loginTitleWay: [{
 						title: "欢迎登录",
 						desc: "登录后更精彩，美好生活即将开始",
 					},
@@ -86,9 +138,14 @@ export default {
 						desc: "已经发送验证码至",
 					},
 				],
+				userData: {
+					username: "",
+					password: "",
+				},
 				showBack: false,
-      enabuleFetchCode: false,
-      enabulePrivacy: false, //隐私政策
+				enableFetchCode: false,
+				enableUserBtnColor: false,
+				enablePrivacy: false, //隐私政策
 				mobile: "", //手机号
 				code: "", //验证码
 				inputStyle: {
@@ -124,6 +181,15 @@ export default {
 			};
 		},
 		onShow() {
+
+			// 只要是app登录的全部清除内容
+			// #ifdef APP-PLUS 
+			storage.setAccessToken("");
+			storage.setRefreshToken("");
+			storage.setUserInfo({});
+			// #endif
+
+
 			//#ifdef H5
 			let isWXBrowser = /micromessenger/i.test(navigator.userAgent);
 			if (isWXBrowser) {
@@ -137,8 +203,8 @@ export default {
 			//#endif
 		},

-
 		mounted() {
+			
 			// #ifndef APP-PLUS
 			//判断是否微信浏览器
 			var ua = window.navigator.userAgent.toLowerCase();
@@ -225,10 +291,21 @@ export default {
 			current(val) {
 				val ? (this.showBack = true) : (this.showBack = false);
 			},
+			userData: {
+				handler(val) {
+					if (this.userData.username && this.userData.password) {
+						this.enableUserBtnColor = true;
+					} else {
+						this.enableUserBtnColor = false;
+					}
+				},
+				deep: true,
+
+			},
 			mobile: {
 				handler(val) {
 					if (val.length == 11) {
-          this.enabuleFetchCode = true;
+						this.enableFetchCode = true;
 					}
 				},
 			},
@@ -236,10 +313,15 @@ export default {
 			async flage(val) {
 				if (val) {
 					if (this.$refs.uCode.canGetCode) {
+						if (this.enableUserPwdBox) {
+							this.submitUserLogin();
+							return;
+							// 执行登录
+						} else {
 							// 向后端请求验证码
 							uni.showLoading({});
 							let res = await sendMobile(this.mobile);
-          uni.hideLoading();
+							 if (this.$store.state.isShowToast){ uni.hideLoading() };
 							// 这里此提示会被this.start()方法中的提示覆盖
 							if (res.data.success) {
 								this.current = 1;
@@ -251,9 +333,11 @@ export default {
 									icon: "none",
 								});
 								this.flage = false;
+								this.$refs.verification.getCode();
+							}
 						}
 					} else {
-          this.$u.toast("请倒计时结束后再发送");
+						!this.enableUserPwdBox ? this.$u.toast("请倒计时结束后再发送") : "";
 					}
 				} else {
 					this.$refs.verification.hide();
@@ -282,11 +366,11 @@ export default {
 							storage.setUserInfo(user.data.result);
 							storage.setHasLogin(true);
 						});
-          getCurrentPages().length > 1
-            ? uni.navigateBack({
+						getCurrentPages().length > 1 ?
+							uni.navigateBack({
 								delta: getCurrentPages().length - 2,
-              })
-            : uni.switchTab({
+							}) :
+							uni.switchTab({
 								url: "/pages/tabbar/home/index",
 							});
 					}
@@ -321,11 +405,12 @@ export default {
 					// #ifdef MP-ALIPAY
 					scopes: "auth_user", //支付宝小程序需设置授权类型
 					// #endif
-        success: function (res) {
+					success: function(res) {
 						uni.setStorageSync("type", item.code);
 						//微信小程序意外的其它方式直接在storage中写入openid
 						// #ifndef MP-WEIXIN
 						uni.setStorageSync("openid", res.authResult.openid);
+						res.authResult.unionId && uni.setStorageSync("unionId", res.authResult.unionId);
 						// #endif
 					},
 					fail(e) {
@@ -339,10 +424,11 @@ export default {
 						//获取用户信息
 						uni.getUserInfo({
 							provider: item.appcode,
-            success: function (infoRes) {
+							success: function(infoRes) {
 								//写入用户信息
 								uni.setStorageSync("nickname", infoRes.userInfo.nickName);
 								uni.setStorageSync("avatar", infoRes.userInfo.avatarUrl);
+								uni.setStorageSync("unionId", infoRes.userInfo.unionId);

 								// #ifdef MP-WEIXIN
 								//微信小程序获取openid 需要特殊处理 如需获取openid请参考uni-id: https://uniapp.dcloud.net.cn/uniCloud/uni-id
@@ -367,9 +453,14 @@ export default {
 					uuid: uni.getStorageSync("openid"), //联合登陆id
 					source: uni.getStorageSync("type"), //联合登陆类型
 					nickname: uni.getStorageSync("nickname"), // 昵称
+					username: uni.getStorageSync("openid"), // 昵称
 					avatar: uni.getStorageSync("avatar"), // 头像
 					uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
+					type:this.clientType,
+					token:{unionId:"",openId:uni.getStorageSync("openid")}
 				};
+        		uni.getStorageSync("unionId") ? (params.token.unionId = uni.getStorageSync("unionId")) : delete params.token;
+				
 				openIdLogin(params, clientType).then((res) => {
 					if (!res.data.success) {
 						let errormessage = "第三方登录暂不可用";
@@ -396,13 +487,21 @@ export default {
 								 */
 								storage.setUserInfo(user.data.result);
 								storage.setHasLogin(true);
-
+								uni.switchTab({
+									url: "/pages/tabbar/home/index",
+								});
 								/**
 								 * 计算出当前router路径
 								 * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
 								 * 2.都不满足返回跳转页面
 								 */
+								if (user.data.result.mobile) {
 									whetherNavigate();
+								} else {
+									uni.navigateTo({
+										url: "/pages/passport/bindUserPhone",
+									});
+								}
 							} else {
 								uni.switchTab({
 									url: "/pages/tabbar/home/index",
@@ -423,7 +522,10 @@ export default {
 				// #ifdef H5
 				let code = connectLogin.code;
 				let buyer = api.buyer;
-      window.open(buyer + `/connect/login/web/` + code, "_self");
+				window.open(
+					buyer + `/passport/connect/connect/login/web/` + code,
+					"_self"
+				);
 				// #endif
 				// #ifdef APP-PLUS
 				this.nonH5OpenId(connectLogin);
@@ -442,8 +544,19 @@ export default {
 				/**
 				 * 执行登录
 				 */
-      smsLogin({ mobile: this.mobile, code: this.code }, this.clientType).then(
+				smsLogin({
+					mobile: this.mobile,
+					code: this.code
+				}, this.clientType).then(
 					(res) => {
+						this.getUserInfoMethods(res);
+					}
+				);
+			},
+
+			// 登录成功之后获取用户信息
+			getUserInfoMethods(res) {
+				console.log(res);
 				if (res.data.success) {
 					storage.setAccessToken(res.data.result.accessToken);
 					storage.setRefreshToken(res.data.result.refreshToken);
@@ -458,18 +571,16 @@ export default {
 							 */
 							storage.setUserInfo(user.data.result);
 							storage.setHasLogin(true);
+							storage.setAutoCp(0)
 							// 登录成功
 							uni.showToast({
 								title: "登录成功!",
 								icon: "none",
 							});

-                /**
-                 * 计算出当前router路径
-                 * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
-                 * 2.都不满足返回跳转页面
-                 */
+
 							whetherNavigate();
+
 						} else {
 							uni.switchTab({
 								url: "/pages/tabbar/home/index",
@@ -477,9 +588,8 @@ export default {
 						}
 					});
 				}
-        }
-      );
 			},
+
 			// 验证码验证
 			verification(val) {
 				this.flage = val == this.$store.state.verificationKey ? true : false;
@@ -489,7 +599,9 @@ export default {
 				uni.navigateTo({
 					url: "/pages/mine/help/tips?type=" + val,
 				});
+				
 			},
+			
 			// 点击获取验证码
 			start() {
 				this.codeColor = "#999";
@@ -509,9 +621,62 @@ export default {
 				this.codeFlag = true;
 				console.log(this.codeColor);
 			},
+
+			passwordLogin() {
+				if (!this.enablePrivacy) {
+					uni.showToast({
+						title: "请同意用户隐私",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.userData.username) {
+					uni.showToast({
+						title: "请填写用户名",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.userData.password) {
+					uni.showToast({
+						title: "请填写密码",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.flage) {
+					this.$refs.verification.error(); //发送
+
+					return false;
+				}
+			},
+
+			// 提交用户登录
+			async submitUserLogin() {
+				const params = JSON.parse(JSON.stringify(this.userData));
+				params.password = md5(params.password);
+				try {
+					let res = await userLogin(params,this.clientType);
+					if (res.data.success) {
+						this.getUserInfoMethods(res);
+					} else {
+						this.$refs.verification.getCode();
+						this.flage = false;
+					}
+				} catch (error) {
+					this.$refs.verification.getCode();
+				}
+			},
+
 			// 发送验证码
 			fetchCode() {
-      if (!this.enabulePrivacy) {
+				if (!this.enablePrivacy) {
 					uni.showToast({
 						title: "请同意用户隐私",
 						duration: 2000,
@@ -540,7 +705,7 @@ export default {
 							clearInterval(timer);
 						}, 100);
 					}
-        uni.hideLoading();
+					 if (this.$store.state.isShowToast){ uni.hideLoading() };
 				}
 				if (!this.flage) {
 					this.$refs.verification.error(); //发送
@@ -549,55 +714,65 @@ export default {
 				}
 			},
 		},
-};
+	};
 </script>
-<style >
-page {
+<style>
+	page {
 		background: #fff;
-}
+	}
 </style>
 <style lang="scss" scoped>
-.wrapper {
+	.wrapper {
 		padding: 0 80rpx;
-}
-.title {
+	}
+
+	.title {
 		padding-top: calc(104rpx);
 		font-style: normal;
 		line-height: 1;
 		font-weight: 500;
 		font-size: 56rpx;
 		color: #333;
-}
-.box-code {
+	}
+
+	.box-code {
 		margin-top: 78rpx;
-}
-.desc,
-.desc-light {
+	}
+
+	.desc,
+	.desc-light {
 		font-size: 32rpx;
 		line-height: 32rpx;
 		color: #333333;
 		margin-top: 40rpx;
-}
-.desc {
+	}
+
+	.desc {
 		color: #333;
-}
-.desc-light {
+	}
+
+	.desc-light {
 		color: #999999;
-  > span {
+
+		>span {
 			color: #333;
 			margin-left: 8rpx;
 		}
-}
-.mobile {
+	}
+
+	.mobile {
 		margin-top: 80rpx;
-}
-.disable {
+	}
+
+	.disable {
 		background: linear-gradient(90deg, #ffdcba 2.21%, #ffcfb2 99.86%);
-}
-.fetch {
+	}
+
+	.fetch {
 		background: linear-gradient(57.72deg, #ff8a19 18.14%, #ff5e00 98.44%);
-}
-.btn {
+	}
+
+	.btn {
 		border-radius: 100px;
 		width: 590rpx;
 		margin-top: 97rpx;
@@ -606,17 +781,20 @@ page {
 		line-height: 80rpx;
 		text-align: center;
 		color: #ffffff;
-}
-.tips {
+	}
+
+	.tips {
 		font-size: 12px;
 		line-height: 20px;
 		margin-top: 32rpx;
 		width: 546rpx;
-  > span {
+
+		>span {
 			color: $light-color;
 		}
-}
-.fetch-btn {
+	}
+
+	.fetch-btn {
 		width: 370rpx;
 		height: 80rpx;
 		line-height: 80rpx;
@@ -627,21 +805,19 @@ page {
 		color: #999;

 		margin: 71rpx auto 0 auto;
-}
+	}

-.login-list {
+	.login-list {
 		display: flex;
 		width: 590rpx;
 		position: absolute;
-  bottom: 20px;
+		top: 1200rpx;
 		align-items: center;
 		justify-content: center;
+	}

-}
-
-.login-item {
+	.login-item {
 		width: 80rpx;
-
 		border-radius: 10rpx;
 		height: 80rpx;
 		display: flex;
@@ -649,6 +825,11 @@ page {
 		align-items: center;

 		margin: 0 20rpx;
+	}

-}
+	.user-password-tips {
+		text-align: center;
+		color: $main-color;
+		margin: 20px 0;
+	}
 </style>
--- a/pages/passport/scannerCodeLoginConfirm.vue
+++ b/pages/passport/scannerCodeLoginConfirm.vue
@@ -0,0 +1,164 @@
+<template>
+  <view class="container">
+    <u-navbar title="扫码登录授权"></u-navbar>
+    <view class="wx-auth-container">
+      <div class="box">
+        <!-- <div v-if="!errorMsg"> -->
+        <div>
+          <view class="small-tips flex flex-center">
+            <u-image
+              width="400rpx"
+              height="300rpx"
+              src="https://lili-system.oss-cn-beijing.aliyuncs.com/confirm.png"
+            ></u-image>
+            <div>电脑端登录确认</div>
+            <div>为确保帐号安全，请确认是您本人操作</div>
+          </view>
+
+          <view class="btns">
+            <button @click="confirmLogin()" class="btn-auth">确认登录</button>
+            <div @click="cancelLogin()" class="btn-callback">取消登录</div>
+          </view>
+        </div>
+      </div>
+    </view>
+  </view>
+</template>
+
+<script>
+import { scannerCodeLogin, scannerCodeLoginConfirm } from "@/api/login";
+export default {
+  data() {
+    return {
+      errorMsg: "",
+      token: "",
+    };
+  },
+  watch: {
+    errorMsg(val) {
+      if (val) {
+        uni.showToast({
+          title: val,
+          icon: "none",
+        });
+        // uni.navigateBack()
+      }
+    },
+  },
+  onShow() {
+    this.$options.filters.forceLogin();
+    scannerCodeLogin({ token: this.token }).then((res) => {
+      if (res.data.code == 200) {
+        let code = res.data.result;
+        switch (code) {
+          case 0:
+          case 1:
+            this.errorMsg = "";
+            break;
+          case 2:
+          case 3:
+            this.errorMsg = "请勿重复扫码";
+            break;
+          case 4:
+            this.errorMsg = "二维码已过期，重新扫码";
+            break;
+          default:
+            this.errorMsg = "状态异常";
+        }
+      } else {
+        this.errorMsg = res.data.message;
+      }
+    });
+  },
+  onLoad(params) {
+    this.token = params.token;
+    if (this.token == undefined || this.token == "") {
+      this.errorMsg = "信息异常";
+    }
+  },
+  methods: {
+    confirmLogin() {
+      this.config(1);
+    },
+    cancelLogin() {
+      this.config(0);
+    },
+    config(code) {
+      scannerCodeLoginConfirm({ token: this.token, code: code }).then((res) => {
+        let title = res.data.success ? "操作成功" : "操作失败";
+        uni.showToast({
+          title: title,
+          duration: 1500,
+          icon: "none",
+        });
+        setTimeout(function () {
+          uni.navigateBack();
+        }, 1000);
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+page {
+  background: #fff;
+}
+</style>
+<style lang="scss" scoped>
+.container {
+  background-color: #fff;
+  width: 100vw;
+  height: 100vh;
+}
+.wx-auth-container {
+  width: 100%;
+  background: #fff;
+  margin-top: 20%;
+}
+text.title,
+text.shop {
+  display: inline-block;
+  font-size: 60rpx;
+  color: #333;
+}
+
+.box {
+  margin: 0 32rpx;
+}
+
+/* 文字提示*/
+.small-tips {
+  width: 100%;
+
+  padding: 20rpx;
+  font-size: 29rpx;
+  margin: 0 0 20rpx;
+  color: #999;
+}
+
+.btn-auth {
+  width: 92%;
+  background: $main-color;
+  color: #fff;
+  margin: 0 auto 40rpx;
+  border-radius: 100px;
+}
+.btn-callback {
+  text-align: center;
+  font-size: 30rpx;
+  background: #ededed;
+  height: 90rpx;
+  line-height: 90rpx;
+  border-radius: 100px;
+  width: 92%;
+  margin: 0 auto;
+}
+
+.btns {
+  margin-top: 100rpx;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  justify-content: center;
+}
+</style>
--- a/pages/passport/wechatH5Login.vue
+++ b/pages/passport/wechatH5Login.vue
@@ -43,7 +43,7 @@ export default {
    getUserProfile() {
      let code = "WECHAT";
      let buyer = api.buyer;
-      window.open(buyer + `/connect/login/web/` + code, "_self");
+      window.open(buyer + `/passport/connect/connect/login/web/` + code, "_self");
    },
    backToHome() {
      uni.switchTab({
@@ -55,8 +55,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-
-
 .wx-auth-container {
  width: 100%;

--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="container">
 		<u-navbar :custom-back="back" title="小程序登录"></u-navbar>
-    <u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'商城'" :show-confirm-button="false">
+		<u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'商城'"
+			:show-confirm-button="false">
 			<div class="tips">
 				为了更好地用户体验，需要您授权手机号
 			</div>
@@ -19,7 +20,8 @@
 					<view>您的公开信息（昵称、头像）</view>
 				</view>
 				<view class="btns">
-          <button type="primary" bindtap="getUserProfile" @click="getUserProfile()" class="btn-auth">使用微信授权</button>
+					<button type="primary" bindtap="getUserProfile" @click="getUserProfile()"
+						class="btn-auth">登录</button>
 					<div @click="backToHome" class="btn-callback">暂不登录</div>
 				</view>
 			</div>
@@ -28,15 +30,22 @@
 </template>

 <script>
-import { mpAutoLogin } from "@/api/connect.js";
+	import {
+		mpAutoLogin
+	} from "@/api/connect.js";

-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
-import { getUserInfo } from "@/api/members";
-import storage from "@/utils/storage.js";
-import config from '@/config/config'
-export default {
+	import {
+		whetherNavigate
+	} from "@/utils/Foundation"; //登录跳转
+	import {
+		getUserInfo
+	} from "@/api/members";
+	import storage from "@/utils/storage.js";
+	import config from '@/config/config'
+	export default {
 		data() {
 			return {
+        configs:config,
 				// 是否展示手机号码授权弹窗，默认第一步不展示，要先获取用户基础信息
 				phoneAuthPopup: false,
 				// 授权信息展示，商城名称
@@ -53,15 +62,12 @@ export default {
 		//微信小程序进入页面，先获取code，否则几率出现code和后续交互数据不对应情况
 		mounted() {
 			// 小程序默认分享
-    uni.showShareMenu({ withShareTicket: true });
+			uni.showShareMenu({
+				withShareTicket: true
+			});

 			let that = this;
-    //获取code
-    uni.login({
-      success: (res) => {
-        that.code = res.code;
-      },
-    });
+			
 		},
 		methods: {
 			/**
@@ -81,27 +87,80 @@ export default {
 					url: `/pages/tabbar/home/index`,
 				});
 			},
+
+
+
+
 			//获取用户信息
      getUserProfile(e) {
        let that = this;
+        //获取code
+        uni.login({
+          success: (res) => {
+            if(res.errMsg === "login:ok") {
+              that.code = res.code
+            } else {
+              uni.showToast({
+                title: "系统异常，请联系管理员！"
+              })
+            }
+          },
+        });
+
+        if (this.code) {
          // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
          uni.getUserProfile({
            desc: "用于完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
            success: (res) => {
              that.nickName = res.userInfo.nickName;
              that.image = res.userInfo.avatarUrl;
-          //展示手机号获取授权
+
+              /**
+               * 根据公有的配置设置登录方式
+               */
+              if(this.configs.enableFetchMobileLogin){
                this.phoneAuthPopup = true;
-        },
-        fail: (res) => {
-          that.nickName = "微信用户";
-          that.image =
-            "https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132";
-          //展示手机号获取授权
-          this.phoneAuthPopup = true;
-        },
+                return false
+              }
+              let iv = res.iv;
+              let encryptedData = res.encryptedData;
+
+              let code = this.code;
+              let image = this.image;
+              let nickName = this.nickName;
+              mpAutoLogin({
+                encryptedData,
+                iv,
+                code,
+                image,
+                nickName,
+              }).then((apiRes) => {
+                storage.setAccessToken(apiRes.data.result.accessToken);
+                storage.setRefreshToken(apiRes.data.result.refreshToken);
+                // 登录成功
+                uni.showToast({
+                  title: "登录成功!",
+                  icon: "none",
+                });
+                //获取用户信息
+                getUserInfo().then((user) => {
+                  storage.setUserInfo(user.data.result);
+                  storage.setHasLogin(true);
+
+                  uni.navigateBack({
+                    delta: 1,
+                  });
+                });
              });
            },
+            fail: (res) => {
+
+            },
+          });
+        }
+
+			},
+
 			//获取手机号授权
 			getPhoneNumber(e) {
 			  let iv = e.detail.iv;
@@ -142,21 +201,25 @@ export default {
 			    });
 			  });
 			},
+
+
+
+
 		},
-};
+	};
 </script>
 <style lang="scss" scoped>
-/*微信授权*/
-page {
+	/*微信授权*/
+	page {
 		background-color: #ffffff;
-}
+	}

-.wx-auth-container {
+	.wx-auth-container {
 		width: 100%;
 		margin-top: 20%;
-}
+	}

-.logo-info {
+	.logo-info {
 		display: flex;
 		flex-wrap: nowrap;
 		justify-content: flex-start;
@@ -166,80 +229,80 @@ page {

 		flex-direction: column;
 		font-weight: bold;
-}
+	}

-image {
+	image {
 		width: 100px;
 		height: 100px;
 		text-align: center;
 		-webkit-transform: scale(2.5);
 		transform: scale(2.5);
-}
+	}

-.logo-info-img {
+	.logo-info-img {
 		width: 80rpx;
 		height: 80rpx;
 		border-radius: 50%;
 		border: none;
-}
+	}

-text.title,
-text.shop {
+	text.title,
+	text.shop {
 		display: inline-block;
 		font-size: 60rpx;
 		color: #333;
-}
+	}

-text.shop {
+	text.shop {
 		display: inline-block;
 		font-size: 55rpx;
 		color: #333;
-}
+	}

-.box {
+	.box {
 		margin: 0 32rpx;
-}
+	}

-/* 文字提示*/
-.small-tips {
+	/* 文字提示*/
+	.small-tips {
 		width: 94%;
 		padding: 20rpx;
 		font-size: 24rpx;
 		margin: 0 0 20rpx;
 		color: #999;
-}
+	}

-.auth-button {
+	.auth-button {
 		padding: 10px 20px;
 		width: calc(100% - 20 * 4rpx);
-}
+	}

-.tips {
+	.tips {
 		width: 80%;
 		text-align: left;
 		margin: 6% 10%;
 		margin-top: 48rpx;
 		line-height: 1.75;
-}
+	}

-.register {
+	.register {
 		color: $weChat-color !important;
 		border: none !important;
 		background: #fff !important;
-}
+	}

 .btn-auth {
  width: 92%;
  margin: 0 auto 40rpx;
  border-radius: 100px;
-  animation: mymove 5s infinite;
-  -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
-  animation-direction: alternate; /*轮流反向播放动画。*/
-  animation-timing-function: ease-in-out; /*动画的速度曲线*/
-  /* Safari 和 Chrome */
-  -webkit-animation: mymove 5s infinite;
-  -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
-  -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
+  // animation: mymove 5s infinite;
+  // -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
+  // animation-direction: alternate; /*轮流反向播放动画。*/
+  // animation-timing-function: ease-in-out; /*动画的速度曲线*/
+  // /* Safari 和 Chrome */
+  // -webkit-animation: mymove 5s infinite;
+  // -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
+  // -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
 }
 .btn-callback {
  text-align: center;
@@ -252,26 +315,42 @@ text.shop {
  margin: 0 auto;
 }

-.btns {
+	.btn-callback {
+		text-align: center;
+		font-size: 30rpx;
+		background: #ededed;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 100px;
+		width: 92%;
+		margin: 0 auto;
+	}
+
+	.btns {
 		margin-top: 100rpx;
 		display: flex;
 		flex-direction: column;
 		width: 100%;
 		justify-content: center;
-}
+	}

-@keyframes mymove {
+	@keyframes mymove {
 		0% {
-    transform: scale(1); /*开始为原始大小*/
+			transform: scale(1);
+			/*开始为原始大小*/
 		}
+
 		25% {
-    transform: scale(1.1); /*放大1.1倍*/
+			transform: scale(1.1);
+			/*放大1.1倍*/
 		}
+
 		50% {
 			transform: scale(1);
 		}
+
 		75% {
 			transform: scale(1.1);
 		}
-}
+	}
 </style>
--- a/pages/product/askList.vue
+++ b/pages/product/askList.vue
@@ -70,7 +70,7 @@ export default {
          title: "请填写内容!",
          icon: "none",
        });
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
        return false;
      }
      API_MEM.consultating(
@@ -86,11 +86,11 @@ export default {
            });
            this.askValue = "";
          }
-          uni.hideLoading();
+           if (this.$store.state.isShowToast){ uni.hideLoading() };
        })
        .catch((err) => {
        
-          uni.hideLoading();
+           if (this.$store.state.isShowToast){ uni.hideLoading() };
        });
    },
    radioGroupChange(e) {
--- a/pages/product/comment.vue
+++ b/pages/product/comment.vue
@@ -20,7 +20,7 @@
          </div>
          <view class="eva-box" v-for="(item, index) in commDetail" :key="index">
            <view class="section-info">
-              <image class="portrait" :src="item.memberProfile || '/static/missing-face.png'" mode="aspectFill"></image>
+              <image class="portrait" :src="item.memberProfile || userImage" mode="aspectFit"></image>
              <view class="star-content">
                <text class="name">{{ item.memberName | noPassByName }}</text>
                <text class="time">{{ item.createTime }}</text>
@@ -65,11 +65,13 @@
 <script>
 // import { getGoodsDetail } from '@/api/goods.js';
 import * as membersApi from "@/api/members.js";
-
+import configs from '@/config/config'
 export default {
  data() {
    return {
+      configs,
      status: "loadmore", //底部刷新状态
+      userImage:configs.defaultUserPhoto,
      commentDetail: "", //评价详情
      selectIndex: "0", //检索条件
      params: {  // 评论分页提交数据
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -6,55 +6,28 @@
    <!-- 仅h5有效 打开App -->

    <!-- 分享 -->
-    <shares
-      v-if="shareFlage && goodsDetail.id"
-      :skuId="this.routerVal.id"
-      :goodsId="this.routerVal.goodsId"
-      :link="
+    <shares v-if="enableShare && goodsDetail.id" :skuId="this.routerVal.id" :goodsId="this.routerVal.goodsId" :link="
      '/pages/product/goods?id=' +
      this.routerVal.id +
      '&goodsId=' +
      this.routerVal.goodsId
-      "
-      :thumbnail="goodsDetail.thumbnail"
-      :goodsName="goodsDetail.goodsName"
-      type="goods"
-      @close="shareFlage = false"
-    />
-    <popups
-      v-model="popupsSwitch"
-      @tapPopup="handleNavbarList"
-      :popData="navbarListData"
-      :x="navbarListX"
-      :y="navbarListY"
-      placement="top-start"
-    />
+    " :thumbnail="goodsDetail.thumbnail" :goodsName="goodsDetail.goodsName" type="goods"
+      @close="enableShare = false" />
+    <popups v-model="popupsSwitch" @tapPopup="handleNavbarList" :popData="navbarListData" :x="navbarListX"
+      :y="navbarListY" placement="top-start" />
    <view class="index">
      <!-- topBar -->
-      <u-navbar
-        :background="navbar"
-        :is-back="false"
-        :class="headerFlag ? 'header' : 'header bg-none scroll-hide'"
-      >
+      <u-navbar :background="navbar" :is-back="false" :class="headerFlag ? 'header' : 'header bg-none scroll-hide'">
        <div class="headerRow">
          <div class="backs">
            <u-icon @click="back()" name="arrow-left" class="icon-back"></u-icon>

-            <u-icon
-              name="list"
-              @click="popupsSwitch = !popupsSwitch"
-              class="icon-list"
-            ></u-icon>
+            <u-icon name="list" @click="popupsSwitch = !popupsSwitch" class="icon-list"></u-icon>
          </div>
          <div class="headerList" :class="headerFlag ? 'tab-bar' : 'tab-bar scroll-hide'">
            <div class="headerRow">
-              <div
-                class="nav-item"
-                v-for="header in headerList"
-                :key="header.id"
-                :class="{ cur: scrollId === header.id }"
-                @click="headerTab(header.id)"
-              >
+              <div class="nav-item" v-for="header in headerList" :key="header.id"
+                :class="{ cur: scrollId === header.id }" @click="headerTab(header.id)">
                {{ header.text }}
              </div>
            </div>
@@ -62,74 +35,40 @@
        </div>
      </u-navbar>

-      <u-navbar
-        :border-bottom="false"
-        v-show="!headerFlag"
-        class="header-only-back"
-        :background="navbarOnlyBack"
-        :is-back="false"
-      >
+      <u-navbar :border-bottom="false" v-show="!headerFlag" class="header-only-back" :background="navbarOnlyBack"
+        :is-back="false">
        <div>
          <div class="bg-back">
-            <u-icon
-              size="40"
-              @click="back()"
-              name="arrow-left"
-              class="icon-back"
-            ></u-icon>
-            <u-icon
-              size="40"
-              @click="popupsSwitch = !popupsSwitch"
-              name="list"
-              class="icon-list"
-            ></u-icon>
+            <u-icon size="40" @click="back()" name="arrow-left" class="icon-back"></u-icon>
+            <u-icon size="40" @click="popupsSwitch = !popupsSwitch" name="list" class="icon-list"></u-icon>
          </div>
        </div>
      </u-navbar>
    </view>

-    <view
-      class="product-container"
-      :style="{ height: productRefHeight }"
-      ref="productRef"
-      id="productRef"
-    >
-      <scroll-view
-        scroll-anchoring
-        enableBackToTop="true"
-        scroll-with-animation
-        scroll-y
-        class="scroll-page"
-        :scroll-top="tabScrollTop"
-        @scroll="pageScroll"
-      >
+    <view class="product-container" :style="{ height: productRefHeight }" ref="productRef" id="productRef">
+      <scroll-view scroll-anchoring enableBackToTop="true" scroll-with-animation scroll-y class="scroll-page"
+        :scroll-top="tabScrollTop" @scroll="pageScroll">
        <view>
          <!-- 轮播图 -->
-          <GoodsSwiper id="main1" :res="imgList" />
+         
+          <GoodsSwiper id="main1" :res="imgList" :video="goodsDetail.goodsVideo" />

          <!-- 促销活动条 -->
-          <PromotionAssembleLayout
-            v-if="PromotionList"
-            :detail="goodsDetail"
-            :res="PromotionList"
-          />
+          <PromotionAssembleLayout v-if="PromotionList" :detail="goodsDetail" :res="PromotionList" />

          <view class="card-box top-radius-0" id="main2">
            <!-- 活动不显示价钱 -->
-            <view v-if="!promotionFlag" class="desc-bold -goods-msg">
+            <view v-if="isSeckill || isGroup" class="desc-bold -goods-msg">
              <view class="-goods-flex">
                <view class="desc-bold">
                  {{ goodsDetail.goodsName || "" }}
                </view>
                <view class="favorite" @click="clickFavorite(goodsDetail.id)">
-                  <u-icon
-                    size="30"
-                    :color="favorite ? '#f2270c' : '#262626'"
-                    :name="favorite ? 'heart-fill' : 'heart'"
-                  >
+                  <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'" :name="favorite ? 'heart-fill' : 'heart'">
                  </u-icon>
                  <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{
-                    favorite ? "已收藏" : "收藏"
+                    favorite? "已收藏": "收藏"
                  }}</view>
                </view>
              </view>
@@ -144,19 +83,35 @@
                <view class="-goods-flex">
                  <!-- 如果有积分显示积分 -->
                  <view class="-goods-price" v-if="goodsDetail.price != undefined">
-                    <span v-if="pointDetail.points">
-                      <span class="price">{{ pointDetail.points }}</span>
-                      <span>积分</span>
-                    </span>

+                    <span>
+                      <span v-if="wholesaleList.length">
+                        <span>¥</span><span class="price">{{
+                          $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length - 1].price)[0]
+                        }}</span>.{{
+                          $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length - 1].price)[1]
+                        }}
+                        ~
+                        <span>¥</span><span class="price">{{
+                          $options.filters.goodsFormatPrice(wholesaleList[0].price)[0]
+                        }}</span>.{{
+                          $options.filters.goodsFormatPrice(wholesaleList[0].price)[1]
+                        }}
+                      </span>
                      <span v-else>
-                      <span>¥</span
-                      ><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span
-                      >.{{ formatPrice(goodsDetail.price)[1] }}
+                        <span>¥</span><span class="price">{{
+                          $options.filters.goodsFormatPrice(goodsDetail.price)[0]
+                        }}</span>.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
+                      </span>
                    </span>
                  </view>
                  <view class="-goods-price" v-else>
+                    <div v-if="takeDownFromSale" class="price down-goods">
+                      暂无报价
+                    </div>
+                    <span v-else>
                    ¥<span class="price">0 </span>.00
+                    </span>
                  </view>

                  <view class="icons share" @click="shareChange()">
@@ -164,13 +119,10 @@
                    <view>分享</view>
                  </view>
                  <view class="icons" @click="clickFavorite(goodsDetail.id)">
-                    <u-icon
-                      size="30"
-                      :color="favorite ? '#f2270c' : '#262626'"
-                      :name="favorite ? 'heart-fill' : 'heart'"
-                    ></u-icon>
+                    <u-icon size="30" :color="favorite ? '#f2270c' : '#262626'"
+                      :name="favorite ? 'heart-fill' : 'heart'"></u-icon>
                    <view :style="{ color: favorite ? '#f2270c' : '#262626' }">{{
-                      favorite ? "已收藏" : "收藏"
+                      favorite? "已收藏": "收藏"
                    }}</view>
                  </view>
                </view>
@@ -198,22 +150,16 @@
          </view>

          <!-- 拼团用户列表 -->
-          <PromotionAssembleListLayout
-            v-if="isGroup"
-            @to-assemble-buy-now="toAssembleBuyNow"
-            :res="PromotionList"
-          />
+          <PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" />

          <!-- 配置地址 如果是虚拟产品的时候不展示 -->
          <view class="card-box" v-if="goodsDetail.goodsType != 'VIRTUAL_GOODS'">
            <view class="card-flex" @click="shutMask(4)">
              <view class="card-title"> 已选 </view>
              <view class="card-content">
-                <span v-if="selectedGoods.spec"
-                  >{{ selectedGoods.spec.specName }}-{{
+                <span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
                  selectedGoods.spec.specValue
-                  }}</span
-                >
+                }}</span>
                <span v-else>默认</span>
              </view>
              <view class="card-bottom">
@@ -238,27 +184,18 @@
          <Evaluation id="main5" :goodsDetail="goodsDetail" />

          <!-- 店铺推荐 -->
-          <storeLayout
-            id="main7"
-            :storeDetail="storeDetail"
-            :goodsDetail="goodsDetail"
-            :res="recommendList"
-          />
+          <storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />

          <!-- 宝贝详情 -->
-          <GoodsIntro
-            id="main9"
-            :res="goodsDetail"
-            :goodsParams="goodsParams"
-            :goodsId="goodsDetail.goodsId"
-            v-if="goodsDetail.id"
-          />
+          <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId"
+            v-if="goodsDetail.id" />

          <!-- 宝贝推荐 -->
          <GoodsRecommend id="main11" :res="likeGoodsList" />
        </view>
      </scroll-view>

+
      <view class="page-bottom mp-iphonex-bottom" id="pageBottom">
        <view class="icon-btn">
          <view class="icon-btn-item" @click="navigateToStore(goodsDetail.storeId)">
@@ -275,20 +212,20 @@
            <view v-if="nums && nums > 0" class="num-icon">{{ nums }}</view>
          </view>
        </view>
+        <!-- 下架展示 -->
+        <div class="detail-btn" v-if="takeDownFromSale">
+          <view class="to-store-car to-store-btn"  @click="reStartTakeDownSale">
+            查看类似商品</view>
+        </div>
        <!-- 正常结算页面 -->
-        <view class="detail-btn" v-if="!isGroup">
-          <view
-            class="to-store-car to-store-btn"
-            v-if="goodsDetail.goodsType != 'VIRTUAL_GOODS'"
-            @click="shutMask(4)"
-          >
-            加入购物车</view
-          >
+        <view class="detail-btn" v-if="!isGroup && !takeDownFromSale">
+          <view class="to-store-car to-store-btn" v-if="goodsDetail.goodsType != 'VIRTUAL_GOODS'" @click="shutMask(4)">
+            加入购物车</view>
          <view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
          <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
        </view>
        <!-- 拼团结算 -->
-        <view class="detail-btn" v-else>
+        <view class="detail-btn" v-else-if="isGroup">
          <view class="to-store-car pt-buy to-store-btn" @click="shutMask(4, 'buy')">
            <view>￥{{ goodsDetail.price | unitPrice }}</view>
            <view>单独购买</view>
@@ -302,15 +239,8 @@
      <!-- 规格-模态层弹窗 -->
      <view class="spec">
        <!-- 促销弹窗 -->
-        <u-popup
-          v-model="promotionShow"
-          :height="setup.height"
-          :mode="setup.mode"
-          :border-radius="setup.radius"
-          @close="promotionShow = false"
-          :mask-close-able="setup.close"
-          closeable
-        >
+        <u-popup v-model="promotionShow" :height="setup.height" :mode="setup.mode" :border-radius="setup.radius"
+          @close="promotionShow = false" :mask-close-able="setup.close" closeable>
          <view class="header-title">优惠</view>
          <view class="cuxiao">
            <scroll-view class="scroll_mask" :scroll-y="true">
@@ -327,30 +257,18 @@
        </u-popup>

        <!-- 配送地址弹窗 -->
-        <popupAddress
-          @closeAddress="closePopupAddress"
-          @deliveryData="deliveryFun"
-          v-if="goodsDetail.id"
-          :goodsId="goodsDetail.id"
-          :addressFlag="addressFlag"
-        />
+        <popupAddress @closeAddress="closePopupAddress" @deliveryData="deliveryFun" v-if="goodsDetail.id"
+          :goodsId="goodsDetail.id" :addressFlag="addressFlag" />

        <!-- 商品规格  商品详情，以及默认参与活动的id-->
-        <popupGoods
-          :addr="delivery"
-          ref="popupGoods"
-          @changed="changedGoods"
-          @closeBuy="closePopupBuy"
-          @queryCart="cartCount()"
-          :goodsDetail="goodsDetail"
-          :goodsSpec="goodsSpec"
-          :isGroup="isGroup"
-          :id="productId"
-          v-if="goodsDetail.id"
-          :pointDetail="pointDetail"
-          @handleClickSku="selectSku"
-          :buyMask="buyMask"
-        />
+        <popupGoods :addr="delivery" ref="popupGoods" @changed="changedGoods" @closeBuy="closePopupBuy"
+          @queryCart="cartCount()" :goodsDetail="goodsDetail" :goodsSpec="goodsSpec" :isGroup="isGroup" :id="productId"
+          v-if="goodsDetail.id" :pointDetail="pointDetail" :wholesaleList="wholesaleList" @handleClickSku="selectSku"
+          :buyMask="buyMask" />
+
+
+        <!-- 下架框 -->
+        <takeDownFormSaleGoods ref="takeDownSale" v-if="takeDownFromSale" />
      </view>
    </view>
  </div>
@@ -382,8 +300,9 @@ import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 import popupAddress from "./product/popup/address"; //地址选择模块
 import shares from "@/components/m-share/index"; //分享
 import popups from "@/components/popups/popups"; //气泡框
-
+import takeDownFormSaleGoods from "@/components/m-take-down-sale-goods/index"; //下架框
 import setup from "./product/popup/popup";
+
 export default {
  components: {
    popups,
@@ -400,12 +319,12 @@ export default {
    GoodsSwiper,
    popupGoods,
    popupAddress,
+    takeDownFormSaleGoods
  },
-  data() {
+  data () {
    return {
      setup,
      promotionShow: false, //弹窗开关
-      promotionFlag: true, //活动开关
      // #ifdef H5
      navbarListX: 110, //导航栏列表栏x轴
      navbarListY: 80, //导航栏列表栏y轴
@@ -442,9 +361,10 @@ export default {
        },
      ],
      popupsSwitch: false, //导航栏列表栏开关
-      shareFlage: false,
+      enableShare: false,
      selectedGoods: "", //选择的商品规格昵称
      isGroup: false, // 是否是拼团活动
+      isSeckill: false, // 是否秒杀活动
      pointDetail: "", // 是否是积分商品
      assemble: "", //拼团的sku
      navbarOnlyBack: {
@@ -480,14 +400,11 @@ export default {
          id: "4",
        },
      ],
-      oldtabScrollTop: 0,
      tabScrollTop: null,
      scrollArr: [],
      scrollId: "1",
-
      scrollFlag: true,
      current: "1", //当前显示的轮播图页
-
      goodsDetail: {}, //商品数据
      goodsSpec: "", //规格数据
      imgList: [], //轮播图数据
@@ -497,12 +414,9 @@ export default {
      goodsInfo: false, //商品介绍弹窗
      addressFlag: false, //配送地址弹窗
      buyMask: false, //添加购物车直接购买，查看已选 弹窗
-
      num: 1, //添加到购物车的数量
-
      skuId: "", //
      storeDetail: "", //店铺基本信息,
-
      // 店铺信息
      storeParams: {
        pageNumber: 1,
@@ -512,7 +426,6 @@ export default {
      likeGoodsList: "", //相似商品列表
      PromotionList: "", //活动,促销，列表
      specList: [],
-      skusCombination: [],
      selectedSpec: [],
      nums: 0,
      delivery: "",
@@ -524,31 +437,31 @@ export default {

      routerVal: "",
      IMLink: "", // IM地址
+      wholesaleList: [],
+      takeDownFromSale: false, // 下架销售状态
    };
  },

  computed: {
-    IM() {
+    // udesk IM 
+    IM () {
      return this.IMLink + this.storeDetail.merchantEuid;
    },
  },

  watch: {
-    isGroup(val) {
+    isGroup (val) {
      if (val) {
        let timer = setInterval(() => {
          this.$refs.popupGoods.buyType = "PINTUAN";
          clearInterval(timer);
        }, 100);
-
-        this.promotionFlag = false;
      } else {
-        this.promotionFlag = true;
        this.$refs.popupGoods.buyType = "";
      }
    },
  },
-  mounted() {
+  mounted () {
    const { windowHeight } = uni.getSystemInfoSync();
    let bottomHeight = 0;
    let topHeight = 0;
@@ -578,7 +491,7 @@ export default {

    this.productRefHeight = windowHeight - bottomHeight + "px";
  },
-  async onLoad(options) {
+  async onLoad (options) {
    this.routerVal = options;
    // #ifdef MP-WEIXIN
    // 小程序默认分享
@@ -588,7 +501,7 @@ export default {
    });
    // #endif
  },
-  async onShow() {
+  async onShow () {
    this.goodsDetail = {};
    //如果有参数ids说明事分销短连接，需要获取参数
    if (this.routerVal.scene) {
@@ -602,30 +515,26 @@ export default {
      this.init(this.routerVal.id, this.routerVal.goodsId, this.routerVal.distributionId);
    }
  },
-  // #ifdef MP-WEIXIN
-  onShareAppMessage(res) {
-    return {
-      path: this.share(),
-      title: `[好友推荐]${this.goodsDetail.goodsName}`,
-      imageUrl: this.goodsDetail.goodsGalleryList[0],
-    };
-  },
-  // #endif
+
  methods: {
-    share() {
+    // 重新打开下架
+    reStartTakeDownSale(){
+      this.$refs.takeDownSale.show = true
+    },
+    share () {
      return `/pages/product/goods?id=${this.routerVal.id}&goodsId=${this.routerVal.goodsId}`;
    },
    /**
     * 导航栏列表栏
     */
-    handleNavbarList(val) {
+    handleNavbarList (val) {
      modelNavigateTo({ url: val });
    },

    /**
     * 循环出当前促销是否为空
     */
-    emptyPromotion() {
+    emptyPromotion () {
      if (
        this.PromotionList == "" ||
        this.PromotionList == null ||
@@ -634,23 +543,28 @@ export default {
        return true;
      }
    },
-    selectSku(idObj) {
+    selectSku (idObj) {
      this.init(idObj.skuId, idObj.goodsId);
    },
    /**
     * 初始化信息
     */
-    async init(id, goodsId, distributionId = "") {
+    async init (id, goodsId, distributionId = "") {
      this.isGroup = false; //初始化拼团
      this.productId = id; // skuId
      // 这里请求获取到页面数据  解析数据

      let response = await getGoods(id, goodsId);
      
+      // 判断当前接口返回内容 
      if (!response.data.success) {
-        setTimeout(() => {
-          uni.navigateBack();
-        }, 500);
+        // 商品已下架
+        if(response.data.code == 11001){
+          this.takeDownFromSale = true
+        }
+        // setTimeout(() => {
+        //   uni.navigateBack();
+        // }, 500);
      }
      // 这里是绑定分销员
      if (distributionId || this.$store.state.distributionId) {
@@ -661,6 +575,7 @@ export default {
      }
      /**商品信息以及规格信息存储 */
      this.goodsDetail = response.data.result.data;
+      this.wholesaleList = response.data.result.wholesaleList;
      this.goodsSpec = response.data.result.specs;
      this.PromotionList = response.data.result.promotionMap;
      this.goodsParams = response.data.result.goodsParamsDTOList || [];
@@ -672,9 +587,10 @@ export default {
          if (item.indexOf("PINTUAN") == 0) {
            this.isGroup = true;
          }
-          // 积分
-          if (item.indexOf("POINTS_GOODS") == 0) {
-            this.pointDetail = this.PromotionList[item];
+
+          // 秒杀
+          if (item.indexOf("SECKILL") == 0) {
+            this.isSeckill = true
          }
        });
      // 轮播图
@@ -700,89 +616,90 @@ export default {
      // this.getIMDetailMethods();
    },

-    async getIMDetailMethods() {
+    async getIMDetailMethods () {
      let res = await getIMDetail();
      if (res.data.success) {
        this.IMLink = res.data.result;
      }
    },

-    linkMsgDetail() {
-      if (this.storeDetail.merchantEuid) {
-        uni.navigateTo({
-          url: `/pages/tabbar/home/web-view?src=${this.IM}`,
-        });
-      } else {
-        // 客服
-        // #ifdef MP-WEIXIN
-        const params = {
-          storeName: this.storeDetail.storeName,
-          goodsName: this.goodsDetail.goodsName,
-          goodsId: this.goodsDetail.goodsId,
-          goodsImg: this.goodsDetail.thumbnail,
-          price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
-          // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
-          uuid: storage.getUuid(),
-          token: storage.getAccessToken(),
-          sign: this.storeDetail.yzfSign,
-          mpSign: this.storeDetail.yzfMpSign,
-        };
-        uni.navigateTo({
-          url:
-            "/pages/product/customerservice/index?params=" +
-            encodeURIComponent(JSON.stringify(params)),
-        });
-        // #endif
-        // #ifndef MP-WEIXIN
-        const sign = this.storeDetail.yzfSign;
-        uni.navigateTo({
-          url:
-            "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
-            sign,
-        });
-        // #endif
-      }
-    },
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
+    linkMsgDetail () {
+      // lili 基础客服
+      this.$options.filters.talkIm(this.goodsDetail.storeId, this.routerVal.goodsId, this.routerVal.id)
+      // uni.navigateTo({
+      //   url: `/pages/mine/im/index?userId=${this.goodsDetail.storeId}&goodsid=${this.routerVal.goodsId}&skuid=${this.routerVal.id}`
+      // });

+      // udesk 代码  
+      // if (this.storeDetail.merchantEuid) {
+      //   uni.navigateTo({
+      //     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
+      //   });
+      // }
+
+
+      // 客服 云智服代码 
+      // // #ifdef MP-WEIXIN
+      // const params = {
+      //   storeName: this.storeDetail.storeName,
+      //   goodsName: this.goodsDetail.goodsName,
+      //   goodsId: this.goodsDetail.goodsId,
+      //   goodsImg: this.goodsDetail.thumbnail,
+      //   price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
+      //   // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+      //   uuid: storage.getUuid(),
+      //   token: storage.getAccessToken(),
+      //   sign: this.storeDetail.yzfSign,
+      //   mpSign: this.storeDetail.yzfMpSign,
+      // };
+      // uni.navigateTo({
+      //   url:
+      //     "/pages/product/customerservice/index?params=" +
+      //     encodeURIComponent(JSON.stringify(params)),
+      // });
+      // // #endif
+      // // #ifndef MP-WEIXIN
+      // const sign = this.storeDetail.yzfSign;
+      // uni.navigateTo({
+      //   url:
+      //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
+      //     sign,
+      // });
+      // // #endif
+
+    },
    /**选择商品 */
-    changedGoods(val) {
+    changedGoods (val) {
      this.selectedGoods = val;
    },

    /**  点击子级地址回调参数*/
-    deliveryFun(val) {
+    deliveryFun (val) {
      this.delivery = val;
    },
    /**
     * 地址子级关闭回调
     */
-    closePopupAddress(val) {
+    closePopupAddress (val) {
      this.addressFlag = val;
      // this.maskFlag = false;
    },
    /**
     * 商品规格子级关闭回调
     */
-    closePopupBuy(val) {
+    closePopupBuy (val) {
      this.buyMask = val;
      // this.maskFlag = false;
    },

    /** 参与拼团  创建拼团 */
-    toAssembleBuyNow(order) {
+    toAssembleBuyNow (order) {
      this.shutMask(4, "PINTUAN", order);
    },
    /**
     * 查看购物车
     */
-    reluchToCart() {
+    reluchToCart () {
      let obj = {
        from: "product",
        id: this.productId,
@@ -796,7 +713,7 @@ export default {
    /**
     * 查询购物车总数量
     */
-    cartCount() {
+    cartCount () {
      if (storage.getHasLogin()) {
        API_trade.getCartNum().then((res) => {
          this.nums = res.data.result;
@@ -807,7 +724,7 @@ export default {
    /**
     * 返回
     */
-    back() {
+    back () {
      if (getCurrentPages().length == 1) {
        uni.switchTab({
          url: "/pages/tabbar/home/index",
@@ -820,7 +737,7 @@ export default {
    /**
     * 获取店铺信息
     */
-    getStoreBaseInfoFun(id) {
+    getStoreBaseInfoFun (id) {
      API_store.getStoreBaseInfo(id).then((res) => {
        if (res.data.success) {
          this.storeDetail = res.data.result;
@@ -831,7 +748,7 @@ export default {
    /**
     * 删除收藏店铺
     */
-    deleteGoodsCollectionFun(id) {
+    deleteGoodsCollectionFun (id) {
      API_Members.deleteGoodsCollection(id).then((res) => {
        if (res.statusCode == 200) {
          uni.showToast({
@@ -846,7 +763,7 @@ export default {
    /**
     * 获取商品是否已被收藏
     */
-    getGoodsCollectionFun(goodsId) {
+    getGoodsCollectionFun (goodsId) {
      if (storage.getHasLogin()) {
        API_Members.getGoodsIsCollect("GOODS", goodsId).then((res) => {
          this.favorite = res.data.result;
@@ -857,14 +774,14 @@ export default {
    /**
     * 获取店铺推荐商品列表
     */
-    getStoreRecommend() {
+    getStoreRecommend () {
      getGoodsList({
        pageNumber: 1,
        pageSize: 6,
        storeId: this.goodsDetail.storeId,
        recommend: true,
      }).then((res) => {
-        this.recommendList = res.data.result.content;
+        this.recommendList = res.data.result.records;
      });
    },

@@ -872,21 +789,21 @@ export default {
     * 获取相似商品列表
     *
     */
-    getOtherLikeGoods() {
+    getOtherLikeGoods () {
      getGoodsList({
        pageNumber: 1,
        pageSize: 10,
        category: this.goodsDetail.categoryId,
        keyword: this.goodsDetail.name,
      }).then((res) => {
-        this.likeGoodsList = res.data.result.content;
+        this.likeGoodsList = res.data.result.records;
      });
    },

    /**
     * 领取优惠券
     */
-    receiveCouponsFun(id) {
+    receiveCouponsFun (id) {
      API_Members.receiveCoupons(id).then((res) => {
        uni.showToast({
          title: res.data.message,
@@ -898,7 +815,7 @@ export default {
    /**
     * 跳转到店铺页面
     */
-    navigateToStore(store_id) {
+    navigateToStore (store_id) {
      uni.navigateTo({
        url: `/pages/product/shopPage?id=` + store_id,
      });
@@ -907,14 +824,14 @@ export default {
    /**
     * 获取优惠券按钮
     */
-    getCoupon(item) {
+    getCoupon (item) {
      this.receiveCouponsFun(item.id);
    },

    /**
     * 规格弹窗开关
     */
-    shutMask(flag, buyFlag, type) {
+    shutMask (flag, buyFlag, type) {
      this.promotionShow = false;
      this.buyMask = false;
      this.addressFlag = false;
@@ -949,7 +866,7 @@ export default {
    /**
     * 收藏
     */
-    clickFavorite(id) {
+    clickFavorite (id) {
      if (this.favorite) {
        // 取消收藏
        this.deleteGoodsCollectionFun(id);
@@ -969,7 +886,7 @@ export default {
    /**
     * 顶部header显示或隐藏
     */
-    pageScroll(e) {
+    pageScroll (e) {
      if (this.scrollFlag) {
        this.calcSize();
      }
@@ -997,7 +914,7 @@ export default {
    /**
     * 计算每个要跳转到的模块高度信息
     */
-    calcSize() {
+    calcSize () {
      let h = 0;
      let that = this;
      let arr = [
@@ -1042,7 +959,7 @@ export default {
    /**
     * 点击顶部跳转到对应位置
     */
-    headerTab(id) {
+    headerTab (id) {
      if (this.scrollFlag) {
        this.calcSize();
      }
@@ -1056,8 +973,8 @@ export default {
    /**
     * 点击分享
     */
-    async shareChange() {
-      this.shareFlage = true;
+    async shareChange () {
+      this.enableShare = true;
    },
  },
 };
--- a/pages/product/product/goods/-goods-intro.vue
+++ b/pages/product/product/goods/-goods-intro.vue
@@ -18,6 +18,7 @@
            :use-cache="true"
            :show-with-animation="true"
            :html="res.mobileIntro"
+            :tag-style="style"
          ></u-parse>
        </view>
      </view>
@@ -64,6 +65,9 @@ export default {
  data() {
    return {
      goodsDetail: "",
+      style: {
+        img:"display:block"
+			}
    };
  },
  props: ["res", "goodsId", "goodsParams"],
--- a/pages/product/product/goods/-goods-recommend.vue
+++ b/pages/product/product/goods/-goods-recommend.vue
@@ -1,169 +1,20 @@
 <template>
  <view class="recommend-box" >
-    <h4 class="goods-recommend-title">宝贝推荐</h4>
-    <view class="like-goods-list">
-      <view class="like-goods-list">
-        <view
-          class="like-goods-item"
-          @click="clickGoods(item)"
-          v-for="(item, index) in res"
-          :key="index"
-        >
-          <u-image
-            :fade="true"
-            duration="450"
-            :lazy-load="true"
-            :src="item.content.thumbnail"
-            width="330rpx"
-            height="330rpx"
-            class="like-goods-uimage"
-          >
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-          <view style="background-color: #ffffff; width: 100%">
-            <view class="name">{{ item.content.goodsName }}</view>
-            <view class="price-sales">
-              <div class="item-price" v-if="item.content.price != undefined">
-                ￥
-                <span>{{ formatPrice(item.content.price)[0] }}</span>
-                .{{formatPrice(item.content.price)[1]}}
-                <!-- <text v-if="item.point != undefined">+{{ item.point }}积分</text> -->
-              </div>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
+    <h4 class="goods-recommend-title">热门商品</h4>
+		<goodsList :res='res' v-if="res" :storeName="false" />
 	 </view>
 </template>

 <script>
+import goodsList from '@/components/m-goods-list/list.vue'
 export default {
  props: ["res"],
+	components:{goodsList},
  methods: {
-    // 点击店铺推荐
-    clickGoods(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`
-      });
-    },
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-  
-      return val.toFixed(2).split(".");
-    }
    }
 };
 </script>

 <style lang="scss" scoped>
-@import "../mp-goods.scss";
@import "../product.scss";
-
-.goods_recomm {
-  padding: 12px 0 20rpx 20rpx;
-  color: #000;
-  font-size: 30rpx;
-  font-weight: 400;
-  margin-bottom: 28rpx;
-}
-
-.like-goods-uimage {
-  /deep/ .u-image {
-    height: 350rpx !important;
-  }
-
-  width: 100%;
-}
-
-.recommend-box {
-  background-color: #ffffff;
- 
-  width: 100%;
-
-  padding-bottom: 120rpx;
-
-  .title {
-    width: 120rpx;
-    height: 42rpx;
-    font-size: 30rpx;
-    font-weight: 700;
-    text-align: left;
-    color: #333333;
-    margin-left: 20rpx;
-  }
-}
-.like-goods-list {
-  display: flex;
-  width: 100%;
-  flex-wrap: wrap;
-}
-.like-goods-item {
-  padding: 0 !important;
-  width: 48%;
-  margin: 0 1% 10rpx 1%;
-  background: #f7f7f7;
-  border-radius: 12rpx;
-
-  overflow: hidden;
-
-  /deep/ .u-image {
-    width: 100%;
-  }
-}
-
-.like-goods-list {
-  // background-color: #f8f8f8;
-  width: 100%;
-  margin-bottom: 100rpx;
-
-  .name {
-    padding: 14rpx 8rpx 0 8rpx;
-
-    color: #333;
-    font-size: 24rpx;
-    display: -webkit-box;
-    overflow: hidden;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    background: #f7f7f7;
-    height: 80rpx;
-  }
-
-  .price-sales {
-    padding: 8rpx;
-    background: #f7f7f7;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .item-price {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      font-size: 26rpx;
-      text-align: left;
-      color: $price-color;
-      line-height: 23px;
-      font-weight: bold;
-      > span {
-        font-size: 32rpx;
-      }
-    }
-
-    .sales {
-      line-height: 23px;
-      font-size: 22rpx;
-      text-align: left;
-      letter-spacing: 0;
-      color: #cccccc;
-      // padding-right: 10rpx;
-    }
-  }
-}
 </style>
--- a/pages/product/product/goods/-goods-swiper.vue
+++ b/pages/product/product/goods/-goods-swiper.vue
@@ -1,8 +1,24 @@
 <template>
  <!-- 轮播图 -->
  <view class="carousel">
+
    <swiper circular="true" duration="400" @change="swiperChange">
+      <swiper-item v-if='video'>
+        <!-- #ifndef APP-PLUS -->
+        <video class="video" show-mute-btn style="width:100%; height:100%;" muted autoplay :src='video' loop
+          object-fit="cover"></video>
+        <!-- #endif -->
+        <!-- #ifdef APP-PLUS -->
+        <view style="width:100%; height:100%;">
+          <!-- <video class="video" show-mute-btn style="width:100%; height:100%;" muted autoplay :src='video' loop
+              object-fit="cover"></video> -->
+          <view v-html="html" style="width:100%; height:100%;"></view>
+        </view>
+        <!-- #endif -->
+
+      </swiper-item>
      <swiper-item class="swiper-item" v-for="(item, index) in res" :key="index">
+
        <view class="image-wrapper">
          <u-image :src="item" mode="aspectFit" class="loaded" width="100%" height="100%">
            <u-loading slot="loading"></u-loading>
@@ -10,7 +26,7 @@
        </view>
      </swiper-item>
    </swiper>
-    <view class="swiper-dots">{{ current }}/{{ res.length }}</view>
+    <view class="swiper-dots">{{ current }}/{{ video ? res.length + 1 : res.length }}</view>
  </view>
 </template>
 <script>
@@ -18,15 +34,24 @@ export default {
  data() {
    return {
      current: 1,
+      html: ""
    };
  },
-  props: ["res"],
+  props: ["res", 'video'],
+  watch: {
+    video(val) {
+      this.html = '<video muted="muted"   ref="videoPlay" style="width:100%; height:100%;" src=' + val + '  page-gesture show-mute-btn   autoplay  webkit-playsinline="" playsinline="" ></video>'
+    }
+  },
  methods: {
    // 轮播图对应的dot
    swiperChange(e) {
      this.current = e.detail.current + 1;
    },
  },
+  mounted() {
+    console.log(this.video)
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -82,4 +107,9 @@ export default {
 /deep/ .image-wrapper image {
  opacity: 1 !important;
 }
+
+.video {
+  width: 100%;
+  height: 100%;
+}
 </style>
--- a/pages/product/product/product.scss
+++ b/pages/product/product/product.scss
@@ -62,3 +62,7 @@
  color: #262626;
  font-weight: 700;
 }
+
+.down-goods{
+  font-size: 50rpx !important;
+}
--- a/Show More
+++ b/Show More