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

Signed-off-by: Chopper711 <1814994716@qq.com>

.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

App.vue

@@ -1,14 +1,35 @@
-
-
 <script>
 	/**
 	 * vuex管理登录状态，具体可以参考官方登录模板示例
 	 */
-import { mapMutations } from "vuex";
+	import {
+		mapMutations
+	} from "vuex";
 	import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
 	import config from "@/config/config";
-// 悬浮球
+	import storage from "@/utils/storage";
+
+	
+	
+	/**
+	 * 路由监听并删除路由
+	 * 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() {
@@ -17,6 +38,7 @@ export default {
 			};
 		},
 
+
 		/**
 		 * 监听返回
 		 */
@@ -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: {
@@ -108,8 +141,7 @@ export default {
 						//app启动时打开启动广告页
 						var w = plus.webview.open(
 							"/hybrid/html/advertise/advertise.html",
-            "本地地址",
-            {
+							"本地地址", {
 								top: 0,
 								bottom: 0,
 								zindex: 999,
@@ -140,10 +172,13 @@ 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: "检测到一个分享链接是否跳转？",
@@ -206,15 +241,18 @@ export default {
 		height: auto !important;
 		padding-top: 10rpx;
 	}
+
 	// #endif
 
 	body {
 		background-color: $bg-color;
 	}
+
 	/************************ */
 	.w200 {
 		width: 200rpx !important;
 	}
+
 	.flex1 {
 		flex: 1; //必须父级设置flex
 	}

MP_verify_qSyvBPhDsPdxvOhC.txt

@@ -1 +0,0 @@
-qSyvBPhDsPdxvOhC

README.md

@@ -1,277 +1,211 @@
 ## Lilishop B2B2C 商城系统
 
-##### 官方公众号 & 开源不易，如有帮助请点Star
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+### 商城介绍
 
-[![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
-
-
-### 介绍
 **官网**：https://pickmall.cn
 
-Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+**更多 README**：https://gitee.com/beijing_hongye_huicheng/lilishop/blob/master/README.md
 
-产品前后端分离、支持分布式部署。
+**演示站点**：https://m-b2b2c.pickmall.cn/ 账号：13011111111 验证码：111111
 
-商城展示端包含 PC、H5、微信小程序、APP。
+**商城 小程序/公众号/APP**：扫描二维码
 
-商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)
 
-系统包含各种中间件、搜索引擎、多级缓存、分布式事务、分布式任务调度等，支持Docker，支持k8s。是一款高性能，支持高并发等商城系统。
+### 快速开始
 
-开箱即用，简单配置即可部署一套属于您的系统。
+#### 阅读文档
 
-### 文档
+`uni-app` https://uniapp.dcloud.net.cn/api/
 
-**产品文档**（需求、架构、使用、部署、开发）：https://docs.pickmall.cn
+`vue2` https://v2.cn.vuejs.org/
 
+`uView v1` https://v1.uviewui.com/
 
-### 项目链接(gitee)
+#### 环境
 
-**Java后台**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
+在开发之前保证本地安装了以下软件
+`hbulider` https://www.dcloud.io/hbuilderx.html
 
-**Vue后台前端**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+### 技术栈
 
-**Uni-app**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+本项目技术栈为 `uni-app` + `scss` + `ES2015` + `uView` 提前学习和了解这些知识将帮助你更好地上手我们的项目。
 
-**docker一键部署**：https://gitee.com/beijing_hongye_huicheng/docker.git
+### 安装
 
-### 项目链接(github)
-
-**Java后台**：https://github.com/hongyehuicheng/lilishop.git
-
-**Vue后台前端**： https://github.com/hongyehuicheng/lilishop-ui.git
-
-**Uni-app**：https://github.com/hongyehuicheng/lilishop-uniapp.git
-
-**docker一键部署**：https://github.com/hongyehuicheng/docker.git
-
-### 演示地址
-
-**运营后台**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
-
-**店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
-
-**用户前台**：https://pc-b2b2c.pickmall.cn
-
-**移动端**：https://m-b2b2c.pickmall.cn
-
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
-
-### 3行命令搭建本地环境
-
-温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
-
-##### 下载docker脚本
-`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
-
-##### 各个地址
-
-| 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%;" />
-
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
-
-
-
-#### 管理端
-
-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
-
-
-### 技术选型
-
-#### 架构图
-
-![架构](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
-
-##### Java后台
-
-| 说明           | 框架            | 说明           |               |
-| -------------- | --------------- | -------------- | ------------- |
-| 基础框架       | 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    |
-
-### 升级计划
-
-#### 计划每个月发布一个版本，具体时间可能有出入
-
-时间：2021年6月15日
-
-```
-新增功能：
-1.微信小程序直播
-2.优惠券活动
-3.新人赠券
-4.准确发券
-5.用户等级
-6.数据导出
-7.订单批量
-8.APP版本升级检测
-9.积分商城
-
-功能优化：
-1.优惠券有效期增加类型：设置领取后*内有效。
-2.秒杀活动设置为每天开启，需设置秒杀活动开启时间。
-3.店铺配送模板，配送地区如果选择省份则下方的市级地址不展示。
-4.店铺配送模板支持，店铺包邮。
-5.普通商品设置去除卖家承担运费。
+1. 克隆项目到本地
 
+```shell
+git clone https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
 ```
 
-时间：2021年7月15日
+2. 从`hbulider`中打开项目
 
-```
-新增功能：
-1.会员权益
-2.支持用户升级会员
-3.供求单
-4.IM：腾讯云智服
-5.服务商品
-6.店铺支持订单核销
-7.店铺自提点
-功能优化：
-1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
+```shell
+直接将项目拖进hbulider中点击运行即可
 ```
 
-时间：2021年8月16日
+### 目录结构
 
 ```
-新增功能：
-1.微淘功能
-2.店铺移动端
-3.店铺发货单
+├── 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配置文件
 ```
 
-时间：2021年9月15日
+### 运行
+
+#### 运行在 h5
+
+在`hbulider`中点击`运行`->`运行到浏览器`->`选择自己的浏览器九号`
+
+#### 运行在微信小程序
+
+1.需要保证本地要有`微信开发者工具` https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
+
+2.在`hbulider`中点击`运行`->`运行到小程序模拟器`->`微信开发者工具` 运行的时候需要配置小程序的`appid`，配置完成后即可运行
+
+#### 运行 APP
+
+##### 运行在安卓
+
+在`hbulider`中点击`运行`->`运行到手机或模拟器`->`选择运行到安卓APP基座`
+
+##### 运行在 IOS
+
+在`hbulider`中点击`运行`->`运行到手机或模拟器`->`选择运行到IOS基座`
+
+
+
+
+### 项目配置/开发
+
+#### 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作为备用登录方案
+};
 
 ```
-后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
+#### 组件
+在根目录`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
 
 
-    1.后端框架基于Springboot，构建基于maven，持久层使用MyBatisPlus。使用elasticsearch、redis、mongodb、rocketmq 等各种中间健。都是主流架构，轻松应对各种环境。
-    
-    2.支持集群、分布式，支持docker 轻松部署，解决各种复杂场景！
-    
-    3.代码模块清晰，主要分为三端api（买家、卖家、管理），各端API互相隔离，自己鉴权，自己操作业务。
-    
-    4.使用阿里开源的RocketMQ，基于mq解决各种并发场景，解决事务一致性，解决搞并发延迟场景问题。
-    
-    5.项目使用多级缓存，应用不同场景，redis缓存业务数据、mongodb缓存关系型多对多关系问题、nginx缓存高频访问低频修改的页面。
-    
-    6.支持各种联合登陆，支持各种客户端的支付问题，灵活配置灵活开启。
-    
-    7.内置完善的楼层装修机制，各种拖拉拽，维护跳转页面或外网，即便是一个什么都不懂的运营也可以轻松掌握。
-    
-    8.内置阿里短信接口，可以在线申请短信模版。内置阿里oss系统，可以对文件执行各种操作。oss商家端资源相互隔离。
-    
-    10.强大的统计报表，统计效果，可以实现各个场景，包含在线人数，历史在线人数，活跃人数等信息。
-    
-    11.标准Api接口、提供swagger文档，快速二开。
-    
-    12.分布式调度任务中心，解决分布式定时任务多次执行问题。
-    
-    13.代码注释完善，快速上手。
-    
-    14.非移动端采用IView框架，各种自定义插件、选择器实现。移动端采用uniapp，一次编写，全端使用
-    
-    15.已经对接好各种第三方插件，支持各种复杂等联合登陆，联合支付等场景。
+#### 微信登录报错
+需检查appId是否配置正确，在后台管理中信任登录的`appId`以及`appSecret`是否配置正确
 
 
-### 开源须知
-1.仅允许用于个人学习研究使用.
-
-2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
-
-3.限制商用，如果需要商业使用请联系我们。QQ3409056806.
-
-### 交流群
-
-**QQ群**：961316482
 

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"
+    }
+}

api/address.js

@@ -12,7 +12,7 @@ import api from "@/config/api.js";
  */
 export function getAddressList(pageNumber, pageSize) {
   return http.request({
-    url: "/memberAddress",
+    url: "/member/address",
     method: Method.GET,
     needToken: true,
     params: { pageNumber, pageSize },
@@ -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" },
@@ -37,7 +37,7 @@ export function getLogistics() {
  */
 export function getAddressCode(cityCode, townName) {
   return http.request({
-    url: api.common + "/region/region",
+    url: api.common + "/common/region/region",
     method: Method.GET,
     needToken: true,
     params: { cityCode, townName },
@@ -51,7 +51,7 @@ export function getAddressCode(cityCode, townName) {
  */
 export function addAddress(data) {
   return http.request({
-    url: "/memberAddress",
+    url: "/member/address",
     method: Method.POST,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -67,7 +67,7 @@ export function addAddress(data) {
  */
 export function editAddress(params) {
   return http.request({
-    url: `/memberAddress`,
+    url: `/member/address`,
     method: Method.PUT,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -81,7 +81,7 @@ export function editAddress(params) {
  */
 export function deleteAddress(id) {
   return http.request({
-    url: `/memberAddress/delById/${id}`,
+    url: `/member/address/delById/${id}`,
     method: Method.DELETE,
     needToken: true,
   });
@@ -95,7 +95,7 @@ export function deleteAddress(id) {
  */
 export function getAddressDetail(id) {
   return http.request({
-    url: `/memberAddress/get/${id}`,
+    url: `/member/address/get/${id}`,
     method: Method.GET,
     loading: false,
     needToken: true,
@@ -107,7 +107,7 @@ export function getAddressDetail(id) {
  */
 export function getAddressDefault() {
   return http.request({
-    url: `/memberAddress/get/default`,
+    url: `/member/address/get/default`,
     method: Method.GET,
     loading: false,
     needToken: true,

api/after-sale.js

@@ -34,16 +34,29 @@ export function applyCancelOrder(params) {
   });
 }
 
+/**
 /**
  * 获取商家售后收件地址
  */
-export function getstoreAfterSaleAddress(sn) {
+export function getStoreAfterSaleAddress(sn) {
   return http.request({
-    url: `/afterSale/getStoreAfterSaleAddress/${sn}`,
+    url: `/order/afterSale/getStoreAfterSaleAddress/${sn}`,
     method: Method.GET,
     needToken: true,
   });
 }
+/**
+ * 取消售后
+ */
+export function cancelAfterSale(afterSaleSn) {
+  return http.request({
+    url: `/order/afterSale/cancel/${afterSaleSn}`,
+    method: Method.POST,
+    needToken: true,
+  });
+}
+
+
 
 /**
  * 获取售后服务记录相关数据
@@ -51,7 +64,7 @@ export function getstoreAfterSaleAddress(sn) {
  */
 export function getAfterSaleList(params) {
   return http.request({
-    url: `/afterSale/page`,
+    url: `/order/afterSale/page`,
     method: Method.GET,
     needToken: true,
     params,
@@ -64,7 +77,7 @@ export function getAfterSaleList(params) {
  */
 export function getServiceDetail(sn) {
   return http.request({
-    url: `/afterSale/get/${sn}`,
+    url: `/order/afterSale/get/${sn}`,
     method: Method.GET,
     needToken: true,
   });
@@ -76,7 +89,7 @@ export function getServiceDetail(sn) {
  */
 export function addComplain(params) {
   return http.request({
-    url: `/complain`,
+    url: `/order/complain`,
     method: Method.POST,
     needToken: true,
     header: {
@@ -91,7 +104,7 @@ export function addComplain(params) {
  */
 export function clearComplain(id, params) {
   return http.request({
-    url: `/complain/status/${id}`,
+    url: `/order/complain/status/${id}`,
     method: Method.PUT,
     needToken: true,
     params,
@@ -103,7 +116,7 @@ export function clearComplain(id, params) {
  */
 export function getAfterSaleLog(sn) {
   return http.request({
-    url: `/afterSale/get/getAfterSaleLog/${sn}`,
+    url: `/order/afterSale/get/getAfterSaleLog/${sn}`,
     method: Method.GET,
     needToken: true,
   });
@@ -114,7 +127,7 @@ export function getAfterSaleLog(sn) {
  */
 export function getComplain(params) {
   return http.request({
-    url: `/complain`,
+    url: `/order/complain`,
     method: Method.GET,
     needToken: true,
     params,
@@ -126,7 +139,7 @@ export function getComplain(params) {
  */
 export function getAfterSaleReason(serviceType) {
   return http.request({
-    url: `/afterSale/get/afterSaleReason/${serviceType}`,
+    url: `/order/afterSale/get/afterSaleReason/${serviceType}`,
     method: Method.GET,
     needToken: true,
   });
@@ -137,7 +150,7 @@ export function getAfterSaleReason(serviceType) {
  */
 export function getClearReason() {
   return http.request({
-    url: `/afterSale/get/afterSaleReason/CANCEL`,
+    url: `/order/afterSale/get/afterSaleReason/CANCEL`,
     method: Method.GET,
     needToken: true,
   });
@@ -148,7 +161,7 @@ export function getClearReason() {
  */
 export function getComplainReason() {
   return http.request({
-    url: `/afterSale/get/afterSaleReason/COMPLAIN`,
+    url: `/order/afterSale/get/afterSaleReason/COMPLAIN`,
     method: Method.GET,
     needToken: true,
   });
@@ -158,7 +171,7 @@ export function getComplainReason() {
  */
 export function getComplainDetail(id) {
   return http.request({
-    url: `/complain/${id}`,
+    url: `/order/complain/${id}`,
     method: Method.GET,
     needToken: true,
   });
@@ -169,7 +182,7 @@ export function getComplainDetail(id) {
  */
 export function getAfterSaleInfo(sn) {
   return http.request({
-    url: `/afterSale/applyAfterSaleInfo/${sn}`,
+    url: `/order/afterSale/applyAfterSaleInfo/${sn}`,
     method: Method.GET,
     needToken: true,
   });
@@ -181,7 +194,7 @@ export function getAfterSaleInfo(sn) {
  */
 export function applyReturn(orderItemSn, params) {
   return http.request({
-    url: `/afterSale/save/${orderItemSn}`,
+    url: `/order/afterSale/save/${orderItemSn}`,
     method: Method.POST,
     header: {
       "Content-Type": "application/x-www-form-urlencoded",
@@ -197,7 +210,7 @@ export function applyReturn(orderItemSn, params) {
  */
 export function fillShipInfo(afterSaleSn, params) {
   return http.request({
-    url: `/afterSale/delivery/${afterSaleSn}`,
+    url: `/order/afterSale/delivery/${afterSaleSn}`,
     method: Method.POST,
     header: {
       "Content-Type": "application/x-www-form-urlencoded",

api/article.js

@@ -23,8 +23,21 @@ export function getArticleCategory(category_type) {
  */
 export function getArticleDetail(type) {
   return http.request({
-    url: `/article/type/${type}`,
+    url: `/other/article/get/${type}`,
     method: Method.GET,
   });
 }
 
+/**
+ * 获取文章详情
+ * @param type
+ */
+ export function getArticleDetailByType(type) {
+  return http.request({
+    url: `/other/article/type/${type}`,
+    method: Method.GET,
+  });
+}
+
+
+

api/common.js

@@ -1,10 +1,8 @@
 /**
  * 公共API
  */
-import {http, Method} from '@/utils/request.js';
-import api from '@/config/api.js';
-
-
+import { http, Method } from "@/utils/request.js";
+import api from "@/config/api.js";
 
 /**
  * 获取地区数据
@@ -12,7 +10,16 @@ import api from '@/config/api.js';
  */
 export function getRegionsById(id = 0) {
   return http.request({
-    url: `${api.common}/region/item/${id}`,
+    url: `${api.common}/common/region/item/${id}`,
+    method: Method.GET,
+    message: false,
+  });
+}
+
+// 获取IM接口前缀
+export function getIMDetail() {
+  return http.request({
+    url: `${api.common}/IM`,
     method: Method.GET,
     message: false,
   });
@@ -22,5 +29,4 @@ export function getRegionsById(id = 0) {
  * 文件上传地址
  * @type {string}
  */
-export const upload =api.common+'/upload/file';
-
+export const upload = api.common + "/common/upload/file";

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
 	});

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,
+  });
+}

api/goods.js

@@ -9,7 +9,7 @@ import { http, Method } from "@/utils/request.js";
  */
  export function getGoodsMessage(goodsId) {
   return http.request({
-    url: `/goods/get/${goodsId}`,
+    url: `/goods/goods/get/${goodsId}`,
     method: Method.GET,
   });
 }
@@ -19,7 +19,7 @@ import { http, Method } from "@/utils/request.js";
  */
 export function getGoodsRelated(params) {
   return http.request({
-    url: `/goods/es/related`,
+    url: `/goods/goods/es/related`,
     method: Method.GET,
     params,
   });
@@ -32,7 +32,7 @@ export function getGoodsRelated(params) {
  */
  export function getGoods(skuId, goodsId) {
   return http.request({
-    url: `/goods/sku/${goodsId}/${skuId}`,
+    url: `/goods/goods/sku/${goodsId}/${skuId}`,
     method: Method.GET,
   });
 }
@@ -43,7 +43,7 @@ export function getGoodsRelated(params) {
  */
  export function getGoodsDistribution(distributionId) {
   return http.request({
-    url: `/distribution/bindingDistribution/${distributionId}`,
+    url: `/distribution/distribution/bindingDistribution/${distributionId}`,
     method: Method.GET,
   });
 }
@@ -56,7 +56,7 @@ export function getGoodsRelated(params) {
  */
 export function getGoodsList(params) {
   return http.request({
-    url: "/goods/es",
+    url: "/goods/goods/es",
     method: Method.GET,
     params,
   });
@@ -112,7 +112,7 @@ export function getPlateformTagGoods(tag_id) {
  */
 export function getCategoryList(id) {
   return http.request({
-    url: `/category/get/${id}`,
+    url: `/goods/category/get/${id}`,
     method: Method.GET,
     loading: false,
   });
@@ -126,7 +126,7 @@ export function getCategoryList(id) {
  */
 export function distribution() {
   return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
     method: Method.GET,
   });
 }
@@ -136,7 +136,7 @@ export function distribution() {
  */
 export function applyDistribution(params) {
   return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
     method: Method.POST,
     params,
   });
@@ -170,7 +170,7 @@ export function cashLog(params) {
  */
 export function distributionOrderList(params) {
   return http.request({
-    url: `/distribution/distributionOrder`,
+    url: `/distribution/distribution/distributionOrder`,
     method: Method.GET,
     params
   });
@@ -181,7 +181,7 @@ export function distributionOrderList(params) {
  */
 export function distributionGoods(params) {
   return http.request({
-    url: `/distributionGoods`,
+    url: `/distribution/goods`,
     method: Method.GET,
     params,
   });
@@ -191,7 +191,7 @@ export function distributionGoods(params) {
  */
 export function checkedDistributionGoods(params) {
   return http.request({
-    url: `/distributionGoods/checked/${params.id}`,
+    url: `/distribution/goods/checked/${params.id}`,
     method: Method.GET,
     params
   });
@@ -202,7 +202,7 @@ export function checkedDistributionGoods(params) {
  */
  export function getMpCode(params){
   return http.request({
-    url:`/mini-program/mp/unlimited`,
+    url:`/passport/connect/miniProgram/mp/unlimited`,
     method:Method.GET,
     params
   })
@@ -213,7 +213,7 @@ export function checkedDistributionGoods(params) {
  */
  export function getMpScene(id){
   return http.request({
-    url:`/mini-program/mp/unlimited/scene?id=${id}`,
+    url:`/passport/connect/miniProgram/mp/unlimited/scene?id=${id}`,
     method:Method.GET,
 
   })

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,
+  });
+}
 
 /**
  * 获取广告图
@@ -32,7 +47,7 @@ export function getCategory(parent_id = 0) {
  */
 export function getHotKeywords(count) {
   return http.request({
-    url: "/goods/hot-words",
+    url: "/goods/goods/hot-words",
     method: Method.GET,
     loading: false,
     params: { count },
@@ -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: `/pageData/getIndex?clientType=H5`,
+    url: `/other/pageData/getIndex?clientType=H5`,
     method: "get",
+    params
+  });
+}
+
+/**
+ * 获取店铺楼层数据
+ */
+export function getFloorStoreData(params) {
+  return http.request({
+    url: `/other/pageData?pageClientType=H5`,
+    method: "get",
+    params
   });
 }
 
@@ -56,7 +83,7 @@ export function getFloorData() {
  */
 export function getCategoryIndexData(parentId = 0) {
   return http.request({
-    url: `/category/get/${parentId}`,
+    url: `/goods/category/get/${parentId}`,
     method: "get",
   });
 }

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,
+  });
+}
+

api/login.js

@@ -8,19 +8,47 @@ import api from "@/config/api.js";
  */
 export function resetByMobile(params) {
   return http.request({
-    url: `/members/resetByMobile`,
+    url: `/passport/member/resetByMobile`,
     method: "POST",
     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
  */
 export function sendMobile(mobile,type='LOGIN') {
   return http.request({
-    url: `${api.common}/sms/${type}/${mobile}`,
+    url: `${api.common}/common/sms/${type}/${mobile}`,
     method: "GET",
   });
 }
@@ -32,7 +60,7 @@ export function sendMobile(mobile,type='LOGIN') {
  */
 export function smsLogin(params, clientType) {
   return http.request({
-    url: `/members/smsLogin`,
+    url: `/passport/member/smsLogin`,
     method: "POST",
     data: params,
     header: {
@@ -50,7 +78,7 @@ export function smsLogin(params, clientType) {
 
 export function modifyPass(params) {
   return http.request({
-    url: `/members/modifyPass`,
+    url: `/passport/member/modifyPass`,
     method: "PUT",
     params,
   });
@@ -61,7 +89,33 @@ export function modifyPass(params) {
  */
 export function refreshTokenFn(refresh_token) {
   return http.request({
-    url: `/members/refresh/${refresh_token}`,
+    url: `/passport/member/refresh/${refresh_token}`,
     method: "GET",
   });
 }
+
+// 获取密码状态
+export function logout () {
+  return http.request({
+    url: '/passport/member/logout',
+    method: "POST",
+    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,
+	});
+}

api/members.js

@@ -6,7 +6,7 @@ import { http, Method } from "@/utils/request.js";
  */
 export function feedBack(params) {
   return http.request({
-    url: "/feedback",
+    url: "/other/feedback",
     method: Method.POST,
     needToken: true,
     params,
@@ -16,7 +16,7 @@ export function feedBack(params) {
 // 提现
 export function withdrawalApply(params) {
   return http.request({
-    url: "/members/wallet/withdrawal",
+    url: "/wallet/wallet/withdrawal",
     method: Method.POST,
     needToken: true,
     params,
@@ -30,7 +30,7 @@ export function withdrawalApply(params) {
  */
 export function payCallback(params) {
   return http.request({
-    url: `/cashier/result`,
+    url: `/payment/cashier/result`,
     method: Method.GET,
     params,
   });
@@ -117,7 +117,7 @@ export function getPointsData(params) {
  */
 export function getComments(params) {
   return http.request({
-    url: "/memberEvaluation",
+    url: "/member/evaluation",
     method: Method.GET,
     needToken: true,
     params,
@@ -131,7 +131,7 @@ export function getComments(params) {
  */
 export function getFootprintNum(params) {
   return http.request({
-    url: "/footprint/getFootprintNum",
+    url: "/member/footprint/getFootprintNum",
     method: Method.GET,
     needToken: true,
     params,
@@ -144,7 +144,7 @@ export function getFootprintNum(params) {
  */
 export function commentsMemberOrder(params) {
   return http.request({
-    url: "/memberEvaluation",
+    url: "/member/evaluation",
     method: Method.POST,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -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,
   });
 }
 
@@ -275,7 +303,7 @@ export function collectionStore(store_id) {
  */
 export function getUserInfo() {
   return http.request({
-    url: "/members",
+    url: "/passport/member",
     method: Method.GET,
     needToken: true,
   });
@@ -287,7 +315,7 @@ export function getUserInfo() {
  */
 export function getUserWallet() {
   return http.request({
-    url: "/members/wallet",
+    url: "/wallet/wallet",
     method: Method.GET,
     needToken: true,
   });
@@ -300,7 +328,7 @@ export function getUserWallet() {
  */
 export function saveUserInfo(params) {
   return http.request({
-    url: "/members/editOwn",
+    url: "/passport/member/editOwn",
     method: Method.PUT,
     header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
@@ -328,7 +356,7 @@ export function addReceipt(params) {
  */
 export function getGoodsComments(goodsId, params) {
   return http.request({
-    url: `/memberEvaluation/${goodsId}/goodsEvaluation`,
+    url: `/member/evaluation/${goodsId}/goodsEvaluation`,
     method: Method.GET,
     loading: false,
     params,
@@ -341,7 +369,7 @@ export function getGoodsComments(goodsId, params) {
  */
 export function getGoodsCommentsCount(goodsId) {
   return http.request({
-    url: `/memberEvaluation/${goodsId}/evaluationNumber`,
+    url: `/member/evaluation/${goodsId}/evaluationNumber`,
     method: Method.GET,
     loading: false,
   });
@@ -365,7 +393,7 @@ export function getNoReadMessageNum() {
  */
 export function myTrackList(params) {
   return http.request({
-    url: `/footprint`,
+    url: `/member/footprint`,
     method: Method.GET,
     needToken: true,
     params,
@@ -378,7 +406,7 @@ export function myTrackList(params) {
  */
 export function deleteHistoryListId(ids) {
   return http.request({
-    url: `/footprint/delByIds/${ids}`,
+    url: `/member/footprint/delByIds/${ids}`,
     method: Method.DELETE,
     needToken: true,
   });
@@ -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,
+  });
+}
+

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

api/order.js

@@ -51,7 +51,7 @@ export function selectedShipMethod(params) {
  */
 export function getOrderList(params) {
   return http.request({
-    url: "/orders",
+    url: "/order/order",
     method: Method.GET,
     needToken: true,
     params,
@@ -64,7 +64,7 @@ export function getOrderList(params) {
  */
 export function getOrderDetail(orderSn) {
   return http.request({
-    url: `/orders/${orderSn}`,
+    url: `/order/order/${orderSn}`,
     method: Method.GET,
     needToken: true,
   });
@@ -77,7 +77,7 @@ export function getOrderDetail(orderSn) {
  */
 export function cancelOrder(orderSn, reason) {
   return http.request({
-    url: `/orders/${orderSn}/cancel`,
+    url: `/order/order/${orderSn}/cancel`,
     method: Method.POST,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -91,7 +91,7 @@ export function cancelOrder(orderSn, reason) {
  */
 export function confirmReceipt(orderSn) {
   return http.request({
-    url: `/orders/${orderSn}/receiving`,
+    url: `/order/order/${orderSn}/receiving`,
     method: Method.POST,
     needToken: true,
   });

api/store.js

@@ -4,13 +4,16 @@
 
 import {http, Method} from '@/utils/request.js';
 
+
+
+
 /**
  * 获取店铺列表
  * @param params
  */
-export function getstoreList(params) {
+export function getStoreList(params) {
   return http.request({
-    url: '/store',
+    url: '/store/store',
     method: Method.GET,
     params,
   });
@@ -22,7 +25,7 @@ export function getstoreList(params) {
  */
  export function getStoreBaseInfo(storeId) {
   return http.request({
-    url: `/store/get/detail/${storeId}`,
+    url: `/store/store/get/detail/${storeId}`,
     method: Method.GET,
     loading: false,
   });
@@ -34,7 +37,7 @@ export function getstoreList(params) {
  */
  export function getStoreCategory(id) {
   return http.request({
-    url: `/store/label/get/${id}`,
+    url: `/store/store/label/get/${id}`,
     method: Method.GET,
   });
 }
@@ -46,11 +49,23 @@ export function getstoreList(params) {
  */
  export function getLicencePhoto(id) {
   return http.request({
-    url: `/store/get/licencePhoto/${id}`,
+    url: `/store/store/get/licencePhoto/${id}`,
     method: Method.GET,
   });
 }
 
 
+/**
+ * 获取自提点信息
+ * @param id
+ */
+ export function getStoreAddress(storeId,params) {
+  return http.request({
+    url: `/store/address/page/${storeId}`,
+    method: Method.GET,
+    params
+  });
+}
+
 
 

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,
+  
+  });
+}
 
 
 /**
@@ -177,7 +189,7 @@ export function createTrade(params) {
  */
 export function getCashierData(params) {
   return http.request({
-    url: "cashier/tradeDetail",
+    url: "payment/cashier/tradeDetail",
     method: Method.GET,
     needToken: true,
     params,
@@ -194,7 +206,7 @@ export function getCashierData(params) {
  */
 export function initiatePay(paymentMethod, paymentClient, params) {
   return http.request({
-    url: `cashier/pay/${paymentMethod}/${paymentClient}`,
+    url: `payment/cashier/pay/${paymentMethod}/${paymentClient}`,
     method: Method.GET,
     needToken: true,
     params,
@@ -209,7 +221,7 @@ export function initiatePay(paymentMethod, paymentClient, params) {
  */
 export function getExpress(orderSn) {
   return http.request({
-    url: `/orders/getTraces/${orderSn}`,
+    url: `/order/order/getTraces/${orderSn}`,
     method: Method.POST,
     needToken: true,
    
@@ -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,
+  });
+}

components/m-buy/goods.vue

@@ -1,42 +1,50 @@
 <template>
 	<div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+		<u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode" :border-radius="setup.radius" @close="closeMask()">
 			<!-- 商品 -->
 			<view class="goods-box bottom">
 				<view class="goods-header">
 					<view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
-              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+						<u-image width="200rpx" border-radius="20" class="uimage" height="200rpx" :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
 					</view>
 					<view class="goods-skus">
 						<!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span>
+						<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"
-                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
-                <span></span>
+								<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>
 							<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">
 							已选
@@ -45,32 +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>
 				<!-- 商品信息 -->
-        <view class="goods-skus-box">
+				<scroll-view class="goods-skus-box" :scroll-y="true">
 					<!-- 规格 -->
 					<view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
 						<view class="skus-view-list">
 							<view class="view-class-title">{{ spec.name }}</view>
-              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
-                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
+
+							<!-- 正常逻辑 循环出sku -->
+							<view
+								v-if="!parentOrder"
+								: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 }}
+							</view>
+
+							<!-- 拼团购买，仅筛选出当前拼团类型商品 -->
+							<view
+								v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+								: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 }}
+							</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" :color="numberBox.color" :input-width="numberBox.width"
-              :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
-            </u-number-box>
-          </view>
+						<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>
@@ -78,76 +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: "",
-      isMask: false, //是否显示遮罩层
-      isClose: false, //是否可以点击遮罩关闭
+			currentSelected: [],
+			skuList: '',
+			isClose: false //是否可以点击遮罩关闭
 		};
 	},
-  props: [
-    "goodsDetail", //商品详情
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-  ],
+	props: {
+		wholesaleList: {
+			type: null,
+			default: false
+		},
+		buyMask: {
+			type: Boolean,
+			default: false
+		},
+		isGroup: {
+			type: Boolean,
+			default: false
+		},
+		goodsDetail: {
+			default: '',
+			type: null
+		},
+		selectedSku: {
+			default: '',
+			type: null
+		},
+		goodsSpec: {
+			default: '',
+			type: null
+		},
+		addr: {
+			default: '',
+			type: null
+		},
+		pointDetail: {
+			default: '',
+			type: null
+		}
+	},
+	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) {
-        this.$emit("changed", val);
-      },
-      deep: true,
+			handler(val, oldval) {
+				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.$set(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;
 					}
@@ -156,18 +245,40 @@ export default {
 					return i;
 				}
 			});
+			if (selectedSkuId?.skuId) {
+				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: '暂无该商品!',
+					duration: 2000,
+					icon: 'none'
+				});
+			}
+		},
+
+		/**
+		 * 直接购买
+		 */
+		buy(data) {
+			API_trade.addToCart(data).then(res => {
+				if (res.data.success) {
+					uni.navigateTo({
+						url: `/pages/order/fillorder?way=${data.cartType}&addr=${''}&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`
+					});
+				}
 			});
 		},
 
@@ -177,81 +288,63 @@ 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))}`
 						});
 					}
 				});
 			}
 		},
-
-    /**
-     * 直接购买
-     */
-    buy(data) {
-      API_trade.addToCart(data).then((res) => {
-        if (res.data.success) {
-          uni.navigateTo({
-            url: `/pages/order/fillorder?way=${
-              data.cartType
-            }&addr=${""}&parentOrder=${encodeURIComponent(
-              JSON.stringify(this.parentOrder)
-            )}`,
-          });
-        }
-      });
-    },
-
 		formatSku(list) {
 			// 格式化数据
-      if (!Array.isArray(list)) return false;
 			let arr = [{}];
+
+			if (!Array.isArray(list)) {
+				return false;
+			}
 			list.forEach((item, index) => {
 				item.specValues.forEach((spec, specIndex) => {
 					let name = spec.specName;
 					let values = {
 						value: spec.specValue,
 						quantity: item.quantity,
+						skuId: item.skuId
 					};
-          if (name === "images") {
+					if (name === 'images') {
 						return;
 					}
 
@@ -259,54 +352,63 @@ export default {
 						if (
 							arrItem.name == name &&
 							arrItem.values &&
-              !arrItem.values.find((i) => i.value === values.value)
+							!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]
 							});
 						}
 					});
 				});
 			});
+
 			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
 							};
 						});
 				}
 			});
 
 			this.skuList = list;
-    },
+			// console.log(" this.skuList", this.skuList)
+		}
 	},
 
 	mounted() {
 		this.formatSku(this.goodsSpec);
-
-    console.log(this.goodsDetail);
-  },
+	}
 };
 </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);
@@ -328,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 {
@@ -374,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;
@@ -392,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;
@@ -401,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;
 	}

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);

components/m-goods-list/README.md

@@ -0,0 +1,11 @@
+## 商品列表展示
+
+### OBJECT 参数说明
+
+| 属性        | 说明                                                       | 类型    | 必填 |
+| ----------- | ---------------------------------------------------------- | ------- | ---- |
+| `res`       | 显示数据                                                   | Array   | 是   |
+| `type`      | 商品展示类型 oneColumns twoColumns  ，默认展示一行两列商品 | String  | 否   |
+| `storeName` | 是否展示店铺名称，默认展示                                 | Boolean | 否   |
+| `keywords` | 高亮展示搜索内容                                 | String | 否   |
+

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>

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>

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>

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>

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}`,
       });
     },
   },

components/m-search-revision/m-search-revision.vue

@@ -1,20 +1,21 @@
 <template>
   <view class="serach">
     <view class="left-box" @tap="onClickLeft">
-      <uni-icons style="line-height:70rpx" type="back" size="24" />
+      <u-icon name="arrow-left" size="40" color="#666"></u-icon>
     </view>
     <view class="content" :style="{ 'border-radius': radius + 'px' }">
       <!-- HM修改 增加进入输入状态的点击范围 -->
       <view class="content-box" :class="{ center: mode === 2 }">
         <u-icon name="search" size="32" style="padding:0 15rpx;"></u-icon>
         <!-- HM修改 增加placeholder input confirm-type confirm-->
-        <input style="width:100%; " :placeholder="placeholder" placeholder-class="placeholder-color" @input="inputChange" confirm-type="search" @confirm="triggerConfirm" class="input"
+        <input style="width:100%; " :placeholder="placeholder" placeholder-class="placeholder-color"
+          @input="inputChange" confirm-type="search" @confirm="triggerConfirm" class="input"
           :class="{ center: !active && mode === 2 }" :focus="isFocus" v-model="inputVal" @focus="focus" @blur="blur" />
         <u-icon name="close" v-if="isDelShow" style="padding:0 30rpx;" @click="clear"></u-icon>
       </view>
-      <view v-show="(active && show && button === 'inside') || (isDelShow && button === 'inside')" class="serachBtn" @click="search">搜索</view>
+
     </view>
-    <view v-if="button === 'outside'" class="button" :class="{ active: show || active }">
+    <view class="button active" >
       <view v-if="isShowSeachGoods !=true" class="button-item">
         <div @click="out()">取消</div>
       </view>
@@ -28,14 +29,7 @@
 </template>
 
 <script>
-import uniStatusBar from "../uni-status-bar/uni-status-bar.vue";
-import uniIcons from "../uni-icons/uni-icons.vue";
-
 export default {
-  components: {
-    uniStatusBar,
-    uniIcons,
-  },
   props: {
     mode: {
       value: Number,
@@ -50,15 +44,6 @@ export default {
       type: String,
       default: "",
     },
-    button: {
-      value: String,
-      default: "outside",
-    },
-    //
-    show: {
-      value: Boolean,
-      default: true,
-    },
     // 默认半径为60
     radius: {
       value: String,
@@ -132,7 +117,6 @@ export default {
       //this.$emit('search', '');//HM修改 清空内容时候不进行搜索
     },
 
-
     /**
      * 回退到上一级
      */
@@ -145,7 +129,7 @@ export default {
      */
     search() {
       if (!this.inputVal) {
-        if (!this.show && this.searchName == "取消") {
+        if (this.searchName == "取消") {
           uni.hideKeyboard();
           this.isFocus = false;
           this.active = false;
@@ -175,6 +159,9 @@ export default {
   font-size: $uni-font-size-base;
 
   .left-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 15%;
     /* #ifndef APP-NVUE */
     text-align: center;
@@ -225,19 +212,6 @@ export default {
         }
       }
     }
-
-    .serachBtn {
-      height: 100%;
-      flex-shrink: 0;
-      padding: 0 30rpx;
-      //HM修改 按钮背景色
-      background: linear-gradient(to right, grey, grey);
-      //background: $uni-color-success;
-      line-height: 60rpx;
-      color: #eee;
-      //border-left: 1px #ccc solid; //HM修改 去掉边框
-      transition: all 0.3s;
-    }
   }
 
   .button {

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;
     },

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>

components/ms-dropdown/dropdown-item.vue

@@ -1,241 +0,0 @@
-<template>
-	<div class="dropdown-item">
-		<!-- selected -->
-		<view class="dropdown-item__selected" @click="changePopup">
-			<slot name="title" v-if="$slots.title"></slot>
-			<block v-else>
-				<view class="selected__name">
-					{{title ? title : selectItem.text}}
-				</view>
-				<!-- <view class="selected__icon"
-					  :class="showClass === 'show'? 'up' : 'down'"
-				>
-					<span class="iconfont">&#xe851;</span>
-				</view> -->
-			</block>
-		</view>
-		<view class="dropdown-item__content" :style="{top: contentTop + 'px'}" v-if="showList">
-			<!-- dropdown -->
-			<view :class="['list', showClass]">
-				<slot v-if="$slots.default"></slot>
-				<block v-else>
-					<view class="list__option" v-for="(item, index) in list" :key="index" @click="choose(item)">
-						<view>{{item.text}}</view>
-						<icon v-if="item.value === value" type="success_no_circle" size="26" />
-					</view>
-				</block>
-			</view>
-			<!-- dropdown-mask -->
-			
-			<!-- @touchmove 禁止滑动 -->
-			<view @touchmove.stop.prevent="moveHandle" :class="['dropdown-mask', showClass]" v-if="showList" @click="closePopup"></view>
-		</view>
-	</div>
-</template>
-
-<script>
-	export default {
-		components: {},
-		props: {
-			value: [Number, String, Object],
-			list: {
-				type: Array,
-				default: () => {
-					return []
-				}
-			},
-			title: [Number, String],
-			contentTopReduse: {
-				type: Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				showList: "",
-				showClass: '',
-				selectItem: {},
-				contentTop: 0
-			}
-		},
-		watch: {},
-		mounted() {
-			this.showList = this.active;
-			this.selectItem = this.list[this.value];
-			// document.addEventListener('click', e => {
-			// 	//this.$el 可以获取当前组件的容器节点
-			// 	if (!this.$el.contains(e.target)) {
-			// 		console.log('change');
-			// 		this.close()
-			// 	}
-			// });
-		},
-		methods: {
-			// 禁止滑动
-			moveHandle() {},
-			choose(item) {
-				this.selectItem = item
-				this.$emit('input', item.value)
-				this.closePopup()
-			},
-			changePopup() {
-				if (this.showList) {
-					this.closePopup()
-				} else {
-					this.openPopup()
-				}
-			},
-			openPopup() {
-				// this.$parent  -> dropdown-menu
-				this.$parent.$emit('close')
-				this.showList = true
-				this.$nextTick(() => {
-					this.getElementData('.dropdown-item__selected', (data) => {
-						this.contentTop = data[0].bottom - this.contentTopReduse;
-						this.showClass = 'show'
-					})
-				})
-			},
-			closePopup() {
-				this.showClass = ''
-				setTimeout(() => {
-					this.showList = false
-				}, 300)
-			},
-			close() {
-				this.showClass = ''
-				this.showList = false
-			},
-			getElementData(el, callback) {
-				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
-					callback(data[0]);
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@font-face {
-		font-family: 'iconfont';
-		/* project id 1564327 */
-		src: url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.eot');
-		src: url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.eot?#iefix') format('embedded-opentype'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.woff2') format('woff2'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.woff') format('woff'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.ttf') format('truetype'),
-			url('https://at.alicdn.com/t/font_1564327_fcszez4n5i.svg#iconfont') format('svg');
-	}
-
-	.iconfont {
-		font-family: "iconfont" !important;
-		font-size: 28rpx;
-		font-style: normal;
-		-webkit-font-smoothing: antialiased;
-		-webkit-text-stroke-width: 0.2px;
-		-moz-osx-font-smoothing: grayscale;
-	}
-
-	.line {
-		position: absolute;
-		height: 3px;
-		width: 100px;
-		background: #1abc9c;
-	}
-
-	.dropdown-item {
-		position: relative;
-
-		&__selected {
-			position: relative;
-			display: flex;
-			align-items: center;
-			background: transparent;
-			// padding: 10rpx;
-			box-sizing: border-box;
-			justify-content: center;
-
-			.selected__name {
-				font-size: 32rpx;
-				white-space: nowrap;
-				position: relative;
-
-			}
-
-			.selected__icon {
-				margin-left: 8rpx;
-
-				&.down {
-					transition: transform .3s;
-					transform: rotateZ(0);
-				}
-
-				&.up {
-					transition: transform .3s;
-					transform: rotateZ(-180deg);
-				}
-			}
-		}
-
-		&__content {
-			position: fixed;
-			left: 0;
-			right: 0;
-			overflow: hidden;
-			top: 0;
-			bottom: 0;
-			z-index: 10;
-
-			.list {
-				max-height: 400px;
-				overflow-y: auto;
-				position: absolute;
-				left: 0;
-				right: 0;
-				z-index: 3;
-				background: #fff;
-				transform: translateY(-100%);
-				transition: all .3s;
-
-				&.show {
-					transform: translateY(0);
-				}
-
-				&__option {
-					font-size: 32rpx;
-					padding: 26rpx 28rpx;
-					display: flex;
-					justify-content: space-between;
-
-					&:not(:last-child) {
-						border-bottom: 1rpx solid #DDDDDD;
-					}
-				}
-			}
-
-			.dropdown-mask {
-				position: absolute;
-				left: 0;
-				right: 0;
-				top: 0;
-				bottom: 0;
-				transition: all .3s;
-				z-index: 2;
-
-				&.show {
-					background: rgba(0, 0, 0, 0.5);
-				}
-			}
-		}
-
-		&:not(:last-child):after {
-			content: ' ';
-			position: absolute;
-			width: 2rpx;
-			top: 36rpx;
-			bottom: 36rpx;
-			right: 0;
-			background: $uni-border-color;
-		}
-	}
-</style>

components/ms-dropdown/dropdown-menu.vue

@@ -1,35 +0,0 @@
-<template>
-	<div class="dropdown-menu">
-		<slot></slot>
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			}
-		},
-		mounted() {
-			this.$on('close', this.closeDropdown)
-		},
-		methods: {
-			closeDropdown() {
-				this.$children.forEach(item =>{
-					item.close();
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.dropdown-menu {
-		display: flex;
-		overflow: auto;
-		white-space: nowrap;
-	}
-	dropdown-item {
-		flex: 1;
-	}
-</style>

components/uni-icons/icons.js

@@ -1,132 +0,0 @@
-export default {
-	"pulldown": "\ue588",
-	"refreshempty": "\ue461",
-	"back": "\ue471",
-	"forward": "\ue470",
-	"more": "\ue507",
-	"more-filled": "\ue537",
-	"scan": "\ue612",
-	"qq": "\ue264",
-	"weibo": "\ue260",
-	"weixin": "\ue261",
-	"pengyouquan": "\ue262",
-	"loop": "\ue565",
-	"refresh": "\ue407",
-	"refresh-filled": "\ue437",
-	"arrowthindown": "\ue585",
-	"arrowthinleft": "\ue586",
-	"arrowthinright": "\ue587",
-	"arrowthinup": "\ue584",
-	"undo-filled": "\ue7d6",
-	"undo": "\ue406",
-	"redo": "\ue405",
-	"redo-filled": "\ue7d9",
-	"bars": "\ue563",
-	"chatboxes": "\ue203",
-	"camera": "\ue301",
-	"chatboxes-filled": "\ue233",
-	"camera-filled": "\ue7ef",
-	"cart-filled": "\ue7f4",
-	"cart": "\ue7f5",
-	"checkbox-filled": "\ue442",
-	"checkbox": "\ue7fa",
-	"arrowleft": "\ue582",
-	"arrowdown": "\ue581",
-	"arrowright": "\ue583",
-	"smallcircle-filled": "\ue801",
-	"arrowup": "\ue580",
-	"circle": "\ue411",
-	"eye-filled": "\ue568",
-	"eye-slash-filled": "\ue822",
-	"eye-slash": "\ue823",
-	"eye": "\ue824",
-	"flag-filled": "\ue825",
-	"flag": "\ue508",
-	"gear-filled": "\ue532",
-	"reload": "\ue462",
-	"gear": "\ue502",
-	"hand-thumbsdown-filled": "\ue83b",
-	"hand-thumbsdown": "\ue83c",
-	"hand-thumbsup-filled": "\ue83d",
-	"heart-filled": "\ue83e",
-	"hand-thumbsup": "\ue83f",
-	"heart": "\ue840",
-	"home": "\ue500",
-	"info": "\ue504",
-	"home-filled": "\ue530",
-	"info-filled": "\ue534",
-	"circle-filled": "\ue441",
-	"chat-filled": "\ue847",
-	"chat": "\ue263",
-	"mail-open-filled": "\ue84d",
-	"email-filled": "\ue231",
-	"mail-open": "\ue84e",
-	"email": "\ue201",
-	"checkmarkempty": "\ue472",
-	"list": "\ue562",
-	"locked-filled": "\ue856",
-	"locked": "\ue506",
-	"map-filled": "\ue85c",
-	"map-pin": "\ue85e",
-	"map-pin-ellipse": "\ue864",
-	"map": "\ue364",
-	"minus-filled": "\ue440",
-	"mic-filled": "\ue332",
-	"minus": "\ue410",
-	"micoff": "\ue360",
-	"mic": "\ue302",
-	"clear": "\ue434",
-	"smallcircle": "\ue868",
-	"close": "\ue404",
-	"closeempty": "\ue460",
-	"paperclip": "\ue567",
-	"paperplane": "\ue503",
-	"paperplane-filled": "\ue86e",
-	"person-filled": "\ue131",
-	"contact-filled": "\ue130",
-	"person": "\ue101",
-	"contact": "\ue100",
-	"images-filled": "\ue87a",
-	"phone": "\ue200",
-	"images": "\ue87b",
-	"image": "\ue363",
-	"image-filled": "\ue877",
-	"location-filled": "\ue333",
-	"location": "\ue303",
-	"plus-filled": "\ue439",
-	"plus": "\ue409",
-	"plusempty": "\ue468",
-	"help-filled": "\ue535",
-	"help": "\ue505",
-	"navigate-filled": "\ue884",
-	"navigate": "\ue501",
-	"mic-slash-filled": "\ue892",
-	"search": "\ue466",
-	"settings": "\ue560",
-	"sound": "\ue590",
-	"sound-filled": "\ue8a1",
-	"spinner-cycle": "\ue465",
-	"download-filled": "\ue8a4",
-	"personadd-filled": "\ue132",
-	"videocam-filled": "\ue8af",
-	"personadd": "\ue102",
-	"upload": "\ue402",
-	"upload-filled": "\ue8b1",
-	"starhalf": "\ue463",
-	"star-filled": "\ue438",
-	"star": "\ue408",
-	"trash": "\ue401",
-	"phone-filled": "\ue230",
-	"compose": "\ue400",
-	"videocam": "\ue300",
-	"trash-filled": "\ue8dc",
-	"download": "\ue403",
-	"chatbubble-filled": "\ue232",
-	"chatbubble": "\ue202",
-	"cloud-download": "\ue8e4",
-	"cloud-upload-filled": "\ue8e5",
-	"cloud-upload": "\ue8e6",
-	"cloud-download-filled": "\ue8e9",
-	"headphones":"\ue8bf",
-	"store":"\ue609"
-}

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>

components/uni-status-bar/uni-status-bar.vue

@@ -1,25 +0,0 @@
-<template>
-	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
-		<slot />
-	</view>
-</template>
-
-<script>
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
-	export default {
-		name: 'UniStatusBar',
-		data() {
-			return {
-				statusBarHeight: statusBarHeight
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-status-bar {
-		width: 750rpx;
-		height: 20px;
-		// height: var(--status-bar-height);
-	}
-</style>

components/uniMap.vue

@@ -29,7 +29,8 @@ export default {
             });
           });
         },
-        fail() {
+        fail(e) {
+          console.log(e)
           that.$emit("close");
         },
       });

components/verification/verification.vue

@@ -1,39 +1,87 @@
 <template>
   <view>
-    <view v-if="!hid" class="flex-row-center" :style="{ top: scHight }" style="width: 750rpx; position: fixed; z-index: 100; left: 0">
-      <view class="flex-column-center" style="background-color: #fcfcfc; padding: 30rpx; border-radius: 10rpx">
-        <movable-area class="flex" style="width: 100%" animation="false" :style="{ height: originalHeight }">
-          <movable-view scale-value="1" animation="false" damping="5000" :x="moveX" :style="{
+    <view
+      v-if="!hid"
+      class="flex-row-center"
+      :style="{ top: scHight }"
+      style="width: 750rpx; position: fixed; z-index: 100; left: 0"
+    >
+      <view
+        class="flex-column-center"
+        style="background-color: #fcfcfc; padding: 30rpx; border-radius: 10rpx"
+      >
+        <movable-area
+          class="flex"
+          style="width: 100%"
+          animation="false"
+          :style="{ height: originalHeight }"
+        >
+          <movable-view
+            scale-value="1"
+            animation="false"
+            damping="5000"
+            :x="moveX"
+            :style="{
               height: sliderHeight,
               width: sliderWidth,
               'z-index': 101,
-            }" direction="horizontal">
-            <image :src="imgbk" class="image" mode="aspectFit" :style="{
+            }"
+            direction="horizontal"
+          >
+            <image
+              :src="imgbk"
+              class="image"
+              mode="aspectFit"
+              :style="{
                 height: sliderHeight,
                 width: sliderWidth,
                 'margin-top': imgbKH,
-              }"></image>
+              }"
+            ></image>
           </movable-view>
-          <image :src="img" mode="aspectFit" :style="{ height: originalHeight, width: originalWidth }" style="border-radius: 10rpx"></image>
+          <image
+            :src="img"
+            mode="aspectFit"
+            :style="{ height: originalHeight, width: originalWidth }"
+            style="border-radius: 10rpx"
+          ></image>
         </movable-area>
 
-        <movable-area class="flex-row-start" style="
+        <movable-area
+          class="flex-row-start"
+          style="
             width: 100%;
             background-color: #efefef;
             height: 80rpx;
             border-radius: 40rpx;
             margin-top: 30rpx;
-          ">
-          <movable-view scale-value="1" animation="false" damping="50" :x="movePv" class="flex-row-center" style="
+          "
+        >
+          <movable-view
+            scale-value="1"
+            animation="false"
+            damping="50"
+            :x="movePv"
+            class="flex-row-center"
+            style="
               border-radius: 50%;
               height: 100rpx;
               width: 100rpx;
               background-color: #ffffff;
               border: 2rpx solid #e3e3e3;
               margin-top: -13rpx;
-            " direction="horizontal" @change="moveChange" @touchend="end">
-            <view :class="endLoad ? 'cuIcon-right' : 'cuIcon-loading turn-load'" class="loadIcon" style="">
-            </view>
+            "
+            direction="horizontal"
+            @change="moveChange"
+            @touchend="end"
+          >
+            <u-icon
+              :color="mainColor"
+              size="40"
+              v-if="endLoad"
+              name="arrow-right"
+            ></u-icon>
+            <u-icon :color="mainColor" size="40" v-else name="reload"></u-icon>
           </movable-view>
 
           <text style="padding-left: 140rpx" :style="{ color: col }">{{
@@ -41,15 +89,20 @@
           }}</text>
         </movable-area>
         <view class="flex-row-around padding-top" style="width: 100%">
-          <view @click="hide" class="cuIcon-close" style="font-size: 50rpx; color: #e25915">
-          </view>
+          <u-icon
+            @click="hide"
+            :color="mainColor"
+            size="40"
+            name="close"
+          ></u-icon>
 
-          <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
-          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1">Lili-FRAMEWORK</text>
+          <text class="cu-tag round" @click="getCode">刷新拼图</text>
+          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1"
+            >Lili-FRAMEWORK</text
+          >
         </view>
       </view>
     </view>
-
   </view>
 </template>
 
@@ -90,6 +143,7 @@ export default {
   },
   data() {
     return {
+      mainColor: this.$mainColor,
       flage: false,
       key: "", //key
       vsrtx: "点击进行验证", //按钮提示语
@@ -144,7 +198,7 @@ export default {
         storage.setUuid(uuid.v1());
       }
       uni.request({
-        url: api.common + "/slider/" + this.business,
+        url: api.common + "/common/slider/" + this.business,
         header: {
           uuid: storage.getUuid(),
         },
@@ -179,7 +233,7 @@ export default {
         method: "POST",
         url:
           api.common +
-          "/slider/" +
+          "/common/slider/" +
           this.business +
           "?xPos=" +
           parseInt(this.moveCode * this.tl),
@@ -252,10 +306,6 @@ export default {
 .border-index {
   border: 1rpx solid $main-color;
 }
-.loadIcon {
-  color: $main-color;
-  font-size: 40rpx;
-}
 
 .status_bar {
   height: var(--status-bar-height);

components/verify-code/verify-code.vue

@@ -0,0 +1,278 @@
+<template>
+	<view class="xt__verify-code">
+		<!-- 输入框 -->
+		<input
+			id="xt__input"
+			:value="code"
+			class="xt__input"
+			:focus="isFocus"
+			:password="isPassword"
+			:type="inputType"
+			:maxlength="size"
+			@input="input"
+			@focus="inputFocus"
+			@blur="inputBlur"
+		/>
+
+		<!-- 光标 -->
+		<view
+			id="xt__cursor"
+			v-if="cursorVisible && type !== 'middle'"
+			class="xt__cursor"
+			:style="{ left: codeCursorLeft[code.length] + 'px', height: cursorHeight + 'px', backgroundColor: cursorColor }"
+		></view>
+
+		<!-- 输入框 - 组 -->
+		<view id="xt__input-ground" class="xt__input-ground">
+			<template v-for="(item, index) in size">
+				<view
+					:key="index"
+					:style="{ borderColor: code.length === index && cursorVisible ? boxActiveColor : boxNormalColor }"
+					:class="['xt__box', `xt__box-${type + ''}`, `xt__box::after`]"
+				>
+					<view :style="{ borderColor: boxActiveColor }" class="xt__middle-line" v-if="type === 'middle' && !code[index]"></view>
+					<text class="xt__code-text">{{ code[index] | codeFormat(isPassword) }}</text>
+				</view>
+			</template>
+		</view>
+	</view>
+</template>
+<script>
+/**
+ * @description 输入验证码组件
+ * @property {string} type = [box|middle|bottom] - 显示类型 默认：box -eg:bottom
+ * @property {string} inputType = [text|number] - 输入框类型 默认：number -eg:number
+ * @property {number} size = [4|6] - 支持的验证码数量 默认：6 -eg:6
+ * @property {boolean} isFocus - 是否立即聚焦 默认：true
+ * @property {boolean} isPassword - 是否以密码形式显示 默认false -eg:false
+ * @property {string} cursorColor - 光标颜色 默认：#cccccc
+ * @property {string} boxNormalColor - 光标未聚焦到的框的颜色 默认：#cccccc
+ * @property {string} boxActiveColor - 光标聚焦到的框的颜色 默认：#000000
+ * @event {Function(data)} confirm - 输入完成
+ */
+export default {
+	name: 'xt-verify-code',
+	props: {
+		value: {
+			type: String,
+			default: () => ''
+		},
+		type: {
+			type: String,
+			default: () => 'box'
+		},
+		inputType: {
+			type: String,
+			default: () => 'number'
+		},
+		size: {
+			type: Number,
+			default: () => 6
+		},
+		isFocus: {
+			type: Boolean,
+			default: () => true
+		},
+		isPassword: {
+			type: Boolean,
+			default: () => false
+		},
+		cursorColor: {
+			type: String,
+			default: () => '#cccccc'
+		},
+		boxNormalColor: {
+			type: String,
+			default: () => '#cccccc'
+		},
+		boxActiveColor: {
+			type: String,
+			default: () => '#000000'
+		}
+	},
+	model: {
+		prop: 'value',
+		event: 'input'
+	},
+	data() {
+		return {
+			cursorVisible: false,
+			cursorHeight: 35,
+			code: '', // 输入的验证码
+			codeCursorLeft: [] // 向左移动的距离数组
+		};
+	},
+	created() {
+		this.cursorVisible = this.isFocus;
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		/**
+		 * @description 初始化
+		 */
+		init() {
+			this.getCodeCursorLeft();
+			this.setCursorHeight();
+		},
+		/**
+		 * @description 获取元素节点
+		 * @param {string} elm - 节点的id、class 相当于 document.querySelect的参数 -eg: #id
+		 * @param {string} type = [single|array] - 单个元素获取多个元素 默认是单个元素
+		 * @param {Function} callback - 回调函数
+		 */
+		getElement(elm, type = 'single', callback) {
+			uni
+				.createSelectorQuery()
+				.in(this)
+				[type === 'array' ? 'selectAll' : 'select'](elm)
+				.boundingClientRect()
+				.exec(data => {
+					callback(data[0]);
+				});
+		},
+		/**
+		 * @description 计算光标的高度
+		 */
+		setCursorHeight() {
+			this.getElement('.xt__box', 'single', boxElm => {
+				this.cursorHeight = boxElm.height * 0.6;
+			});
+		},
+		/**
+		 * @description 获取光标在每一个box的left位置
+		 */
+		getCodeCursorLeft() {
+			// 获取父级框的位置信息
+			this.getElement('#xt__input-ground', 'single', parentElm => {
+				const parentLeft = parentElm.left;
+				// 获取各个box信息
+				this.getElement('.xt__box', 'array', elms => {
+					this.codeCursorLeft = [];
+					elms.forEach(elm => {
+						this.codeCursorLeft.push(elm.left - parentLeft + elm.width / 2);
+					});
+				});
+			});
+		},
+
+		// 输入框输入变化的回调
+		input(e) {
+			const value = e.detail.value;
+			this.cursorVisible = value.length !== this.size;
+			this.$emit('input', value);
+			this.inputSuccess(value);
+		},
+
+		// 输入完成回调
+		inputSuccess(value) {
+			if (value.length === this.size) {
+				this.$emit('confirm', value);
+			}
+		},
+		// 输入聚焦
+		inputFocus() {
+			this.cursorVisible = this.code.length !== this.size;
+		},
+		// 输入失去焦点
+		inputBlur() {
+			this.cursorVisible = false;
+		}
+	},
+	watch: {
+		value(val) {
+			this.code = val;
+		}
+	},
+	filters: {
+		codeFormat(val, isPassword) {
+			let value = '';
+			if (val) {
+				value = isPassword ? '*' : val;
+			}
+			return value;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.xt__verify-code {
+	position: relative;
+	width: 100%;
+	box-sizing: border-box;
+
+	.xt__input {
+		height: 100%;
+		width: 200%;
+		position: absolute;
+		left: -100%;
+		z-index: 1;
+	}
+	.xt__cursor {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		display: inline-block;
+		width: 2px;
+		animation-name: cursor;
+		animation-duration: 0.8s;
+		animation-iteration-count: infinite;
+	}
+
+	.xt__input-ground {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		box-sizing: border-box;
+		.xt__box {
+			position: relative;
+			display: inline-block;
+			width: 76rpx;
+			height: 112rpx;
+			&-bottom {
+				border-bottom-width: 2px;
+				border-bottom-style: solid;
+			}
+
+			&-box {
+				border-width: 2px;
+				border-style: solid;
+			}
+
+			&-middle {
+				border: none;
+			}
+
+			.xt__middle-line {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				width: 50%;
+				transform: translate(-50%, -50%);
+				border-bottom-width: 2px;
+				border-bottom-style: solid;
+			}
+
+			.xt__code-text {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				font-size:52rpx;
+				transform: translate(-50%, -50%);
+			}
+		}
+	}
+}
+
+@keyframes cursor {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+</style>

config/api.js

@@ -4,12 +4,16 @@
  */
 // 开发环境
 const dev = {
+  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",
 };
@@ -29,6 +33,7 @@ api = prod;
 
 api.buyer += "/buyer";
 api.common += "/common";
+api.im += "/im";
 export default {
   ...api,
 };

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/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  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" //客服邮箱 
+  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作为备用登录方案
 };

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;

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";
+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";

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "lili商城",
-    "appid" : "__UNI__C100675",
+    "name" : "lilishop",
+    "appid" : "__UNI__ED807EA",
     "description" : "",
-    "versionName" : "4.0.42",
-    "versionCode" : 4000042,
+    "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" : {
@@ -72,9 +83,11 @@
                     "NSPhotoLibraryAddUsageDescription" : "保存商品图片到本地",
                     "NSFaceIDUsageDescription" : "使用面部识别进行登录",
                     "NSCameraUsageDescription" : "需要用与扫描二维码和商品评论图片拍摄",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示"
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
+                    "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                 },
-                "urltypes" : "lilishop"
+                "urltypes" : "lilishop",
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -103,7 +116,7 @@
                     },
                     "apple" : {},
                     "qq" : {
-                        "appid" : "101918503"
+                        "appid" : "101918501"
                     }
                 },
                 "geolocation" : {
@@ -194,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" : {

pages.json

@@ -10,17 +10,34 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTextStyle": "black"
+				"navigationBarTextStyle": "black",
+				"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": {
 				"navigationBarTitleText": "购物车",
-				"navigationStyle": "custom",
-
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh":true    //实现下拉刷新样式
 
 			}
 		}, {
@@ -42,9 +59,16 @@
 			"style": {
 				"navigationBarTitleText": "搜索",
 				"navigationStyle": "custom",
+				
 				"app-plus": {
 					//app页面不显示滚动条
-					"scrollIndicator": "none"
+					"scrollIndicator": "none",
+					"bottom": "0",
+					"contentAdjust": "false",
+					"bounce": "none",
+					"safearea": {
+					"bottom": "none"
+					}
 				}
 			}
 		}, {
@@ -61,6 +85,12 @@
 			"style": {
 				
 			}
+		},
+				{
+					"path": "pages/tabbar/special/special",
+					"style": {
+							"navigationBarTitleText": "专题"
+					}
 		}
 
 	],
@@ -80,21 +110,14 @@
 					"style": {
 						"navigationBarTitleText": "我的足迹",
 						"enablePullDownRefresh": true,
-						"app-plus": {
-							"titleNView": {
-								"buttons": [{
-									"text": "编辑",
-									"fontSize": "14"
-
-								}]
-							}
-						}
+						"navigationStyle": "custom"
 					}
 				}, {
 					"path": "myCollect",
 					"style": {
 						"navigationBarTitleText": "收藏",
 						"enablePullDownRefresh": true, //下拉刷新
+						"navigationStyle": "custom",
 						"app-plus": {
 							"scrollIndicator": "none"
 						}
@@ -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": {
@@ -340,6 +391,12 @@
 					"navigationBarTitleText": "",
 					"navigationStyle": "custom"
 				}
+			},{
+				"path": "shopList",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
 			},{
 				"path": "licencePhoto",
 				"style": {
@@ -396,6 +453,7 @@
 						}
 					}
 				}
+
 			]
 
 		},
@@ -425,6 +483,21 @@
 						}
 					}
 				},
+				
+				{
+					"path": "entry/seller/index",
+					"style": {
+						"navigationBarTitleText": "店铺入驻",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "entry/seller/control",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "article",
 					"style": {
@@ -438,6 +511,14 @@
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "scannerCodeLoginConfirm",
+					"style": {
+						"navigationBarTitleText": "扫码登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]
 
@@ -446,16 +527,11 @@
 		{
 			"root": "pages/promotion",
 			"pages": [ {
-					"path": "sale",
-					"style": {
-						"navigationBarTitleText": "特惠推荐",
-						"navigationStyle": "custom"
-
-					}
-				}, {
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -469,19 +545,12 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
-						
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"
 						}
 					}
-				}, {
-					"path": "recommend",
-					"style": {
-						"navigationBarTitleText": "人气推荐",
-						"navigationStyle": "custom"
-
-					}
 				},{
 					"path": "lives",
 					"style": {

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,12 +23,13 @@
 						<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>有效期至：{{  item.endTime.split(" ")[0] }}</view>
+								</view>
+								<view v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
 							</view>
 							<view class="receive" @click="receive(item)">
 								<text>点击</text><br />
@@ -37,16 +38,20 @@
 							<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";
+	import {
+		receiveCoupons
+	} from "@/api/members.js";
+	import {
+		getAllCoupons
+	} from "@/api/promotions.js";
 	export default {
 		data() {
 			return {
@@ -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();
 				}
 			},
 		},
@@ -145,41 +168,7 @@ page {
 	.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,10 +247,15 @@ page {
 					background-color: #ffffff;
 					overflow: hidden;
 					position: relative;
+
 					>view:nth-child(1) {
 						color: #666666;
 						margin-left: 20rpx;
-          line-height: 3em;
+						display: flex;
+						height: 100%;
+						flex-direction: column;
+						justify-content: space-around;
+
 						>view:nth-child(1) {
 							color: #ff6262;
 							font-size: 30rpx;
@@ -296,4 +294,9 @@ page {
 			}
 		}
 	}
+
+	.coupon-title {
+		width: 260rpx;
+
+	}
 </style>

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"
                       ? "仅限品类"

pages/cart/coupon/index.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="wrapper">
-    <u-tabs :list="list" :is-scroll="false" :active-color="lightColor" :current="current" @change="(i)=>{current = i}">
+    <u-tabs
+      :list="list"
+      :is-scroll="false"
+      :active-color="lightColor"
+      :current="current"
+      @change="
+        (i) => {
+          current = i;
+        }
+      "
+    >
     </u-tabs>
 
     <div class="empty" v-if="couponsList.length <= 0">
@@ -24,17 +34,29 @@
       <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>
-            <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+            <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 class="reason" v-if="item.reason">{{ item.reason }}</view>
           <view class="end-time">有效期至:{{ item.endTime }}</view>
         </view>
-        <view class="receive" v-if="current ==0" @click="clickWay(item)">
+        <view
+          class="receive"
+          v-if="current == 0 && !routerVal.selectedCoupon.includes(item.id)"
+          @click="clickWay(item)"
+        >
           <text>立即</text><br />
           <text>使用</text>
         </view>
+        <view class="used" v-else @click="clickWay(item)">
+          <text>取消</text><br />
+          <text>使用</text>
+        </view>
         <view class="bg-quan">券</view>
       </view>
     </view>
@@ -69,6 +91,9 @@ export default {
       routerVal: "", //上级传参
     };
   },
+  onLoad(options) {
+    this.routerVal = options;
+  },
   watch: {
     current(val) {
       console.log(this.$store.state.cantUseCoupons);
@@ -80,6 +105,7 @@ export default {
 
   mounted() {
     this.init();
+    console.log(this.routerVal);
   },
 
   methods: {
@@ -95,7 +121,7 @@ export default {
     clickWay(coupon) {
       useCoupon({
         memberCouponId: coupon.id,
-        used: true,
+        used: !this.routerVal.selectedCoupon.includes(coupon.id),
         way: this.routerVal.way,
       }).then((res) => {
         if (res.data.success) {
@@ -114,10 +140,11 @@ export default {
 </script>
 <style scoped lang="scss">
 .desc {
-  height: 100%;
+  height: 220rpx;
+  flex: 2;
   display: flex;
   flex-direction: column;
-  justify-content: center;
+  justify-content: space-around;
 }
 .end-time,
 .reason {
@@ -204,14 +231,14 @@ export default {
     align-items: center;
     width: 450rpx;
     font-size: $font-sm;
-    height: 100%;
+    height: 220rpx;
     background-color: #ffffff;
     overflow: hidden;
     position: relative;
     > view:nth-child(1) {
       color: #666666;
       margin-left: 20rpx;
-      line-height: 3em;
+
       > view:nth-child(1) {
         color: #ff6262;
         font-size: 30rpx;
@@ -232,6 +259,20 @@ export default {
       z-index: 2;
     }
 
+    .used {
+      color: #ffffff;
+      background-color: black;
+      border-radius: 50%;
+      width: 86rpx;
+      height: 86rpx;
+      text-align: center;
+      margin-right: 30rpx;
+      vertical-align: middle;
+      padding-top: 8rpx;
+      position: relative;
+      z-index: 2;
+    }
+
     .bg-quan {
       width: 244rpx;
       height: 244rpx;

pages/cart/coupon/myCoupon.vue

@@ -2,26 +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>
@@ -29,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>
@@ -82,7 +139,7 @@ export default {
             pageSize: 10,
             status: 1,
           },
-          wheterEmpty: false,
+          whetherEmpty: false,
         },
         {
           text: "已使用",
@@ -94,7 +151,7 @@ export default {
             pageSize: 10,
             status: 2,
           },
-          wheterEmpty: false,
+          whetherEmpty: false,
         },
         {
           text: "已过期",
@@ -106,7 +163,7 @@ export default {
             pageSize: 10,
             status: 3,
           },
-          wheterEmpty: false,
+          whetherEmpty: false,
         },
       ],
       couponList: [], //优惠券列表
@@ -114,6 +171,8 @@ export default {
   },
 
   onShow() {
+    this.navList[this.tabCurrentIndex].params.pageNumber = 1;
+    this.navList[this.tabCurrentIndex].dataList = [];
     this.getData();
   },
 
@@ -147,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";
             }
@@ -158,8 +217,7 @@ export default {
             this.navList[index].dataList.push(...data);
           }
         }
-        console.log(this.navList[index].dataList)
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
       });
     },
 
@@ -185,15 +243,9 @@ export default {
      * 立即使用优惠券
      */
     useItNow(item) {
-      if (item.storeId) {
       uni.navigateTo({
-          url: `/pages/product/shopPage?id=${item.storeId}`,
+        url: `/pages/navigation/search/searchPage?promotionsId=${item.couponId}&promotionType=COUPON`,
       });
-      } else {
-        uni.switchTab({
-          url: "/pages/tabbar/home/index",
-        });
-      }
     },
 
     /**

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({

pages/cart/payment/popup/goods.vue

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

pages/cart/payment/popup/popup.js

@@ -1,8 +0,0 @@
-
-
-export default {
-    height:"1000rpx", //弹出层高度
-    mode:"bottom", //弹出层位置
-    radius:"32", //圆角 rpx,
-    close:false //能否点击遮罩退出
-}

pages/cart/payment/popup/popup.scss

@@ -1,37 +0,0 @@
-.view-class-title {
-    font-size: 26rpx;
-    color: #262626;
-
-    font-weight: 700;
-    height: 80rpx;
-    line-height: 80rpx;
-}
-.confirmBtn {
-    width: 90%;
-}
-.confirmBtn,
-.box-btn {
-    line-height: 80rpx;
-    height: 80rpx;
-    
-    background: $price-color;
-    color: #fff;
-    border-radius: 200px;
-    text-align: center;
-    margin: 5rpx auto;
-}
-
-.btns {
-    display: flex;
-    width: 100%;
-
-    margin: 0 auto;
-}
-.goods-price-bigshow {
-    font-size: 48rpx;
-    font-weight: bold;
-}
-.box-btn {
-    flex: 1;
-    margin: 0 10rpx;
-}

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;
 
         // 判断是否拼团活动 如果有则显示拼团活动信息

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>
@@ -28,20 +30,21 @@
         <div class="saveBtn" @click="save">保存</div>
       </u-form>
 
-      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4"></m-city>
+      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
+      </m-city>
 
-      <uniMap v-if="mapFlage" @close="closeMap" @callback="callBackAddress" />
+      <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() {
@@ -50,7 +53,7 @@ export default {
   methods: {
     // 关闭地图
     closeMap() {
-      this.mapFlage = false;
+      this.mapFlag = false;
     },
     // 打开地图并访问权限
     clickUniMap() {
@@ -58,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(
@@ -69,12 +72,12 @@ export default {
       // #endif
 
       // #ifndef APP-PLUS
-      this.mapFlage = true;
+      this.mapFlag = true;
       // #endif
     },
 
     // 如果拒绝权限 提示区设置
-    refuseMapOuther() {
+    refuseMap() {
       uni.showModal({
         title: "温馨提示",
         content: "您已拒绝定位,请开启",
@@ -110,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: "加载中",
       });
@@ -133,7 +137,7 @@ export default {
          uni.hideLoading();
       }
 
-      this.mapFlage = !this.mapFlage; //关闭地图
+      this.mapFlag = !this.mapFlag; //关闭地图
     },
 
     // 保存当前 地址
@@ -159,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();
               }
             });
           }
@@ -190,8 +192,8 @@ export default {
             return _child.id == item.id;
           });
 
-          this.form.lat = _town[0].center.split(",")[0];
-          this.form.lon = _town[0].center.split(",")[1];
+          this.form.lat = _town[0].center.split(",")[1];
+          this.form.lon = _town[0].center.split(",")[0];
         }
       });
     },
@@ -205,7 +207,7 @@ export default {
   data() {
     return {
       lightColor: this.$lightColor, //高亮颜色
-      mapFlage: false, // 地图选择开
+      mapFlag: false, // 地图选择开
       routerVal: "",
       form: {
         detail: "", //地址详情
@@ -275,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();

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() };
       });
     },
     //删除地址

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() };
       });
     },
     //删除地址

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>

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) {

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,
       });

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>

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: "提现成功!",

pages/mine/distribution/history.vue

@@ -7,7 +7,7 @@
           <view class="title">{{
             item.distributionCashStatus == "APPLY"
               ? "待处理"
-              : item.distributionCashStatus == "PASS"
+              : item.distributionCashStatus == "VIA_AUDITING"
                 ? "通过"
                 : "拒绝"
           }}</view>
@@ -24,17 +24,22 @@
       <view class="log-item">
         <view class="log-item-view">
           <view class="title">{{ item.goodsName }}</view>
-          <view class="price">+{{ item.rebate | unitPrice }}</view>
+          <view class="price">提成金额：+{{ item.rebate | unitPrice }}</view>
         </view>
         <view class="log-item-view">
-          <view>{{ item.createTime }}</view>
-          <view>{{item.storeName}}</view>
+          <view>创建时间：{{ item.createTime }}</view>
+          <view>店铺：{{ item.storeName }}</view>
+        </view>
+        <view class="log-item-footer">
+          <view>会员名称：{{ item.memberName }}</view>
+        </view>
+        <view class="log-item-footers">
+          <view>订单号：{{ item.orderSn }}</view>
         </view>
       </view>
     </view>
     <view class="empty" v-if="empty">
       <u-loadmore :status="status" :icon-type="iconType" bg-color="#f7f7f7" />
-
     </view>
   </view>
 </template>
@@ -86,12 +91,12 @@ export default {
       });
       distributionOrderList(this.achParams).then((res) => {
         if (res.data.success && res.data.result.records.length >= 1) {
-          this.achievementData = res.data.result.records;
+          this.achievementData.push(...res.data.result.records);
         } else {
           this.status = "nomore";
           this.empty = true;
         }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
       });
     },
     // 初始化提现历史
@@ -101,12 +106,12 @@ export default {
       });
       cashLog(this.params).then((res) => {
         if (res.data.success && res.data.result.records.length >= 1) {
-          this.cashLogData = res.data.result.records;
+          this.cashLogData.push(...res.data.result.records);
         } else {
           this.status = "nomore";
           this.empty = true;
         }
-        uni.hideLoading();
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
       });
     },
   },
@@ -116,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;
@@ -132,13 +140,30 @@ 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;
+  font-size: 13px;
   justify-content: space-between;
 }
 </style>

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;

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() };
       });
     },
   },

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)
         }
       });
     },

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>

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>

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
+}

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)

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);

pages/mine/myCollect.vue

@@ -1,21 +1,18 @@
 <template>
 	<view class="content">
-    <view class="navbar">
-      <!-- 循环出顶部nav栏 -->
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="tabClick(index)">
-        <text :class="{current: tabCurrentIndex === index}">{{item.text}}</text>
-      </view>
-    </view>
+		<u-navbar>
+			<u-tabs :active-color="lightColor"  class="slot-wrap" :list="navList" count="count" :is-scroll="true" :current="tabCurrentIndex" @change="tabClick"></u-tabs>
+		</u-navbar>
 		<view class="swiper-box">
 			<!-- 显示商品栏 -->
 			<view v-if="tabCurrentIndex == 0" class="tab-content">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
+				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 空白页 -->
-          <u-empty style="margin-top:40rpx;" text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
+					<u-empty style="margin-top: 40rpx" text="暂无收藏商品数据" mode="favor" v-if="goodsEmpty"></u-empty>
 					<!-- 商品展示数据 -->
 					<u-swipe-action @open="openLeftChange(item, index, 'goods')" :show="item.selected" btn-width="180"
-            :options="LeftOptions" v-else v-for="(item,index) in goodList" @click="clickGoodsSwiperAction(item,index)"
-            :index="index" :key="index">
+						:options="LeftOptions" v-else v-for="(item, index) in goodList"
+						@click="clickGoodsSwiperAction(item, index)" :index="index" :key="index">
 						<view class="goods" @click="goGoodsDetail(item)">
 							<u-image width="131rpx" height="131rpx" :src="item.image" mode="aspectFit">
 								<u-loading slot="loading"></u-loading>
@@ -28,29 +25,29 @@
 						</view>
 					</u-swipe-action>
 
-          <uni-load-more :status="goodsLoad"></uni-load-more>
 				</scroll-view>
 			</view>
 			<!-- 显示收藏的店铺栏 -->
 			<view v-else class="tab-content">
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadMore">
+				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 空白页 -->
-          <u-empty style="margin-top:40rpx;" text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
+					<u-empty style="margin-top: 40rpx" text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
 					<!-- 店铺展示数据 -->
 					<u-swipe-action @open="openLeftChange(item, 'store')" :show="item.selected" btn-width="180"
 						:options="LeftOptions" v-else v-for="(item, index) in storeList" :key="index"
-            @click="clickstoreSwiperAction(item)">
-            <view class="store" @click="gostoreMainPage(item.id)">
+						@click="clickStoreSwiperAction(item)">
+						<view class="store" @click="goStoreMainPage(item.id)">
 							<view class="intro">
 								<view class="store-logo">
-                  <u-image width="102rpx" height="102rpx" :src="item.storeLogo" :alt="item.storeName" mode="aspectFit">
+									<u-image width="102rpx" height="102rpx" :src="item.storeLogo" :alt="item.storeName"
+										mode="aspectFit">
 										<u-loading slot="loading"></u-loading>
 									</u-image>
 								</view>
 								<view class="store-name">
 									<view>{{ item.storeName }}</view>
-                  <u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated" text="自营" mode="plain"
-                    shape="circle" />
+									<u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated"
+										text="自营" mode="plain" shape="circle" />
 								</view>
 								<view class="store-collect">
 									<view>进店逛逛</view>
@@ -58,7 +55,6 @@
 							</view>
 						</view>
 					</u-swipe-action>
-          <uni-load-more :status="storeLoad"></uni-load-more>
 				</scroll-view>
 			</view>
 		</view>
@@ -68,60 +64,84 @@
 <script>
 	import {
 		getGoodsCollection,
+		getStoreCollection,
 		deleteGoodsCollection,
 		deleteStoreCollection,
 	} from "@/api/members.js";
 	export default {
 		data() {
 			return {
+        lightColor:this.$lightColor,
 				// 商品左滑侧边栏
-      LeftOptions: [
-        {
+				LeftOptions: [{
 					text: "取消",
 					style: {
 						backgroundColor: this.$lightColor,
 					},
-        },
-      ],
+				}, ],
 				tabCurrentIndex: 0, //tab的下标默认为0，也就是说会默认请求商品
 				navList: [
 					//tab显示数据
 					{
-          text: "商品(0)",
-          loadingType: "more",
+						name: "商品(0)",
+					
 						params: {
 							pageNumber: 1,
 							pageSize: 10,
 						},
 					},
 					{
-          text: "店铺(0)",
-          loadingType: "more",
+						name: "店铺(0)",
+					
 						params: {
 							pageNumber: 1,
 							pageSize: 10,
 						},
 					},
 				],
-      goodsLoad: "more", //商品加载
-      storeLoad: "more", //店铺加载
+			
 				goodsEmpty: false, //商品数据是否为空
 				storeEmpty: false, //店铺数据是否为空
 				goodList: [], //商品集合
 				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.getGoodList();
+					} else {
+						this.getStoreList();
+					}
+				}
+				else{
+					this.navList[0].params.pageNumber = 1;
+					this.navList[1].params.pageNumber = 1;
+					this.goodList = [];
+					this.storeList = [];
+					this.getGoodList();
+					this.getStoreList();
+				}
+			},
+
 			/**
 			 * 打开商品左侧取消收藏
 			 */
 			openLeftChange(val, type) {
-      const { goodList, storeList } = this;
+				const {
+					goodList,
+					storeList
+				} = this;
 				let way;
 				type == "goods" ? (way = goodList) : (way = storeList);
 				way.forEach((item) => {
@@ -147,11 +167,11 @@ export default {
 			/**
 			 * 点击店铺左侧取消收藏
 			 */
-    clickstoreSwiperAction(val) {
-      deleteStoreCollection(val.storeId).then((res) => {
+			clickStoreSwiperAction(val) {
+				deleteStoreCollection(val.id).then((res) => {
 					if (res.statusCode == 200) {
 						this.storeList = [];
-          this.getstoreList();
+						this.getStoreList();
 					}
 				});
 			},
@@ -176,7 +196,7 @@ export default {
 			/**
 			 * 查看店铺详情
 			 */
-    gostoreMainPage(id) {
+			goStoreMainPage(id) {
 				//店铺主页
 				uni.navigateTo({
 					url: "/pages/product/shopPage?id=" + id,
@@ -191,12 +211,13 @@ export default {
 					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;
 						data.selected = false;
-          this.navList[0].text = `商品(${data.total})`;
+						  this.navList[0].name = `商品(${data.total})`;
+          
 						if (data.total == 0) {
 							this.goodsEmpty = true;
 						} else if (data.total < 10) {
@@ -213,42 +234,26 @@ export default {
 			/**
 			 * 获取店铺集合
 			 */
-    getstoreList() {
+			getStoreList() {
 				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;
 						data.selected = false;
-          this.navList[1].text = `店铺(${data.total})`;
+						 this.navList[1].name = `店铺(${data.total})`;
 						if (data.total == 0) {
 							this.storeEmpty = true;
 						} else if (data.total < 10) {
-            this.storeLoad = "noMore";
+						
 							this.storeList.push(...data.records);
-          } else {
-            this.storeList.push(...data.records);
-            if (data.total.length < 10) this.storeLoad = "noMore";
 						} 
 					}
 				});
 			},
-
-    /**
-     * 底部加载更多
-     */
-    loadMore() {
-      if (this.tabCurrentIndex == 0) {
-        this.navList[0].params.pageNumber++;
-        this.getGoodList();
-      } else {
-        this.navList[1].params.pageNumber++;
-        this.getstoreList();
-      }
-    },
 		},
 
 		/**
@@ -262,7 +267,7 @@ export default {
 			} else {
 				this.navList[1].params.pageNumber = 1;
 				this.storeList = [];
-      this.getstoreList();
+				this.getStoreList();
 			}
 		},
 	};
@@ -274,10 +279,18 @@ page,
 		background: $page-color-base;
 		height: 100%;
 	}
+
+  .slot-wrap{
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    padding-right: 72rpx;
+  }
+
 	.content {
 		width: 100%;
-  overflow: hidden;
 	}
+
 	.swiper-box {
 		overflow-y: auto;
 	}
@@ -290,6 +303,7 @@ page,
 	/deep/ .u-swipe-content {
 		overflow: hidden;
 	}
+
 	.goods {
 		background-color: #fff;
 		border-bottom: 1px solid $border-color-light;
@@ -298,11 +312,13 @@ page,
 		align-items: center;
 		padding: 30rpx 20rpx;
 		margin-top: 20rpx;
+
 		image {
 			width: 131rpx;
 			height: 131rpx;
 			border-radius: 10rpx;
 		}
+
 		.goods-intro {
 			flex: 1;
 			font-size: $font-base;
@@ -316,14 +332,17 @@ page,
 				overflow: hidden;
 				color: #666;
 			}
+
 			view:nth-child(2) {
 				color: #cccccc;
 				font-size: 24rpx;
 			}
+
 			view:nth-child(3) {
 				color: $light-color;
 			}
 		}
+
 		button {
 			color: $main-color;
 			height: 50rpx;
@@ -333,16 +352,19 @@ page,
 			line-height: 50rpx;
 			background-color: #ffffff;
 			margin-top: 80rpx;
+
 			&::after {
 				border-color: $main-color;
 			}
 		}
 	}
+
 	.store {
 		background-color: #fff;
 		border: 1px solid $border-color-light;
 		border-radius: 16rpx;
 		margin: 20rpx 10rpx;
+
 		.intro {
 			display: flex;
 			justify-content: space-between;
@@ -355,28 +377,34 @@ page,
 				height: 102rpx;
 				border-radius: 50%;
 				overflow: hidden;
+
 				image {
 					width: 100%;
 					height: 100%;
 					border-radius: 50%;
 				}
 			}
+
 			.store-name {
 				flex: 1;
 				margin-left: 30rpx;
 				line-height: 2em;
+
 				:first-child {
 					font-size: $font-base;
 				}
+
 				:last-child {
 					font-size: $font-sm;
 					color: #999;
 				}
 			}
+
 			.store-collect {
 				border-left: 1px solid $border-color-light;
 				padding-left: 20rpx;
 				text-align: center;
+
 				:last-child {
 					color: #999;
 					font-size: $font-sm;
@@ -384,6 +412,7 @@ page,
 			}
 		}
 	}
+
 	.navbar {
 		display: flex;
 		height: 40px;
@@ -392,6 +421,7 @@ page,
 		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
 		z-index: 10;
+
 		.nav-item {
 			flex: 1;
 			display: flex;
@@ -403,10 +433,12 @@ page,
 			text {
 				position: relative;
 			}
+
 			text.current {
 				color: $light-color;
 				font-weight: bold;
 				font-size: 28rpx;
+
 				&::after {
 					content: "";
 					position: absolute;

pages/mine/myTracks.vue

@@ -1,18 +1,26 @@
 <template>
 	<view class="myTracks">
+		<u-navbar title="我的足迹">
+
+		</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>
@@ -22,47 +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-placeholder"></view>
-      <view class="myTracks-action">
-        <view class="myTracks-action-check">
-          <u-checkbox-group>
-            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx" @change="checkedAllitem"></u-checkbox>
-            全选
-          </u-checkbox-group>
-        </view>
 
-        <view>
-          <u-button type="warning" plain="true" @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 {
 		data() {
 			return {
-      editFlag: false, //是否编辑
-      allChecked: false, //是否全选
-      loadStatus: "more", //底部下拉加载状态
+
 				whetherEmpty: false, //是否数据为空
 				params: {
 					pageNumber: 1,
 					pageSize: 10,
+					order: "desc",
+					sort: "updateTime",
 				},
-
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#dd524d'
+					}
+				}],
 				trackList: [], //足迹列表
 			};
 		},
@@ -71,56 +73,39 @@ export default {
 		 * 滑到底部加载下一页数据
 		 */
 		onReachBottom() {
-    if (this.loadStatus != "noMore") {
 			this.params.pageNumber++;
 			this.getList();
-    }
 		},
-  onLoad() {
+		onShow() {
+			this.params.pageNumber = 1
+			this.trackList = [];
+			this.getList();
+		},
+		onPullDownRefresh() {
+			this.trackList = [];
 			this.getList();
 		},
 		methods: {
 			/**
 			 * 导航到店铺
 			 */
-    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,
 				});
@@ -135,62 +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) {
-      const isCheckedAll = this.trackList.every((key) => {
-        return key.___isDel == val.___isDel;
-      });
-      this.allChecked = isCheckedAll;
-    },
-
-    /**
-     * 点击全选按钮
-     */
-    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({
@@ -202,22 +156,14 @@ export default {
 				});
 			},
 		},
-
-  /**
-   * 右侧标签栏切换
-   */
-  onNavigationBarButtonTap(e) {
-    if (!this.editFlag) {
-      this.setStyle("完成");
-    } else {
-      this.setStyle("编辑");
-    }
-    this.editFlag = !this.editFlag;
-  },
 	};
 </script>
 
 <style lang="scss" scoped>
+	.lose-goods{
+		color: $main-color;
+		padding-left: 50rpx !important;
+	}
 	.myTracks {
 		width: 100%;
 		padding-top: 2rpx;
@@ -264,6 +210,7 @@ export default {
 	.myTracks-item-img {
 		margin-right: 20rpx;
 		border-radius: 8rpx;
+
 		image {
 			width: 130rpx;
 			height: 130rpx;
@@ -287,25 +234,10 @@ export default {
 		padding: 10rpx 0 0 0;
 	}
 
-.myTracks-action-btn {
-  width: 130rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-}
 
 	.myTracks-divider {
 		width: 100%;
 		height: 20rpx;
 	}
 
-.myTracks-action-placeholder {
-  height: 110rpx;
-}
-
-.myTracks-action-check {
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
 </style>

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>

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: {

pages/mine/set/feedBack.vue

@@ -2,7 +2,7 @@
   <div class="feedBack">
     <div class="feedBack-box">
       <h4>猜你想问</h4>
-      <div class="feedBack-item" @click="handleClick(index)" v-for="(item,index) in list" :key="index">
+      <div class="feedBack-item" :class="{'active':feedBack.type == item.value }" @click="handleClick(index)" v-for="(item,index) in list" :key="index">
         {{item.text}}
       </div>
     </div>
@@ -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>
@@ -130,6 +130,10 @@ export default {
   margin: 0 auto;
   border-radius: 100px;
 }
+.active{
+  color: $light-color !important;
+  font-weight: bold;
+}
 .feedBack {
   padding-bottom: 100rpx;
 }

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, //高亮颜色
@@ -45,7 +46,7 @@ export default {
         face: storage.getUserInfo().face || "/static/missing-face.png", //默认头像
         regionId: [], //地址Id
         region: storage.getUserInfo().region || [], //地址
-        sex: storage.getUserInfo().sex || 1, //性别
+        sex: storage.getUserInfo().sex, //性别
         ___path: storage.getUserInfo().region,
       },
       birthday: storage.getUserInfo().birthday || "", //生日
@@ -65,10 +66,17 @@ export default {
     };
   },
   methods: {
+	  /**
+	   * 退出登录
+	   */
+	  quiteLoginOut() {
+      this.$options.filters.quiteLoginOut();
+	  },
+	  
     /**
      * 选择地址回调
      */
-    getpickerParentValue(e) {
+    getPickerParentValue(e) {
       this.form.region = [];
       this.form.regionId = [];
       let name = "";

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,12 +39,19 @@
 				</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 {
+		md5
+	} from "@/utils/md5.js"; // md5
 	import myVerification from "@/components/verification/verification.vue"; //验证
 	import uuid from "@/utils/uuid.modified.js";
 	export default {
@@ -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,41 +220,55 @@ 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 {
 		/deep/ .u-form-item--right__content__slot {
 			display: flex;
 		}
 	}
+
+	.h2 {
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+
 	page {
 		background: #fff;
 	}
+
 	.box {
 		padding: 80rpx 0;
 		border-radius: 20rpx;
 	}
+
 	.submit {
 		background: $light-color;
 	}
+
 	.box-tips {
 		margin: 0 72rpx;
 	}
+
 	.verification {
 		font-size: 24rpx;
 		color: #999;

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,

pages/mine/set/setUp.vue

@@ -1,9 +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>
+      <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>
@@ -15,26 +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 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",
@@ -50,24 +49,14 @@ export default {
         url: url,
       });
     },
-
      /**
-     * 确认退出
-     * 清除缓存重新登录
+	   * 退出登录
 	   */
-    confirm() {
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-     this.$options.filters.navigateToLogin("redirectTo");
+	  quiteLoginOut() {
+      this.$options.filters.quiteLoginOut();
 	  },
   
-    /**
-     * 显示退出登录对话框
-     */
-    showModalDialog() {
-      this.quitShow = true;
-    },
+
 
     /**
      * 读取当前缓存
@@ -99,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();
       }
     },
 

pages/navigation/search/search.scss

@@ -22,26 +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;
-    }
-  }
-}
-
-/deep/ .u-row {
-  // #ifdef MP-WEIXIN
-  padding: 0 5%;
-  // #endif
-}
-
 .status_bar {
   height: var(--status-bar-height);
   background: #fff !important;
@@ -62,6 +42,7 @@ page {
     padding: 30rpx;
     > .sort-item {
       > .sort-title {
+        margin: 20rpx 0;
         font-size: 26rpx;
         font-weight: bold;
       }
@@ -121,7 +102,7 @@ page {
   font-size: 24rpx;
 }
 .flex {
-  margin: 30rpx 0;
+ 
   flex-wrap: wrap;
   align-items: center;
   > .sort-brand-item {
@@ -138,47 +119,36 @@ page {
   height: 100vh;
   overflow: hidden;
 }
-.storeSellerBox {
-  // #ifndef MP-WEIXIN
-  padding: 16rpx !important;
-
-  // #endif
-}
-.goodsClass {
-  padding: 0 20rpx;
-
-  /deep/ .u-row {
-  }
-}
 
 .index-nav-arrow:last-child {
   margin-top: -22rpx;
 }
-
+.line1-store-name{
+  font-size: 24rpx;
+  color: #999;
+}
+.to-store{
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 10rpx;
+}
 .img {
   width: 26rpx;
   height: 26rpx;
 }
-.goodsRow {
-  /deep/ .u-row {
-    // #ifdef MP-WEIXIN
-    padding: 0%;
+.goods-row {
   background: #fff;
-    // padding:  16rpx;
-    border-radius: 0.4em;
-    margin: 0 !important;
+  padding: 16rpx; 
 
-    // #endif
+  >.goods-col{
+    display: flex;
+    >.goods-img{
+      flex: 4;
+    }
+    >.goods-detail{
+      flex: 7;
+    }
   }
-
-  background: #fff;
-  border-radius: 0.4em;
-  margin: 20rpx 0;
-  // #ifdef MP-WEIXIN
-  margin: 10rpx 0;
-  // #endif
-  padding: 0 16rpx;
-  width: 100%;
 }
 
 .add1 {
@@ -192,21 +162,14 @@ page {
   border-bottom: 1px solid #eeeeee;
 }
 
-.logimg {
-  width: 40rpx;
-  height: 40rpx;
-  vertical-align: middle;
-}
 
 .clamp3 {
-  padding-top: 30rpx;
   margin-bottom: 10rpx;
   font-size: 28rpx;
   color: #333333;
-
   font-weight: 400;
   display: -webkit-box;
-  line-height: 40rpx;
+  height: 80rpx;
   -webkit-box-orient: vertical;
 
   -webkit-line-clamp: 2 !important;
@@ -217,25 +180,12 @@ page {
   }
 }
 
-.switchType1 {
-  width: 50%;
-  overflow: hidden;
-  text-align: center;
 
-  > .img {
-    width: 182rpx;
-    height: 200rpx;
-  }
-}
-.imgGoods {
-  width: 182rpx;
-  height: 200rpx;
-}
 view {
   display: block;
 }
 
-.storeSellerName {
+.store-seller-name {
   color: #666;
   overflow: hidden;
 
@@ -248,7 +198,7 @@ view {
   }
 }
 
-.countConfig {
+.count-config {
   padding: 10rpx 0;
   color: #666;
   display: flex;
@@ -474,181 +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;
-  }
-
-  .countConfig,
-  .storeSellerName {
-    font-size: $font-sm;
-  }
-
-  .textHidden {
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    white-space: nowrap;
-  }
-}
-
 .status_bar {
   height: var(--status-bar-height);
   width: 100%;

pages/navigation/search/searchPage.vue

@@ -1,40 +1,42 @@
 <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)">
+						<div class="oldKeyItem" v-if="keyword" v-for="(keyword, index) in oldKeywordList" :key="index" @click="doSearch(keyword)">
 							<span>{{ keyword }}</span>
 						</div>
+
 						<div @click="showMore" v-if="oldKeywordIndex > loadIndex" class="oldKeyItem">展示更多</div>
 					</div>
 				</view>
@@ -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,120 +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="goodsClass">
-            <u-row v-for="(item, index) in goodsList" :key="index" class="goodsRow">
-              <u-col :span="4" @click.native="navigateToDetailPage(item)" class="switchType1">
-                <u-image width="182rpx" height="200rpx" class="imgGoods" :src="item.content.thumbnail">
-                  <u-loading slot="loading"></u-loading>
-                </u-image>
-              </u-col>
-              <u-col :span="8" @click.native="navigateToDetailPage(item)" class="switchType2">
-                <div class="title clamp3" style="">{{ item.content.goodsName }}</div>
-                <view class="price-box">
-                  <div class="price" v-if="item.content.price!=undefined">
-                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
-                      formatPrice(item.content.price )[1]
-                    }}
-                  </div>
-                </view>
-                <div class="promotion">
-                  <div 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" class="countConfig">
-                  <span style="float: left; font-size: 22rpx">已售 {{ item.buyCount || '0' }}</span>
-                  <span style="float: right; font-size: 22rpx">{{ item.commentNum || '0' }}条评论</span>
-                </div>
-              </u-col>
-              <u-col :span="12" class="storeSellerBox">
-                <div class="storeSellerName" @click="clickTostore()">
-                  <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
-                      type="error" />
-
-                    <span style="
-                        color: #333333;
-                        font-size: 28rpx;
-                        padding-left: 17rpx;
-                      ">{{ item.storeName }}</span>
-                  </div>
-                  <span>
-                    <u-icon name="arrow-right" color="#c5c5c5"></u-icon>
-                  </span>
-                </div>
-              </u-col>
-            </u-row>
-          </div>
+				<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"
-              @click="navigateToDetailPage(item)">
-              <view class="image-wrapper">
-                <image :src="item.content.thumbnail" mode="aspectFill"></image>
-              </view>
-              <view class="goods-detail">
-                <div class="title clamp">{{ item.content.goodsName }}</div>
-                <view class="price-box">
-                  <div class="price" v-if="item.content.price!=undefined">
-
-                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
-                      formatPrice(item.content.price )[1]
-                    }}
-                  </div>
-                </view>
-
-                <div class="promotion">
-                  <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
-
-                    <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
-                    <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
-                    <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
-                  </div>
-                </div>
-                <div class="countConfig">
-                  <span>已售 {{ item.buyCount || "0" }}</span>
-                  <span>{{ item.commentNum || "0" }}条评论</span>
-                </div>
-                <div class="storeSellerName">
-                  <div class="textHidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
-                      type="error" />
-                    <span>{{ item.storeName || "暂无" }}</span>
-                  </div>
-                  <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>
@@ -206,11 +116,13 @@
 					<view class="sort-item">
 						<view class="sort-title">品牌</view>
 						<view class="flex" v-if="sortData.brands">
-              <view class="sort-brand-item" :key="brandsIndex" v-for="(brand, brandsIndex) in sortData.brands"
-                @click="handleSort(brand, brandsIndex, 'brand')">
-                <view class="sort-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>
@@ -220,12 +132,18 @@
 					<view class="sort-item">
 						<view class="sort-title">全部分类</view>
 						<view class="flex" style="flex-wrap: wrap;" v-if="sortData.categories">
-              <view class="sort-brand-item" :key="categoriesIndex"
+							<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>
@@ -238,15 +156,11 @@
 						<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>
@@ -256,11 +170,13 @@
 					<view class="sort-item" :key="paramIndex" v-for="(param, paramIndex) in sortData.paramOptions">
 						<view class="sort-title">{{ param.key }}</view>
 						<view class="flex" style="flex-warp:warp" v-if="param.values">
-              <view class="sort-brand-item" :key="i" v-for="(value, i) in param.values"
-                @click="handleSort(value, i, 'prop', param)">
-                <view class="sort-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>
@@ -275,63 +191,72 @@
 				</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: {
 				pageNumber: 1,
 				pageSize: 10,
 				// sort: 'grade_asc',
-        sort: "releaseTime",
-        order: "desc",
-        keyword: "",
+
+				keyword: ''
 			},
-      minPrice: "",
-      maxPrice: "",
+			minPrice: '',
+			maxPrice: '',
 			sortParams: {
 				pageNumber: 1,
 				pageSize: 10,
@@ -339,15 +264,20 @@ 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;
+	},
 	onLoad(val) {
 		this.init();
-    this.initSortGoods();
+		//  this.initSortGoods();
 		// 接收分类的数据
 
 		this.routerVal = val;
@@ -355,7 +285,11 @@ export default {
 		// 有值
 		if (this.routerVal.category) {
 			this.params.categoryId = this.routerVal.category;
+			this.sortParams.categoryId = this.routerVal.category;
 			this.isShowSeachGoods = true;
+			this.$nextTick(() => {
+				this.$refs.mSearch.isShowSeachGoods = true;
+			});
 		}
 		if (this.routerVal.keyword) {
 			this.params.keyword = this.routerVal.keyword;
@@ -365,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: {
 		/**
@@ -380,9 +323,14 @@ export default {
 					this.defaultKeyword = val;
 				}
 			} else {
-        this.defaultKeyword = "请输入搜索商品";
+				this.defaultKeyword = '请输入搜索商品';
 			}
 		},
+		sortPopup(val) {
+			if (val) {
+				this.selectedWay = { brand: [], categoryId: [], prop: [] };
+			}
+		}
 	},
 
 	onReachBottom() {
@@ -400,31 +348,27 @@ export default {
 			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: {
@@ -432,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);
@@ -458,25 +393,37 @@ export default {
 		// 点击确定进行筛选
 		sortConfim() {
 			// 处理品牌（多选
+			if (!this.params.brandId) {
 				this.params.brandId = [];
-      this.selectedWay["brand"].forEach((item) => {
+			} else {
+				this.params.brandId = [this.params.brandId];
+			}
+
+			// 如果选中品牌 赋值
+			this.selectedWay['brand'].forEach(item => {
 				if (item.__selected) {
 					this.params.brandId.push(item.value);
 				}
 			});
-      this.params.brandId = this.params.brandId.join("@");
+
+			this.params.brandId = this.params.brandId.join('@') || '';
+
 			// 处理分类 (单选)
-      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 = [];
-      this.selectedWay["prop"].forEach((item) => {
+			} else {
+				this.params.prop = [this.params.prop];
+			}
+
+			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}`;
@@ -485,30 +432,42 @@ export default {
 			}
 
 			this.goodsList = [];
+
+			this.params.pageNumber = 1;
+			this.sortParams = this.params;
+
 			this.loadData();
 			this.sortPopup = false;
 		},
 
 		// 重置
 		repick() {
+			this.sortParams = {
+				pageNumber: 1,
+				pageSize: 10,
+				categoryId: this.routerVal.category || ''
+			};
+			this.sortPopup = false;
 			this.initSortGoods();
-      this.minPrice = "";
-      this.maxPrice = "";
+			this.minPrice = '';
+			this.maxPrice = '';
 			this.params = {
 				pageNumber: 1,
 				pageSize: 10,
+				categoryId: this.routerVal.category || ''
 			};
+			this.goodsList = [];
 			this.loadData();
 		},
 
 		// 点击筛选的内容
 		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;
@@ -528,12 +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.storeId}`
 			});
 		},
 		loadmore() {
@@ -541,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
 								}));
 							}
 						});
@@ -571,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: '正在加载'
 			});
 		},
 		//加载默认搜索关键字
@@ -607,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]);
 					}
-        },
+				}
 			});
 		},
 
@@ -632,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);
 				});
 			}
@@ -660,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() };
 		},
 
 		//高亮关键字
@@ -682,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);
 			}
@@ -702,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'
 						});
 					}
-        },
+				}
 			});
 		},
 
@@ -718,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);
 		},
 
 		/**
@@ -733,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) {
@@ -764,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>

pages/order/afterSales/afterSales.vue

@@ -1,13 +1,31 @@
 <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">
@@ -17,13 +35,20 @@
         </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(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>
@@ -36,74 +61,147 @@
               <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 === '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 === '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="after-line">
+          <view class="btn-view u-flex u-row-right">
             <!-- 售后申请  -->
-              <view v-if="
-                  current === 0 && order.groupAfterSaleStatus=='NOT_APPLIED'
-                " @click="applyService(sku.sn, order, sku)" class="rebuy-btn">
-                申请售后
-              </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="rebuy-btn" 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="afterDetails(order, sku)" v-if="current === 1 || current === 2" class="rebuy-btn">
+              <view
+                @click="close(order, sku)"
+                v-if="current === 1"
+                class="default-btn close"
+              >
+                取消售后
+              </view>
+              <view
+                @click="afterDetails(order, sku)"
+                v-if="current === 1 || current === 2"
+                class="default-btn border"
+              >
                 售后详情
               </view>
             </view>
           </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 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>
 
 <script>
 import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
-import { getAfterSaleList } from "@/api/after-sale.js";
+import { getAfterSaleList, cancelAfterSale } from "@/api/after-sale.js";
 import { getOrderList } from "@/api/order.js";
+import storage from "@/utils/storage";
 
 export default {
   components: {
@@ -125,11 +223,14 @@ export default {
       ],
       current: 0, //当前表头索引
       tipsShow: false, //提示开关
+      cancelShow: false, //取消显示开关
+      selectedOrder: "", //选中的order
       orderList: [], //订单集合
       params: {
         pageNumber: 1,
         pageSize: 10,
         sort: "createTime",
+        flowPrice: 0,
         order: "desc",
       },
 
@@ -138,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页时，初始化数据
@@ -165,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,
@@ -177,28 +294,28 @@ 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();
-        const orderlist = res.data.result.records;
-        if (orderlist.length > 0) {
-          this.orderList = this.orderList.concat(orderlist);
+         if (this.$store.state.isShowToast){ uni.hideLoading() };
+        const orderList = res.data.result.records;
+        if (orderList.length > 0) {
+          this.orderList = this.orderList.concat(orderList);
           this.params.pageNumber += 1;
         }
-        if (orderlist.length < 10) {
+        if (orderList.length < 10) {
           this.status = "nomore";
         } else {
           this.status = "loading";
@@ -206,6 +323,31 @@ export default {
       });
     },
 
+    close(order, sku) {
+      console.log(order, sku);
+      this.selectedOrder = order;
+      this.cancelShow = true;
+    },
+
+    async closeService() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      console.log(this.selectedOrder);
+      let res = await cancelAfterSale(this.selectedOrder.sn);
+      if (res.data.success) {
+        uni.showToast({
+          title: "取消成功!",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+      this.orderList = [];
+      this.searchOrderList(this.current);
+
+       if (this.$store.state.isShowToast){ uni.hideLoading() };
+    },
+
     /**
      * 售后详情
      */
@@ -252,11 +394,9 @@ export default {
         ...order,
         ...sku,
       };
-
+      storage.setAfterSaleData(data);
       uni.navigateTo({
-        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent(
-          JSON.stringify(data)
-        )}`,
+        url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`,
       });
     },
 
@@ -265,21 +405,33 @@ export default {
      */
     onExpress(order, sku) {
       sku.storeName = order.storeName;
+      let data = {
+        ...order,
+        ...sku,
+      };
 
+      storage.setAfterSaleData(data);
       uni.navigateTo({
-        url: `./afterSalesDetailExpress?serviceSn=${
-          order.sn
-        }&sku=${encodeURIComponent(JSON.stringify(sku))}`,
+        url: `./afterSalesDetailExpress?serviceSn=${order.sn}`,
       });
     },
 
     /**
      * 查看详情
      */
-    onDetail(sku) {
-      if (!this.$u.test.isEmpty(sku.skuId)) {
+    onDetail(goods, sku) {
+      // 售后申请
+      if (this.current == 0) {
         uni.navigateTo({
-          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
+          url: `/pages/product/goods?id=${sku.skuId}&goodsId=${
+            sku.goodsId || sku.goodsId
+          }`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/product/goods?id=${goods.skuId}&goodsId=${
+            goods.goodsId || goods.goodsId
+          }`,
         });
       }
     },
@@ -306,35 +458,43 @@ page,
   background: $page-color-base;
   height: 100%;
 }
+
 .body-view {
   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;
@@ -378,6 +538,7 @@ page,
       color: $main-color;
     }
   }
+
   .btn-view {
     padding: 16rpx 0;
 
@@ -387,10 +548,12 @@ page,
     }
   }
 }
+
 .description {
   color: #909399;
   size: 25rpx;
 }
+
 .cannot_apply {
   text-align: center;
   font-size: 22rpx;
@@ -399,31 +562,37 @@ page,
   height: 70rpx;
   line-height: 70rpx;
 }
+.not_center {
+  text-align: left;
+}
+
 .icon {
   margin-right: 10rpx;
 }
-.cancel-btn {
-  color: #999999;
-  border-color: #999999;
-  margin-left: 15rpx;
-  height: 60rpx;
+
+.sale {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
 }
-.pay-btn {
-  background-color: #1abc9c;
-  color: #ffffff;
-  margin-left: 15rpx;
-  height: 60rpx;
-}
-.rebuy-btn {
+
+.default-btn {
   background-color: #ffffff;
   margin-left: 15rpx;
   height: 60rpx;
   line-height: 60rpx;
   text-align: center;
   font-size: 24rpx;
-  border: 2rpx solid $light-color;
-  color: $light-color;
   padding: 0 24rpx;
   border-radius: 200px;
 }
+
+.close {
+  color: $light-color;
+}
+
+.border {
+  border: 2rpx solid $light-color;
+  color: $light-color;
+}
 </style>

pages/order/afterSales/afterSalesDetail.vue

@@ -10,7 +10,8 @@
           </view>
         </view>
         <view>
-          <view class="goods-item-view" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn" @click="gotoGoodsDetail(sku.goods_id)">
+          <view class="goods-item-view" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn"
+            @click="gotoGoodsDetail(sku.goods_id)">
             <view class="goods-img">
               <u-image border-radius="6" width="131rpx" height="131rpx" :src="item.image"></u-image>
             </view>
@@ -27,7 +28,8 @@
         <view class="after-num">
           <view>申请数量</view>
           <view>
-            <u-number-box :value="parseInt(form.num)" disabled-input :min="1" :max="parseInt(sku.num)" bg-color="#fff" @change="valChange"></u-number-box>
+            <u-number-box :value="parseInt(form.num)" disabled-input :min="1" :max="parseInt(sku.num)" bg-color="#fff"
+              @change="valChange"></u-number-box>
           </view>
         </view>
       </view>
@@ -36,7 +38,8 @@
         <!-- 退款原因 -->
         <view class="opt-view">
           <u-form-item label="申请原因" :label-width="150">
-            <u-input v-model="form.reason" type="select" input-align="right" :select-open="reasonSelectShow" @click="reasonSelectShow = true" placeholder="请选择申请原因" />
+            <u-input v-model="form.reason" type="select" input-align="right" :select-open="reasonSelectShow"
+              @click="reasonSelectShow = true" placeholder="请选择申请原因" />
           </u-form-item>
           <u-form-item label="申请说明" :label-width="150">
             <u-input input-align="right" type="textarea" v-model="form.problemDesc" placeholder="请描述申请售后的说明" />
@@ -47,7 +50,8 @@
         <view class="opt-view">
           <view class="img-title">上传凭证（最多5张）</view>
           <view class="images-view">
-            <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+            <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150"
+              @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
           </view>
         </view>
 
@@ -81,11 +85,14 @@
     </u-form>
 
     <view class="submit-view">
-      <u-button type="primary" ripple shape="circle" v-if="applyInfo.refundWay" :custom-style="customStyle" @click="onSubmit">提交申请</u-button>
+      <u-button type="primary" ripple shape="circle" v-if="applyInfo.refundWay" :custom-style="customStyle"
+        @click="onSubmit">提交申请</u-button>
     </view>
-    <u-select mode="single-column" :list="reasonList" v-model="reasonSelectShow" @confirm="reasonSelectConfirm"></u-select>
+    <u-select mode="single-column" :list="reasonList" v-model="reasonSelectShow" @confirm="reasonSelectConfirm">
+    </u-select>
     <u-select mode="single-column" :list="typeList" v-model="typeSelectShow" @confirm="typeSelectConfirm"></u-select>
-    <u-select mode="single-column" :list="returnList" v-model="returnSelectShow" @confirm="returnSelectConfirm"></u-select>
+    <u-select mode="single-column" :list="returnList" v-model="returnSelectShow" @confirm="returnSelectConfirm">
+    </u-select>
     <u-toast ref="uToast" />
   </view>
 </template>
@@ -188,9 +195,7 @@ export default {
       title: navTitle, //此处写页面的title
     });
     this.sn = options.sn;
-    let dsku = decodeURIComponent(options.sku);
-    let newSku = JSON.parse(dsku);
-    this.sku = newSku;
+    this.sku = storage.getAfterSaleData();;
 
     this.form.orderItemSn = options.sn;
     this.form.skuId = this.sku.skuId;
@@ -219,7 +224,7 @@ export default {
           this.reasonList = action;
         }
       });
-      uni.hideLoading();
+       if (this.$store.state.isShowToast){ uni.hideLoading() };
     },
     //打开地区选择器
     showCitySelect() {
@@ -283,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({
@@ -305,6 +310,7 @@ export default {
         return false;
       }
 
+      console.log(this.form.accountType)
       if (this.form.accountType == "BANK_TRANSFER") {
         // 银行开户行校验
         if (this.$u.test.isEmpty(this.form.bankDepositName)) {
@@ -329,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: "银行开户名输入错误",
@@ -462,7 +462,6 @@ page,
     align-items: center;
   }
   .images-view {
-    
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -484,12 +483,11 @@ page,
   background-color: #ffffff;
   height: 100rpx;
   width: 750rpx;
+  justify-content: flex-end;
+
   display: flex;
   align-items: center;
   width: 100%;
-  /deep/ .u-btn{
-    width: 94% !important;
-
-  }
+  padding-right: 32rpx;
 }
 </style>

pages/order/afterSales/afterSalesDetailExpress.vue

@@ -57,6 +57,7 @@
 <script>
 import { getLogistics } from "@/api/address.js";
 import { fillShipInfo } from "@/api/after-sale.js";
+import storage from "@/utils/storage";
 
 export default {
   data() {
@@ -76,7 +77,8 @@ export default {
     };
   },
   onLoad(options) {
-    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    
+    this.sku = storage.getAfterSaleData();
     let navTitle = "服务单详情";
     uni.setNavigationBarTitle({
       title: navTitle, //此处写页面的title
@@ -126,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: "提交成功",

pages/order/afterSales/afterSalesSelect.vue

@@ -34,7 +34,7 @@
           <view class="select-title">退货</view>
           <view class="select-sub-title">
             退回收到的商品
-            <uni-icons color="#BABABA" type="arrowright"></uni-icons>
+            <u-icon name="arrow-right"  color="#bababa"></u-icon>
           </view>
         </view>
       </view>
@@ -46,7 +46,7 @@
           <view class="select-title">退款</view>
           <view class="select-sub-title">
             退款商品返还金额
-            <uni-icons color="#BABABA" type="arrowright"></uni-icons>
+            <u-icon name="arrow-right"  color="#bababa"></u-icon>
           </view>
         </view>
       </view>
@@ -55,13 +55,9 @@
 </template>
 
 <script>
-import UniIcons from "@/components/uni-icons/uni-icons.vue";
-
 import { getAfterSaleInfo } from "@/api/after-sale";
+import storage from "@/utils/storage";
 export default {
-  components: {
-    UniIcons,
-  },
   data() {
     return {
       sn: "",
@@ -71,10 +67,7 @@ export default {
   },
   onLoad(options) {
     this.sn = options.sn;
-    let dData = decodeURIComponent(options.sku);
-    let newData = JSON.parse(dData);
-    this.sku = newData;
-
+    this.sku = storage.getAfterSaleData();
     // 查看当前商品是否支持退款退货
     this.init()
   },
@@ -93,9 +86,7 @@ export default {
      */
     onSelect(value) {
       uni.redirectTo({
-        url: `./afterSalesDetail?sn=${this.sn}&sku=${encodeURIComponent(
-          JSON.stringify(this.sku)
-        )}&value=${value}`,
+        url: `./afterSalesDetail?sn=${this.sn}&value=${value}`,
       });
     },
 

pages/order/afterSales/applyDetail.vue

@@ -28,7 +28,7 @@
               logs[0].message
             }}</view>
           </view>
-          <uni-icons type="arrowright" style="margin-right: 5px"></uni-icons>
+         <u-icon name="arrow-right" style="margin-right: 5px" size="30" color="#999"></u-icon>
         </view>
       </view>
       <view class="goods-info">
@@ -90,11 +90,14 @@
           serviceDetail.afterSaleImage &&
           serviceDetail.afterSaleImage.split(',').length != 0
         ">
-        <image :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)" v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index"
-          style="width: 50px; height: 50px; margin: 0px 5px"></image>
+        <view v-for="(img, index) in serviceDetail.afterSaleImage.split(',')" :key="index">
+          <u-image width="100" height="100" :src="img" @click="preview(serviceDetail.afterSaleImage.split(','), index)"
+            ></u-image>
+        </view>
       </view>
       <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY' && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY' && serviceDetail.serviceStatus != 'APPLY'">
         <view class="title">收货地址:</view>
         <view class="value">
           <span v-if="storeAfterSaleAddress.salesConsigneeAddressPath">{{
@@ -103,12 +106,14 @@
         </view>
       </view>
       <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
         <view class="title">联系人:</view>
         <view class="value">{{ storeAfterSaleAddress.salesConsigneeName }}</view>
       </view>
       <!-- 如果服务类型为退款则不显示 -->
-      <view class="detail-item" v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
+      <view class="detail-item"
+        v-if="serviceDetail.serviceType != 'RETURN_MONEY'  && serviceDetail.serviceStatus != 'APPLY'">
         <view class="title">联系方式:</view>
         <view class="value">{{
           storeAfterSaleAddress.salesConsigneeMobile || "" | secrecyMobile
@@ -193,16 +198,11 @@
 <script>
 import {
   getServiceDetail,
-  getstoreAfterSaleAddress,
+  getStoreAfterSaleAddress,
   getAfterSaleLog,
   getAfterSaleReason,
 } from "@/api/after-sale.js";
-import UniIcons from "@/components/uni-icons/uni-icons.vue";
-
 export default {
-  components: {
-    UniIcons,
-  },
   data() {
     return {
       reason: "", //申请原因
@@ -316,7 +316,7 @@ export default {
      * 获取地址信息
      */
     getAddress() {
-      getstoreAfterSaleAddress(this.sn).then((res) => {
+      getStoreAfterSaleAddress(this.sn).then((res) => {
         if (res.data.success) {
           this.storeAfterSaleAddress = res.data.result;
         }
@@ -339,9 +339,7 @@ export default {
       getAfterSaleReason(serviceType).then((res) => {
         if (res.data.success) {
           // 1357583466371219456
-          this.reason = res.data.result.filter((item) => {
-            return item.id == this.serviceDetail.reason;
-          })[0].reason;
+          this.reason = this.serviceDetail.reason;
         }
       });
     },
@@ -354,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" ||
@@ -367,12 +365,13 @@ export default {
           (this.serviceDetail.serviceType === "RETURN_GOODS" ||
             this.serviceDetail.serviceType === "ORDER_CANCEL") &&
           this.serviceDetail.refundWay === "OFFLINE";
+
         this.bankShow =
-          this.serviceDetail.serviceType === "RETURN_MONEY" ||
-          ((this.serviceDetail.serviceType === "RETURN_GOODS" ||
-            this.serviceDetail.serviceType === "ORDER_CANCEL") &&
+          this.serviceDetail.accountType === "BANK_TRANSFER" &&
           this.serviceDetail.refundWay === "OFFLINE" &&
-            this.serviceDetail.accountType === "BANK_TRANSFER");
+          ((this.serviceDetail.serviceType === "RETURN_GOODS") |
+            (this.serviceDetail.serviceType === "ORDER_CANCEL") ||
+            this.serviceDetail.serviceType === "RETURN_MONEY");
 
         this.getReasonList(this.serviceDetail.serviceType);
       });

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="" :show-progress="false" :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() };
       });
     },
 

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() };
       });
     },
   },

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() };
       });
     },
   },

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

pages/order/evaluate/myEvaluate.vue

@@ -2,7 +2,8 @@
   <view>
     <view class="wrap">
       <view class="u-tabs-box">
-        <u-tabs :list="list" :is-scroll="false" inactive-color="#333" :current="current" class="utabs" :active-color="$lightColor" @change="changeTab"></u-tabs>
+        <u-tabs :list="list" :is-scroll="false" inactive-color="#333" :current="current" class="utabs"
+          :active-color="$lightColor" @change="changeTab"></u-tabs>
       </view>
       <swiper class="swiper-box" :current="current" @change="changeSwiper" duration="500">
         <swiper-item v-for="(item, listIndex) in list" :key="listIndex">
@@ -18,14 +19,15 @@
               <view v-for="(sku, _index) in order.orderItems" :key="_index">
                 <view class="goods-item-view">
                   <view>
-                    <u-image border-radius="6rpx" width="132rpx" height="132rpx" class="goods_img" :src="sku.image" alt />
+                    <u-image border-radius="6rpx" width="132rpx" height="132rpx" class="goods_img" :src="sku.image"
+                      alt />
                   </view>
                   <view class="goods-info">
                     <view class="goods-title u-line-2">{{ sku.name }}</view>
                     <view class="text title">{{ gradeList[order.grade] || '' }}</view>
                   </view>
                 </view>
-                <view class="btn-view u-row-between" v-if="current != 0">
+                <view class="btn-view u-row-between" v-if="current == 2">
                   <view class="description">
                     <view class="text title">
                       <u-read-more ref="uReadMore" :color="$lightColor" text-indent="0">
@@ -34,7 +36,8 @@
                     </view>
 
                     <view class="goods-imgs-view" v-if="order.image">
-                      <view class="img-view" v-if="order.image" v-for="(img, imgIndex) in order.image.split(',')" :key="imgIndex">
+                      <view class="img-view" v-if="order.image" v-for="(img, imgIndex) in order.image.split(',')"
+                        :key="imgIndex">
                         <u-image v-if="order.image" @click.native="
                             preview(order.image.split(','), imgIndex)
                           " width="160rpx" height="160rpx" :src="img"></u-image>
@@ -42,18 +45,22 @@
                     </view>
                   </view>
                 </view>
-                <view class="again-btn" @click="onDetail(order)" v-if="current == 1">
+                <view class="again-btn" @click="onDetail(order)" v-if="current == 2">
                   <u-tag text="评价详情" shape="circle" mode="plain" type="error" />
                 </view>
-                <view v-if="current == 0 && sku.commentStatus == 'UNFINISHED'">
+                <view v-if="current == 1 && sku.commentStatus == 'UNFINISHED'">
                   <view class="evaluate">
-                    <view @click="talkCommont(order)">
+                    <view @click="talkCommont(sku)">
                       <u-tag text="发表评价" shape="circle" mode="plain" type="error" />
                     </view>
                   </view>
                 </view>
+                <view class="tips" v-if="sku.commentStatus">
+                  {{groupCommentStatusWay[sku.commentStatus]}}
                 </view>
               </view>
+
+            </view>
             <uni-load-more :status="params.loadStatus"></uni-load-more>
           </scroll-view>
         </swiper-item>
@@ -69,7 +76,12 @@ import { getComments } from "@/api/members.js";
 export default {
   data() {
     return {
-      list: [ //顶部tab
+      list: [
+        //顶部tab
+
+        {
+          name: "全部订单",
+        },
         {
           name: "待评价",
         },
@@ -77,12 +89,19 @@ export default {
           name: "已评价",
         },
       ],
-      gradeList: {  //评论表
+      gradeList: {
+        //评论表
         GOOD: "好评",
         MODERATE: "中评",
         WORSE: "差评",
         haveImage: "有图",
       },
+      groupCommentStatusWay: {
+        NEW: "新订单，不能进行评论",
+        UNFINISHED: "未完成评论",
+        WAIT_CHASE: "待追评的评论信息",
+        FINISHED: "已经完成评论",
+      },
       current: 0, //当前tabIndex
       orderList: [], //商品集合
       params: {
@@ -108,12 +127,18 @@ export default {
       this.params.loadStatus = "more";
       this.orderList = [];
       //重新读取数据
+
       if (val == 0) {
+        delete  this.params.commentStatus 
         this.loadData();
-      }
-      if (val == 1) {
+      } else if (val == 1) {
+        this.params.commentStatus = "UNFINISHED";
         this.orderList = [];
-        this.loadComments();
+        this.loadData();
+      } else {
+        this.params.commentStatus = "FINISHED";
+        this.orderList = [];
+        return this.loadComments();
       }
     },
   },
@@ -123,7 +148,7 @@ export default {
      * 判断当前店铺是否有可评价的商品
      */
     commentStatus(val) {
-      if (this.current == 1) {
+      if (this.current == 2) {
         return true;
       } else {
         let show;
@@ -177,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";
@@ -192,10 +217,11 @@ export default {
     /**
      * 发表评价
      */
-    talkCommont(order) {
+    talkCommont(sku) {
+      console.log(sku);
       uni.navigateTo({
-        url: `./releaseEvaluate?sn=${order.sn}&order=${encodeURIComponent(
-          JSON.stringify(order)
+        url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent(
+          JSON.stringify(sku)
         )}`,
       });
     },
@@ -208,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";
@@ -235,11 +261,7 @@ export default {
       if (this.params.loadStatus == "noMore") return;
       if (index == 0) {
         this.loadData();
-      }
-      if (index == 1) {
-        this.params.audit_status = "PASS_AUDIT";
-        this.params.comments_type = "INITIAL";
-        this.params.comment_status = "WAIT_CHASE";
+      } else {
         this.loadComments();
       }
     },
@@ -261,6 +283,11 @@ export default {
 page {
   height: 100%;
 }
+.tips {
+  text-align: right;
+  font-size: 24rpx;
+  color: #999;
+}
 .wrap {
   background: #f6f6f6;
   height: calc(100vh - var(--window-top));

pages/order/evaluate/releaseEvaluate.vue

@@ -1,7 +1,7 @@
 <template>
   <view>
     <!-- 遍历出评价商品 -->
-    <view v-for="(sku, index) in order.orderItems" :key="index">
+    <view>
       <view class="after-sales-goods-detail-view">
         <view>
           <view class="goods-item-view">
@@ -23,23 +23,27 @@
           <view class="sub-title">满意请打好评哦</view>
         </view>
         <view class="rate-view">
-          <view class="rate-btn" @click="onGrade('GOOD', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }" class="alifont icon-haoping1"></view>
+          <view class="rate-btn" @click="onGrade('GOOD')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'GOOD' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>好评</text>
           </view>
-          <view class="rate-btn" @click="onGrade('MODERATE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }" class="alifont icon-zhongping1"></view>
+          <view class="rate-btn" @click="onGrade('MODERATE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'MODERATE' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>中评</text>
           </view>
-          <view class="rate-btn" @click="onGrade('WORSE', index)">
-            <view style="font-size: 42rpx" :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }" class="alifont icon-chaping"></view>
+          <view class="rate-btn" @click="onGrade('WORSE')">
+            <u-icon name="heart-fill" style="font-size: 42rpx"
+              :style="{ color: form.grade === 'WORSE' ? 'red' : '#CCCCCC' }"></u-icon>
             <text>差评</text>
           </view>
         </view>
       </view>
       <view class="info-evaluate-view">
         <view class="input-view">
-          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type" :border="border" :maxlength="maxlength" :placeholder="placeholder" />
+          <u-input v-model="form.content" height="200" placeholder-style="font-size:12px;color:#CCCCCC" :type="type"
+            :border="border" :maxlength="maxlength" :placeholder="placeholder" />
         </view>
         <view class="input-num">
           <text>{{ form.content.length }}/{{ maxlength }}</text>
@@ -47,7 +51,8 @@
       </view>
       <view class="info-evaluate-view">
         <view class="images-view">
-          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150" @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
+          <u-upload :header=" { accessToken: storage.getAccessToken() }" :action="action" width="150"
+            @on-uploaded="onUploaded" :max-count="5" :show-progress="false"></u-upload>
         </view>
       </view>
     </view>
@@ -57,7 +62,8 @@
         <view class="seller-rate-view">
           <view class="rate-title">描述相符</view>
           <view>
-            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40"></u-rate>
+            <u-rate count="count" gutter="20" active-color="#FFC71C" v-model="form.descriptionScore" :size="40">
+            </u-rate>
           </view>
         </view>
         <view class="seller-rate-view">
@@ -94,7 +100,7 @@ export default {
       maxlength: 500, //评价最大字数为500字
       placeholder:
         "宝贝满足您的期待吗？说说它的优点和美中不足的地方吧。您的评价会帮助更多的人",
-      order: {}, //订单信息
+      sku: {}, //订单信息
       form: {
         content: "", //评价详情
         goodsId: "", //商品id
@@ -111,10 +117,9 @@ export default {
   onLoad(options) {
     // 获取上一级传过来的数据进行解析
     this.form.orderItemSn = options.sn;
-    this.order = JSON.parse(decodeURIComponent(options.order));
-    this.form.goodsId = this.order.orderItems[0].goodsId;
-    this.form.orderItemSn = this.order.orderItems[0].sn;
-    this.form.skuId = this.order.orderItems[0].skuId;
+    this.sku = JSON.parse(decodeURIComponent(options.sku));
+    this.form.goodsId = this.sku.goodsId;
+    this.form.skuId = this.sku.skuId;
   },
   methods: {
     /**
@@ -132,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: "发布评价成功",
@@ -141,7 +146,7 @@ export default {
             success: () => {
               setTimeout(() => {
                 uni.navigateBack();
-              }, 2000);
+              }, 500);
             },
           });
         }

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,8 +14,15 @@
               <!-- 省市区 -->
               <div class="flex flex-a-c">
                 <span class="default" v-if="address.isDefault">默认</span>
-                <div class="address-list" v-if="address.consigneeAddressPath.length != 0">
-                  <span class="address-item" v-for="(item,index) in address.consigneeAddressPath" :key="index">
+                <div
+                  class="address-list"
+                  v-if="address.consigneeAddressPath.length != 0"
+                >
+                  <span
+                    class="address-item"
+                    v-for="(item, index) in address.consigneeAddressPath"
+                    :key="index"
+                  >
                     {{ item }}
                   </span>
                 </div>
@@ -33,28 +44,74 @@
       <!-- 背景 -->
       <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">
       <view class="group-title">
         <span v-if="pintuanFlage">你正在开团购买</span>
-        <span v-else>为你加入仅差<span>{{routerVal.parentOrder.toBeGroupedNum }}</span>人的团购买</span>
+        <span v-else
+          >为你加入仅差<span>{{ routerVal.parentOrder.toBeGroupedNum }}</span
+          >人的团购买</span
+        >
       </view>
       <view class="group">
         <view>
-          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx"
-            :src="masterWay.face || '/static/missing-face.png'"></u-image>
+          <u-image
+            borderRadius="50%"
+            shape="square"
+            class="head-img"
+            width="81rpx"
+            height="81rpx"
+            :src="masterWay.face || userImage"
+          ></u-image>
           <view class="btn-one">团长</view>
         </view>
         <view class="line"> </view>
         <view>
           <!-- 如果有最后一名，显示最后一名，没有最后一名，显示等待参团 -->
-          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square"
-            width="81rpx" height="81rpx">
+          <u-image
+            class="head-img"
+            v-if="endWay.face"
+            :src="endWay.face"
+            borderRadius="50%"
+            shape="square"
+            width="81rpx"
+            height="81rpx"
+          >
             <view slot="loading"></view>
           </u-image>
-          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx"
-            :src="endWay.face || '/static/missing-face.png'"></u-image>
+          <u-image
+            class="head-img"
+            borderRadius="50%"
+            shape="square"
+            v-else
+            width="81rpx"
+            height="81rpx"
+            :src="endWay.face || userImage"
+          ></u-image>
 
           <view class="wait">{{ endWay.nickname || "等待参团" }}</view>
         </view>
@@ -62,83 +119,187 @@
     </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="goods-image"
-          @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
-          <u-image borderRadius="10rpx" width="200rpx" height="200rpx" :src="val.goodsSku.thumbnail" alt />
+        <div class="promotionNotice">{{ item.promotionNotice || "" }}</div>
+        <div
+          class="flex goods-item"
+          v-for="(val, i) in item.checkedSkuList"
+          :key="i"
+        >
+          <div
+            class="goods-image"
+            @click="
+              navigateTo(
+                '/pages/product/goods?id=' +
+                  val.goodsSku.id +
+                  '&goodsId=' +
+                  val.goodsSku.goodsId
+              )
+            "
+            :span="3"
+          >
+            <u-image
+              borderRadius="10rpx"
+              width="200rpx"
+              height="200rpx"
+              :src="val.goodsSku.thumbnail"
+              alt
+            />
           </div>
-        <div @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)"
-          class="goods-detail">
+          <div
+            @click="
+              navigateTo(
+                '/pages/product/goods?id=' +
+                  val.goodsSku.id +
+                  '&goodsId=' +
+                  val.goodsSku.goodsId
+              )
+            "
+            class="goods-detail"
+          >
             <div class="flex">
               <p class="goods-name">{{ val.goodsSku.goodsName }}</p>
               <span class="nums">x{{ val.num }}</span>
             </div>
             <p class="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()">
-          <span v-if="receiptList">{{receiptList.receiptTitle}} - {{receiptList.receiptContent}}</span>
+          <u-col
+            :span="8"
+            class="tipsColor"
+            textAlign="right"
+            @click.native="invoice()"
+          >
+            <span v-if="receiptList"
+              >{{ receiptList.receiptTitle }} -
+              {{ receiptList.receiptContent }}</span
+            >
             <span v-else>不开发票</span>
           </u-col>
         </u-row>
         <u-row>
-        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送
+          <u-col
+            v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
+            :offset="0"
+            :span="9"
+            @click="shippingFlag = true"
+            >配送
           </u-col>
-        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="3" textAlign="right" @click="shippingFlag = true">
-          {{shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
+          <u-col
+            v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
+            :span="3"
+            textAlign="right"
+            @click="shippingFlag = true"
+          >
+            {{
+              shippingMethod.find((e) => {
+                return e.value == shippingText;
+              }).label
+            }}
           </u-col>
         </u-row>
         <u-row>
-        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
+          <u-col :offset="0" :span="4" class="tl" style="text-align: left"
+            >备注信息</u-col
+          >
           <u-col :span="8" textAlign="right">
-          <u-input style="text-align:right;" class="uinput" v-model="remarkVal[index].remark" />
+            <u-input
+              style="text-align: right"
+              class="uinput"
+              v-model="remarkVal[index].remark"
+            />
           </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-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="5" class="tr tipsColor" textAlign="right">
-            <span v-if="orderMessage.priceDetailDTO.freightPrice == 0">包邮</span>
-            <span v-else>￥{{
+        <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-else
+              >￥{{
                 orderMessage.priceDetailDTO.freightPrice | unitPrice
-              }}</span>
+              }}</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" textAlign="right"
-          @click="GET_Discount()">
-          <span class="main-color">-￥{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
+        <u-col
+          :span="3"
+          v-if="
+            orderMessage.priceDetailDTO &&
+            orderMessage.priceDetailDTO.couponPrice
+          "
+          textAlign="right"
+          @click="GET_Discount()"
+        >
+          <span class="main-color"
+            >-￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
+          >
         </u-col>
         <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
         <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
@@ -149,8 +310,15 @@
       <div>
         <u-row>
           <u-col :span="9">优惠金额</u-col>
-          <u-col :span="3" textAlign="right" v-if=" orderMessage.priceDetailDTO.couponPrice">
-            -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</u-col>
+          <u-col
+            :span="3"
+            textAlign="right"
+            v-if="orderMessage.priceDetailDTO.couponPrice"
+          >
+            <span class="main-color">
+              -￥{{ orderMessage.priceDetailDTO.couponPrice | unitPrice }}</span
+            >
+          </u-col>
           <u-col :span="3" textAlign="right" v-else>0.00</u-col>
         </u-row>
       </div>
@@ -158,18 +326,25 @@
         <u-row>
           <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>
+            <span v-if="orderMessage.priceDetailDTO.discountPrice"
+              >-￥{{
+                orderMessage.priceDetailDTO.discountPrice | unitPrice
+              }}</span
+            >
             <span v-else>0.00</span>
           </u-col>
         </u-row>
       </div>
-
     </div>
 
     <!-- 配送地区没有提示 -->
     <div class="notSupportFreight" v-if="notSupportFreight.length != 0">
-      <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList">
+      <u-notice-bar
+        style="width: 100%"
+        :volume-icon="false"
+        mode="horizontal"
+        :list="notSupportFreightGoodsList"
+      >
       </u-notice-bar>
     </div>
 
@@ -179,11 +354,25 @@
       <div class="tabbar-left">
         <div v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
           <span>¥</span>
-          <span class="price">{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[0] }}</span>
-          <span>.{{formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} </span>
+          <span class="price">{{
+            $options.filters.goodsFormatPrice(
+              orderMessage.priceDetailDTO.flowPrice
+            )[0]
+          }}</span>
+          <span
+            >.{{
+              $options.filters.goodsFormatPrice(
+                orderMessage.priceDetailDTO.flowPrice
+              )[1]
+            }}
+          </span>
         </div>
-        <span v-else class="number"><span
-            style="margin-right:10rpx;">{{orderMessage.priceDetailDTO.payPoint | unitPrice }}</span>积分</span>
+        <span v-else class="number"
+          ><span style="margin-right: 10rpx">{{
+            orderMessage.priceDetailDTO.payPoint | unitPrice
+          }}</span
+          >积分</span
+        >
       </div>
       <div class="navRiv" @click="createTradeFun()">
         <!-- #ifndef MP-WEIXIN -->
@@ -192,7 +381,6 @@
         <!-- #ifdef MP-WEIXIN -->
         <div class="tabbar-right">微信支付</div>
         <!-- #endif -->
-
       </div>
     </div>
   </div>
@@ -202,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;
@@ -213,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: {},
@@ -234,6 +429,7 @@ export default {
       couponList: "",
       // 已选地址
       address: "",
+      shopAddress: "",
       // 发票信息
       receiptList: "",
       // 店铺信息
@@ -241,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: {
     /**
      * 发票收据类型
@@ -279,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,
           });
         }
@@ -296,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(
@@ -313,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;
@@ -353,6 +564,11 @@ export default {
         )}`
       );
     },
+    clickToStoreAddress() {
+      this.navigateTo(
+        `/pages/mine/address/storeAddress?from=cart&way=${this.routerVal.way}&storeId=${this.remarkVal[0].storeId}`
+      );
+    },
 
     // 判断团长以及团员信息
     pintuanWay() {
@@ -378,6 +594,20 @@ export default {
       // 循环店铺id,商品id获取优惠券
       let store = [];
       let skus = [];
+      let selectedCoupon = [];
+      if (this.orderMessage.platformCoupon)
+        selectedCoupon.push(this.orderMessage.platformCoupon.memberCoupon.id);
+      if (
+        this.orderMessage.storeCoupons &&
+        Object.keys(this.orderMessage.storeCoupons)[0]
+      ) {
+        let storeMemberCouponsId = Object.keys(
+          this.orderMessage.storeCoupons
+        )[0];
+        let storeCouponId =
+          this.orderMessage.storeCoupons[storeMemberCouponsId].memberCoupon.id;
+        selectedCoupon.push(storeCouponId);
+      }
       this.orderMessage.cartList.forEach((item) => {
         item.skuList.forEach((sku) => {
           store.push(sku.storeId);
@@ -391,7 +621,7 @@ export default {
         data: this.orderMessage.priceDetailDTO.goodsPrice,
       });
       this.navigateTo(
-        `/pages/cart/coupon/index?way=${this.routerVal.way}&storeId=${store}&skuId=${skus}`
+        `/pages/cart/coupon/index?way=${this.routerVal.way}&storeId=${store}&skuId=${skus}&selectedCoupon=${selectedCoupon}`
       );
     },
 
@@ -412,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: "请选择地址",
@@ -420,6 +660,8 @@ export default {
             });
             return false;
           }
+        }
+
         //  创建订单
         let client;
         // #ifdef H5
@@ -455,7 +697,7 @@ export default {
             });
             // 如果当前价格为0跳转到订单列表
             if (this.orderMessage.priceDetailDTO.billPrice == 0) {
-              uni.redirectTo({
+              uni.navigateTo({
                 url: "/pages/order/myOrder?status=0",
               });
             } else {
@@ -504,17 +746,74 @@ export default {
         }
       });
     },
+    // 获取配送列表
+    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.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中超出限制问题
@@ -523,7 +822,7 @@ 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 {
@@ -531,7 +830,10 @@ export default {
           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
@@ -551,7 +853,7 @@ export default {
 </script>
 <style scoped>
 page {
-  background: #ededed !important;
+  background: #f7f7f7;
 }
 </style>
 <style scoped lang="scss">
@@ -560,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;
@@ -593,6 +900,7 @@ page {
   width: 143rpx;
   border-bottom: 2px dotted #999;
 }
+
 .tabbar-left {
   margin-left: 32rpx;
 }
@@ -645,6 +953,7 @@ page {
   align-items: center;
   justify-content: center;
 }
+
 .tr {
   text-align: right;
 }
@@ -667,6 +976,7 @@ page {
 .box2 {
   margin-top: 20rpx;
 }
+
 .notSupportFreight {
   position: fixed;
 
@@ -686,6 +996,7 @@ page {
     margin: 0 32rpx;
   }
 }
+
 /deep/ .u-notice-bar-wrap {
   width: 100% !important;
 }
@@ -763,6 +1074,7 @@ page {
   color: $main-color;
   font-size: 26rpx;
   font-weight: bold;
+
   > span {
     font-size: 36rpx;
   }
@@ -773,6 +1085,7 @@ page {
   color: $main-color;
   font-size: 28rpx;
   font-weight: bold;
+
   > .goods-price {
     font-size: 38rpx;
     padding: 0 2rpx;
@@ -814,13 +1127,16 @@ page {
   text-align: left;
   overflow: hidden;
 }
+
 .default {
   background: $main-color;
   font-size: 24rpx;
   border-radius: 8rpx;
   padding: 0rpx 12rpx;
   color: #fff;
+  margin-right: 20rpx;
 }
+
 .address-box {
   border-radius: 40rpx;
   border-top-left-radius: 0 !important;
@@ -830,16 +1146,16 @@ page {
   margin-bottom: 20rpx;
   color: #666;
 }
-.address-list {
-  margin-left: 20rpx;
-}
+
 .address-item {
   font-weight: normal;
   letter-spacing: 1rpx;
 }
+
 .user-box {
   padding: 32rpx;
 }
+
 .user-address-detail {
   color: #333;
   font-size: 38rpx;
@@ -847,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;
@@ -861,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;
 }

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=='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) {
-      
-      
       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>
+

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="logistics-List" v-else>
         <view class="verificationCode" v-if="order.verificationCode">
-          券码： {{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,9 +183,9 @@
     <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(order.receiptVO)">查看发票</view>
+          <view v-else class="value" @click="onReceipt(orderDetail.receipt)">查看发票</view>
         </view>
       </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({
@@ -324,39 +372,11 @@ export default {
     },
     gotoGoodsDetail(sku) {
       uni.navigateTo({
-        url: `/pages/product/goods?id=${sku.id}&goodsId=${sku.goodsId}`,
+        url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
       });
     },
     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 {
     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 {
     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>

pages/passport/codeLogin.vue

@@ -1,250 +0,0 @@
-<template>
-  <div class="form">
-    <u-form :model="codeForm" ref="validateCodeForm">
-      <u-form-item class="cell" label-width="120" label="手机号" prop="mobile">
-        <u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
-      </u-form-item>
-
-      <u-form-item class="cell code" label-width="120" prop="code" label="验证码">
-        <div style="display:flex; width:100%;">
-          <u-input maxlength="6" v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start"
-            ref="uCode" @change="codeChange"></u-verification-code>
-          <view @tap="getCode" :style="{color:aiderLightColor}" class="text-tips">{{ tips }}</view>
-
-        </div>
-      </u-form-item>
-
-      <view class="submit bg-linear-gradient" @click="submit">登录</view>
-      <view :style="{color:aiderLightColor}" class="text-tips cell" @click="clickLogin">一键登录</view>
-      <myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification" business="LOGIN" />
-    </u-form>
-  </div>
-</template>
-
-<script>
-import { sendMobile, smsLogin } from "@/api/login";
-import { getUserInfo } from "@/api/members";
-import storage from "@/utils/storage.js"; //缓存
-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
-import myVerification from "@/components/verification/verification.vue"; //验证码模块
-import uuid from "@/utils/uuid.modified.js"; // uuid
-export default {
-  components: {
-    myVerification,
-  },
-  props: ["status"], //是否勾选 《用户隐私》和《隐私政策》
-  data() {
-    return {
-      aiderLightColor: this.$aiderLightColor,
-      uuid,
-      flage: false, //是否验证码验证
-      codeFlag: true, //验证开关，用于是否展示验证码
-      codeForm: {
-        mobile: "", //手机号
-        code: "", //验证码
-      },
-      tips: "", //提示，点击发送验证码和重新发送时赋值
-      clientType: "", // 客户端类型
-      seconds: 60, //默认验证码等待时间
-      // 二维码登录验证规则
-      codeRules: {
-        // 手机号验证
-        mobile: [
-          {
-            validator: (rule, value, callback) => {
-              return this.$u.test.mobile(value);
-            },
-            message: "手机号码不正确",
-            trigger: ["blur"],
-          },
-        ],
-        // 验证码验证
-        code: [
-          {
-            min: 4,
-            max: 6,
-            required: true,
-            message: "请输入验证码",
-            trigger: ["blur"],
-          },
-        ],
-      },
-    };
-  },
-  // 必须要在onReady生命周期setRules，因为onLoad生命周期组件可能尚未创建完毕
-  mounted() {
-    this.$refs.validateCodeForm.setRules(this.codeRules);
-    /**
-     * 条件编译判断当前客户端类型
-     */
-    //#ifdef H5
-    this.clientType = "H5";
-    //#endif
-    //#ifdef APP-PLUS
-
-    this.clientType = "APP";
-    //#endif
-  },
-  watch: {
-    async flage(val) {
-      if (val) {
-        if (this.$refs.uCode.canGetCode) {
-          // 向后端请求验证码
-          uni.showLoading({
-            title: "正在获取验证码",
-          });
-
-          let res = await sendMobile(this.codeForm.mobile);
-
-          uni.hideLoading();
-          // 这里此提示会被this.start()方法中的提示覆盖
-          if (res.data.success) {
-            this.$refs.uCode.start();
-          } else {
-            uni.showToast({
-              title: res.data.message,
-              duration: 2000,
-              icon: "none",
-            });
-            this.flage = false;
-          }
-        } else {
-          this.$u.toast("请倒计时结束后再发送");
-        }
-      } else {
-        this.$refs.verification.hide();
-      }
-    },
-  },
-
-  methods: {
-    // 验证码验证
-    verification(val) {
-      this.flage = val == this.$store.state.verificationKey ? true : false;
-    },
-    //   登录
-    submit() {
-      if (!this.status) {
-        /**
-         * 用户必须了解
-         * 用户协议以及隐私政策
-         */
-        uni.showToast({
-          title: "请您阅读并同意用户协议以及隐私政策",
-          duration: 2000,
-          icon: "none",
-        });
-        return false;
-      }
-      let _this = this;
-      this.$refs.validateCodeForm.validate((valid) => {
-        if (valid) {
-          /**
-           * 清空当前账号信息
-           */
-          storage.setHasLogin(false);
-          storage.setAccessToken("");
-          storage.setRefreshToken("");
-          storage.setUuid(this.uuid.v1());
-          storage.setUserInfo({});
-          /**
-           * 执行登录
-           */
-          smsLogin(this.codeForm, _this.clientType).then((res) => {
-            if (res.data.success) {
-              storage.setAccessToken(res.data.result.accessToken);
-              storage.setRefreshToken(res.data.result.refreshToken);
-
-              /**
-               * 登录成功后获取个人信息
-               */
-              getUserInfo().then((user) => {
-                if (user.data.success) {
-                  /**
-                   * 个人信息存储到缓存userInfo中
-                   */
-                  storage.setUserInfo(user.data.result);
-                  storage.setHasLogin(true);
-                  // 登录成功
-                  uni.showToast({
-                    title: "登录成功!",
-                    icon: "none",
-                  });
-
-                  /**
-                   * 计算出当前router路径
-                   * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
-                   * 2.都不满足返回跳转页面
-                   */
-                  whetherNavigate();
-                } else {
-                  uni.switchTab({
-                    url: "/pages/tabbar/home/index",
-                  });
-                }
-              });
-            }
-          });
-        }
-      });
-    },
-    // 跳转到一键登录
-    clickLogin() {
-      this.$emit("open", "click");
-      
-    },
-
-    /**点击验证码*/
-    codeChange(text) {
-      this.tips = text;
-    },
-    /** 结束验证码后执行 */
-    end() {},
-    /**获取验证码 */
-    getCode() {
-      if (this.tips == "重新获取") {
-        this.codeFlag = true;
-
-        uni.showLoading({
-          title: "加载中",
-        });
-        setTimeout(() => {
-          this.$refs.verification.hide();
-          uni.hideLoading();
-        }, 2000);
-      }
-
-      if (!this.$u.test.mobile(this.codeForm.mobile)) {
-        uni.showToast({
-          title: "请输入正确手机号",
-          icon: "none",
-        });
-
-        return false;
-      }
-      if (!this.flage) {
-        this.$refs.verification.error();
-        return false;
-      }
-    },
-
-    // 点击获取验证码
-    start() {
-      this.$u.toast("验证码已发送");
-      this.flage = false;
-
-      this.codeFlag = false;
-      this.$refs.verification.hide();
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import url("./login.scss");
-
-// #ifdef MP-WEIXIN
-@import url("./mp-codeLogin.scss");
-
-// #endif
-</style>

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>