显示价格修改

更新@Neo0820提交的pr

.gitignore

@@ -1,6 +1,7 @@
 # OSX
 #
 .DS_Store
+node_modules/
 
 #Intellij idea
 .idea/

.hbuilderx/launch.json

@@ -2,10 +2,23 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
+     	"app-plus" : 
+     	{
      		"launchtype" : "remote"
-            }
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
      }
     ]
 }

App.vue

@@ -1,13 +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() {
@@ -15,6 +37,36 @@ export default {
 				config,
 			};
 		},
+
+
+		/**
+		 * 监听返回
+		 */
+		onBackPress(e) {
+			if (e.from == "backbutton") {
+				let routes = getCurrentPages();
+				let curRoute = routes[routes.length - 1].options;
+				routes.forEach((item) => {
+					if (
+						item.route == "pages/tabbar/cart/cartList" ||
+						item.route.indexOf("pages/product/goods") != -1
+					) {
+						uni.redirectTo({
+							url: item.route,
+						});
+					}
+				});
+
+				if (curRoute.addId) {
+					uni.reLaunch({
+						url: "/pages/tabbar/cart/cartList",
+					});
+				} else {
+					uni.navigateBack();
+				}
+				return true; //阻止默认返回行为
+			}
+		},
 		methods: {
 			...mapMutations(["login"]),
 		},
@@ -22,20 +74,62 @@ export default {
 			// #ifdef APP-PLUS
 			this.checkArguments(); // 检测启动参数
 			APPUpdate();
+
 			// 重点是以下： 一定要监听后台恢复 ！一定要
 			plus.globalEvent.addEventListener("newintent", (e) => {
 				this.checkArguments(); // 检测启动参数
 			});
 			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.applyUpdateWeChat();
+			// #endif
 		},
 
 		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: {
+			/**
+			 * 微信小程序版本提交更新版本 解决缓存问题
+			 */
+			applyUpdateWeChat() {
+				const updateManager = uni.getUpdateManager();
+
+				updateManager.onCheckForUpdate(function(res) {
+					// 请求完新版本信息的回调
+				});
+
+				updateManager.onUpdateReady(function(res) {
+					uni.showModal({
+						title: "更新提示",
+						content: "发现新版本，是否重启应用？",
+						success(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								updateManager.applyUpdate();
+							}
+						},
+					});
+				});
+				updateManager.onUpdateFailed(function(res) {
+					// 新的版本下载失败
+				});
+			},
+
 			//  TODO 开屏广告 后续优化添加
 			launch() {
 				try {
@@ -47,8 +141,7 @@ export default {
 						//app启动时打开启动广告页
 						var w = plus.webview.open(
 							"/hybrid/html/advertise/advertise.html",
-            "本地地址",
-            {
+							"本地地址", {
 								top: 0,
 								bottom: 0,
 								zindex: 999,
@@ -79,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: "检测到一个分享链接是否跳转？",
@@ -134,7 +230,7 @@ export default {
 
 <style lang="scss">
 	@import "uview-ui/index.scss";
-@import "./static/font/iconfont/iconfont.css";
+
 	// -------适配底部安全区  苹果x系列刘海屏
 
 	// #ifdef MP-WEIXIN
@@ -145,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,96 +1,75 @@
 ## Lilishop B2B2C商城系统
 
-##### 官方公众号 & 开源不易，如有帮助请点Star
+#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，其他问题先看文档后提问）
+
+
+##### 交流 qq 1群 961316482（已满）
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BAhURE3DG2YWhQk6kRxVapbLykqMoPS8&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群" title="Lilishop交流群">点击快捷加群</a>
+
+##### 交流 qq 2群 875294241（已满）
+
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=_lrekOvr5k2p5uTn5GRidI-chKEmpCX3&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群2群" title="Lilishop交流群2群">点击快捷加群</a>
+
+
+##### 交流 qq 3群 263785057
+
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=VUogkDvaso4zLTFH8nxFPDRKq0EthUn1&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群3群" title="Lilishop交流群3群">点击快捷加群</a>
+
+
+##### 体验 公众号/小程序/APP 体验，扫描二维码
+
 ![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
 
 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
+&nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
 
 
-### 介绍
+### 商城介绍
 **官网**：https://pickmall.cn
 
-Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+Lilishop商城系统支持商家入驻，后端基于SpringBoot 研发，前端使用 Vue、uniapp开发， **系统全端全部代码开源**
 
-产品前后端分离、支持分布式部署。
+前后端分离，支持分布式部署，支持Docker，各个API独立，并且有独立的消费者。
 
-商城展示端包含 PC、H5、微信小程序、APP。
+### 商城 API/消费者 聚合版
+api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转
+https://gitee.com/beijing_hongye_huicheng/lilishop-simplify
 
-商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块
+### 开发/使用/常见问题 帮助文档
 
-系统包含各种中间件、搜索引擎、多级缓存、分布式事务、分布式任务调度等，支持Docker，支持k8s。是一款高性能，支持高并发等商城系统。
+https://docs.pickmall.cn
 
-开箱即用，简单配置即可部署一套属于您的系统。
+### 项目地址
 
-### 文档
+gitee : https://gitee.com/beijing_hongye_huicheng
 
-**产品文档**（需求、架构、使用、部署、开发）：https://docs.pickmall.cn
+github 镜像: https://github.com/lilishop?tab=repositories
 
+商城UI 项目下3个文件夹 
+buyer：买家PC端，seller：商家端，manager：后台管理端
 
-### 项目链接(gitee)
-
-**Java后台**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
-
-**Vue后台前端**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
-
-**Uni-app**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
-
-**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
 
 ### 演示地址
+PS：手机验证码为 ‘111111’
 
-**运营后台**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
+**平台管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
 
-**店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
+**店铺管理端**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
 
-**用户前台**：https://pc-b2b2c.pickmall.cn
+**商城PC页面**：https://pc-b2b2c.pickmall.cn
 
-**移动端**：https://m-b2b2c.pickmall.cn
+**商城 小程序/公众号/APP**：扫描二维码
 
 ![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://docs.pickmall.cn/deploy/%E8%BF%90%E8%A1%8C%E7%8E%AF%E5%A2%83%E5%87%86%E5%A4%87.html)
 
+**商城数据库**
+使用docker-compose部署数据库，自动初始化数据库，不需要手动下载等操作
 
+如果手动部署，才需要获取sql [点击跳转](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) （PS：这里有与tag版本一致的sql，如果是历史版本，则docker项目也切换至历史版本获取sql即可，历史版本升级则根据java相聚的根目录DB目录下的升级sql，按需执行）。
 
 
 
@@ -98,33 +77,24 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 
 
 
-#### 平台功能
+#### 平台管理端功能
 
-![平台功能](https://pickmall.cn/assets/imgs/other/managerList.jpg)
+![平台管理端功能](https://pickmall.cn/assets/imgs/other/managerList1.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)
 
@@ -133,9 +103,9 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 
 #### 架构图
 
-![架构](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
+![技术选型](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
 
-##### Java后台
+##### 后台技术选型
 
 | 说明           | 框架            | 说明           |               |
 | -------------- | --------------- | -------------- | ------------- |
@@ -166,102 +136,21 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 | 基础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.普通商品设置去除卖家承担运费。
-
-```
-
-时间：2021年7月15日
-
-```
-新增功能：
-1.会员权益
-2.支持用户升级会员
-3.供求单
-4.IM：腾讯云智服
-5.服务商品
-6.店铺支持订单核销
-7.店铺自提点
-功能优化：
-1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
-```
-
-时间：2021年8月16日
-
-```
-新增功能：
-1.微淘功能
-2.店铺移动端
-3.店铺发货单
-```
-
-时间：2021年9月15日
-
-```
-新增功能：
-增加供应商功能
-```
-
 ### 版本升级
 
 ```
-后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
-
-后续会考虑推出微服务/中台等 企业级版本
+系统后续会提供多场景解决方案。
+更多架构：微服务、Saas、中台等，都会支持。 支持差价升级商业授权
 ```
 
-### 技术亮点
+### 商业授权
+商业版本与开源版本代码一致，没有区分
 
+商业使用需要授权，授权方式可选择联系官网客服，或者qq群联系群主。
 
-    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.已经对接好各种第三方插件，支持各种复杂等联合登陆，联合支付等场景。
+商业案例由于涉及部分多层二开关系，如需了解可以咨询销售。
 
 
 ### 开源须知
@@ -269,9 +158,14 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 
 2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
 
-3.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+3.软件受国家计算机软件著作权保护（登记号：2021SR0805085）。
+
+4.限制商用，如果需要商业使用请联系我们。QQ3409056806.或者加入qq群联系群主。
+
+
 
 ### 交流群
 
-**QQ群**：961316482
-
+##### 官方qq 1群 961316482（已满）
+##### 官方qq 2群 875294241（已满）
+##### 官网qq 3群 263785057

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,19 +12,20 @@ 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 },
   });
 }
 
+
 /**
  * 获取物流公司
  */
 export function getLogistics() {
   return http.request({
-    url: "/logistics",
+    url: "/other/logistics",
     method: Method.GET,
     needToken: true,
     params: { pageNumber: 1, pageSize: 200, disabled: "OPEN" },
@@ -36,7 +37,7 @@ export function getLogistics() {
  */
 export function getAddressCode(cityCode, townName) {
   return http.request({
-    url: api.common + "/region/region",
+    url: api.common + "/common/region/region",
     method: Method.GET,
     needToken: true,
     params: { cityCode, townName },
@@ -50,7 +51,7 @@ export function getAddressCode(cityCode, townName) {
  */
 export function addAddress(data) {
   return http.request({
-    url: "/memberAddress",
+    url: "/member/address",
     method: Method.POST,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -66,7 +67,7 @@ export function addAddress(data) {
  */
 export function editAddress(params) {
   return http.request({
-    url: `/memberAddress`,
+    url: `/member/address`,
     method: Method.PUT,
     needToken: true,
     header: { "content-type": "application/x-www-form-urlencoded" },
@@ -80,7 +81,7 @@ export function editAddress(params) {
  */
 export function deleteAddress(id) {
   return http.request({
-    url: `/memberAddress/delById/${id}`,
+    url: `/member/address/delById/${id}`,
     method: Method.DELETE,
     needToken: true,
   });
@@ -94,7 +95,7 @@ export function deleteAddress(id) {
  */
 export function getAddressDetail(id) {
   return http.request({
-    url: `/memberAddress/get/${id}`,
+    url: `/member/address/get/${id}`,
     method: Method.GET,
     loading: false,
     needToken: true,
@@ -106,7 +107,7 @@ export function getAddressDetail(id) {
  */
 export function getAddressDefault() {
   return http.request({
-    url: `/memberAddress/get/default`,
+    url: `/member/address/get/default`,
     method: Method.GET,
     loading: false,
     needToken: true,

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,7 +23,7 @@ export function getArticleCategory(category_type) {
  */
 export function getArticleDetail(type) {
   return http.request({
-    url: `/article/type/${type}`,
+    url: `/other/article/get/${type}`,
     method: Method.GET,
   });
 }

api/common.js

@@ -1,26 +1,8 @@
 /**
  * 公共API
  */
-import storage from "@/utils/storage.js"
-import {http, Method} from '@/utils/request.js';
-import api from '@/config/api.js';
-
-/**
- * 获取图片验证码URL
- * @param type
- * @param uuid
- * @returns {string}
- */
-export function getValidateCodeUrl(type, uuid) {
-  if (!type) {
-    return '';
-  }
-  if (!uuid) {
-    uuid = storage.getUuid()
-  }
-  return `${api.base}/captchas/${uuid}/${type}?r=${new Date().getTime()}`;
-}
-
+import { http, Method } from "@/utils/request.js";
+import api from "@/config/api.js";
 
 /**
  * 获取地区数据
@@ -28,7 +10,16 @@ export function getValidateCodeUrl(type, uuid) {
  */
 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,
   });
@@ -38,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,7 +25,7 @@ export function webConnect(code) {
 }
 export function openIdLogin(params, clientType) {
 	return http.request({
-		url: `connect/app/login`,
+		url: `passport/connect/connect/app/login`,
 		method: Method.GET,
 		needToken: true,
 		data: params,
@@ -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/goods.js

@@ -9,7 +9,7 @@ import { http, Method } from "@/utils/request.js";
  */
  export function getGoodsMessage(goodsId) {
   return http.request({
-    url: `/goods/get/${goodsId}`,
+    url: `/goods/goods/get/${goodsId}`,
     method: Method.GET,
   });
 }
@@ -19,7 +19,7 @@ import { http, Method } from "@/utils/request.js";
  */
 export function getGoodsRelated(params) {
   return http.request({
-    url: `/goods/es/related`,
+    url: `/goods/goods/es/related`,
     method: Method.GET,
     params,
   });
@@ -32,7 +32,7 @@ export function getGoodsRelated(params) {
  */
  export function getGoods(skuId, goodsId) {
   return http.request({
-    url: `/goods/sku/${goodsId}/${skuId}`,
+    url: `/goods/goods/sku/${goodsId}/${skuId}`,
     method: Method.GET,
   });
 }
@@ -43,7 +43,7 @@ export function getGoodsRelated(params) {
  */
  export function getGoodsDistribution(distributionId) {
   return http.request({
-    url: `/distribution/bindingDistribution/${distributionId}`,
+    url: `/distribution/distribution/bindingDistribution/${distributionId}`,
     method: Method.GET,
   });
 }
@@ -56,7 +56,7 @@ export function getGoodsRelated(params) {
  */
 export function getGoodsList(params) {
   return http.request({
-    url: "/goods/es",
+    url: "/goods/goods/es",
     method: Method.GET,
     params,
   });
@@ -112,23 +112,12 @@ export function getPlateformTagGoods(tag_id) {
  */
 export function getCategoryList(id) {
   return http.request({
-    url: `/category/get/${id}`,
+    url: `/goods/category/get/${id}`,
     method: Method.GET,
     loading: false,
   });
 }
 
-/**
- * 获取商品分类
- * @param parent_id
- */
-export function getCategory(parent_id = 0) {
-  return http.request({
-    url: `goods/categories/${parent_id}/children`,
-    method: Method.GET,
-    loading: false,
-  });
-}
 
 
 
@@ -137,7 +126,7 @@ export function getCategory(parent_id = 0) {
  */
 export function distribution() {
   return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
     method: Method.GET,
   });
 }
@@ -147,7 +136,7 @@ export function distribution() {
  */
 export function applyDistribution(params) {
   return http.request({
-    url: `/distribution`,
+    url: `/distribution/distribution`,
     method: Method.POST,
     params,
   });
@@ -167,20 +156,23 @@ export function cash(params) {
 /**
  * 分销商提现历史
  */
-export function cashLog() {
+export function cashLog(params) {
   return http.request({
     url: `/distribution/cash`,
     method: Method.GET,
+    params
+
   });
 }
 
 /**
  * 获取分销商分页订单列表
  */
-export function distributionOrderList() {
+export function distributionOrderList(params) {
   return http.request({
-    url: `/distribution/distributionOrder`,
+    url: `/distribution/distribution/distributionOrder`,
     method: Method.GET,
+    params
   });
 }
 
@@ -189,7 +181,7 @@ export function distributionOrderList() {
  */
 export function distributionGoods(params) {
   return http.request({
-    url: `/distributionGoods`,
+    url: `/distribution/goods`,
     method: Method.GET,
     params,
   });
@@ -197,10 +189,11 @@ export function distributionGoods(params) {
 /**
  * 选择分销商品 分销商品id
  */
-export function checkedDistributionGoods(id) {
+export function checkedDistributionGoods(params) {
   return http.request({
-    url: `/distributionGoods/checked/${id}`,
+    url: `/distribution/goods/checked/${params.id}`,
     method: Method.GET,
+    params
   });
 }
 
@@ -209,7 +202,7 @@ export function checkedDistributionGoods(id) {
  */
  export function getMpCode(params){
   return http.request({
-    url:`/mini-program/mp/unlimited`,
+    url:`/passport/connect/miniProgram/mp/unlimited`,
     method:Method.GET,
     params
   })
@@ -220,7 +213,7 @@ export function checkedDistributionGoods(id) {
  */
  export function getMpScene(id){
   return http.request({
-    url:`/mini-program/mp/unlimited/scene?id=${id}`,
+    url:`/passport/connect/miniProgram/mp/unlimited/scene?id=${id}`,
     method:Method.GET,
 
   })

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,
+  });
+}
 
 /**
  * 获取广告图
@@ -30,12 +45,12 @@ export function getCategory(parent_id = 0) {
  * 获取热门关键词
  * @param num
  */
-export function getHotKeywords(start = 0, end = 10) {
+export function getHotKeywords(count) {
   return http.request({
-    url: "/goods/hot-words",
+    url: "/goods/goods/hot-words",
     method: Method.GET,
     loading: false,
-    params: { start, end },
+    params: { count },
   });
 }
 
@@ -46,7 +61,7 @@ export function getHotKeywords(start = 0, end = 10) {
  */
 export function getFloorData() {
   return http.request({
-    url: `/pageData/getIndex?clientType=H5`,
+    url: `/other/pageData/getIndex?clientType=H5`,
     method: "get",
   });
 }
@@ -56,7 +71,7 @@ export function getFloorData() {
  */
 export function getCategoryIndexData(parentId = 0) {
   return http.request({
-    url: `/category/get/${parentId}`,
+    url: `/goods/category/get/${parentId}`,
     method: "get",
   });
 }

api/login.js

@@ -1,11 +1,6 @@
-import {
-	http
-} from "@/utils/request.js";
-
-
-import api from '@/config/api.js'
-
+import { http } from "@/utils/request.js";
 
+import api from "@/config/api.js";
 
 /**
  * 通过短信重置密码
@@ -13,20 +8,36 @@ import api from '@/config/api.js'
  */
 export function resetByMobile(params) {
   return http.request({
-		url: `/members/resetByMobile`,
+    url: `/passport/member/resetByMobile`,
     method: "POST",
-		params
+    params,
   });
 }
 
+/**
+ * 账号密码登陆
+ * @params  password
+ * @params  username
+ */
+ export function userLogin(params){
+  return http.request({
+    method: "POST",
+    url:`/passport/member/userLogin`,
+    data: params,
+    header: {
+      "content-type": "application/x-www-form-urlencoded",
+    },
+  })
+}
+
 
 /**
  * 发送验证码
  * @param  mobile
  */
-export function sendMobile(mobile) {
+export function sendMobile(mobile,type='LOGIN') {
   return http.request({
-		url: `${api.common}/sms/LOGIN/${mobile}`,
+    url: `${api.common}/common/sms/${type}/${mobile}`,
     method: "GET",
   });
 }
@@ -38,18 +49,16 @@ export function sendMobile(mobile) {
  */
 export function smsLogin(params, clientType) {
   return http.request({
-		url: `/members/smsLogin`,
+    url: `/passport/member/smsLogin`,
     method: "POST",
     data: params,
     header: {
       "content-type": "application/x-www-form-urlencoded",
-			"clientType": clientType
-		}
+      clientType: clientType,
+    },
   });
 }
 
-
-
 /**
  * 修改密码
  * @param  newPassword
@@ -58,7 +67,7 @@ export function smsLogin(params, clientType) {
 
 export function modifyPass(params) {
   return http.request({
-		url: `/members/modifyPass`,
+    url: `/passport/member/modifyPass`,
     method: "PUT",
     params,
   });
@@ -68,9 +77,34 @@ export function smsLogin(params, clientType) {
  * 刷新token
  */
 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

@@ -1,22 +1,49 @@
-import storage from "@/utils/storage"
-import {http, Method} from '@/utils/request.js';
-
-
+import storage from "@/utils/storage";
+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,
   });
 }
 
+// 提现
+export function withdrawalApply(params) {
+  return http.request({
+    url: "/wallet/wallet/withdrawal",
+    method: Method.POST,
+    needToken: true,
+    params,
+  });
+}
 
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function payCallback(params) {
+  return http.request({
+    url: `/payment/cashier/result`,
+    method: Method.GET,
+    params,
+  });
+}
 
+// 在线充值
+export function recharge(params) {
+  return http.request({
+    url: "/trade/recharge",
+    method: Method.POST,
+    params,
+  });
+}
 
 /**
  * 分页获取预存款充值记录
@@ -44,16 +71,13 @@ import {http, Method} from '@/utils/request.js';
   });
 }
 
-
-
-
 /**
  * 获取优惠券列表
  * @param params
  */
 export function getCoupons(params) {
   return http.request({
-    url: '/promotion/coupon/getCoupons',
+    url: "/promotion/coupon/getCoupons",
     method: Method.GET,
     needToken: true,
     params,
@@ -79,14 +103,13 @@ export function receiveCoupons(couponId) {
  */
 export function getPointsData(params) {
   return http.request({
-    url: 'member/memberPointsHistory/getByPage',
+    url: "member/memberPointsHistory/getByPage",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
 /**
  * 获取我的评论列表
  * @param params
@@ -94,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,
@@ -108,26 +131,23 @@ export function getComments(params) {
  */
 export function getFootprintNum(params) {
   return http.request({
-    url: '/footprint/getFootprintNum',
+    url: "/member/footprint/getFootprintNum",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
-
-
 /**
  * 订单评论
  * @param 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"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
@@ -138,10 +158,10 @@ export function commentsMemberOrder(params) {
  */
 export function AppendCommentsOrder(params) {
   return http.request({
-    url: 'members/comments/additional',
+    url: "members/comments/additional",
     method: Method.POST,
     needToken: true,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
@@ -154,14 +174,14 @@ export function AppendCommentsOrder(params) {
  */
 export function consultating(goods_id, ask_content, anonymous) {
   return http.request({
-    url: 'members/asks',
+    url: "members/asks",
     method: Method.POST,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: {
       goods_id,
       ask_content,
-      anonymous
+      anonymous,
     },
   });
 }
@@ -182,23 +202,18 @@ export function getGoodsCollection(params,type) {
   });
 }
 
-
-
 /**
  * 收藏商品
  * @returns {AxiosPromise}
  */
-export function collectionGoods(id,type) {
+export function collectionGoods(type, id) {
   return http.request({
     url: `/member/collection/add/${type}/${id}`,
     method: Method.POST,
     needToken: true,
- 
   });
 }
 
-
-
 /**
  * 删除商品收藏
  * @param ids 收藏ID【集合或单个商品ID】
@@ -206,7 +221,7 @@ export function collectionGoods(id,type) {
  */
 export function deleteGoodsCollection(ids) {
   if (Array.isArray(ids)) {
-    ids = ids.join(',');
+    ids = ids.join(",");
   }
   return http.request({
     url: `/member/collection/delete/GOODS/${ids}`,
@@ -215,11 +230,23 @@ export function deleteGoodsCollection(ids) {
   });
 }
 
+/**
+ * 删除店铺收藏
+ * @param store_id
+ */
+export function deleteStoreCollection(store_id) {
+  return http.request({
+    url: `/member/collection/delete/STORE/${store_id}`,
+    method: Method.DELETE,
+    needToken: true,
+  });
+}
+
 /**
  * 获取商品是否被收藏
  * @param good_id
  */
-export function getGoodsIsCollect(good_id,type) {
+export function getGoodsIsCollect(type, good_id) {
   return http.request({
     url: `/member/collection/isCollection/${type}/${good_id}`,
     method: Method.GET,
@@ -228,7 +255,6 @@ export function getGoodsIsCollect(good_id,type) {
   });
 }
 
-
 /**
  * 收藏店铺
  * @param store_id 店铺ID
@@ -236,33 +262,20 @@ export function getGoodsIsCollect(good_id,type) {
  */
 export function collectionStore(store_id) {
   return http.request({
-    url: 'members/collection/store',
-    header:{'content-type':"application/x-www-form-urlencoded"},
+    url: "members/collection/store",
+    header: { "content-type": "application/x-www-form-urlencoded" },
     method: Method.POST,
     data: { store_id },
   });
 }
 
-/**
- * 删除店铺收藏
- * @param store_id
- */
-export function deleteStoreCollection(store_id) {
-  return http.request({
-    url: `members/collection/store/${store_id}`,
-    method: Method.DELETE,
-    needToken: true,
-  });
-}
-
-
 /**
  * 获取当前登录的用户信息
  * @returns {AxiosPromise}
  */
 export function getUserInfo() {
   return http.request({
-    url: '/members',
+    url: "/passport/member",
     method: Method.GET,
     needToken: true,
   });
@@ -274,7 +287,7 @@ export function deleteStoreCollection(store_id) {
  */
 export function getUserWallet() {
   return http.request({
-    url: '/members/wallet',
+    url: "/wallet/wallet",
     method: Method.GET,
     needToken: true,
   });
@@ -287,30 +300,27 @@ 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"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: params,
   });
 }
 
-
 /**
  * 添加发票
  * @param params
  */
 export function addReceipt(params) {
   return http.request({
-    url: '/trade/receipt',
+    url: "/trade/receipt",
     method: Method.POST,
     needToken: true,
     params,
   });
 }
 
-
-
 /**
  * 获取商品评论列表
  * @param goodsId
@@ -318,7 +328,7 @@ export function addReceipt(params) {
  */
 export function getGoodsComments(goodsId, params) {
   return http.request({
-    url: `/memberEvaluation/${goodsId}/goodsEvaluation`,
+    url: `/member/evaluation/${goodsId}/goodsEvaluation`,
     method: Method.GET,
     loading: false,
     params,
@@ -331,13 +341,12 @@ 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,
   });
 }
 
-
 /**
  * 获取未读消息数量信息
  */
@@ -345,8 +354,8 @@ export function getNoReadMessageNum() {
   return http.request({
     url: `members/member-nocice-logs/number`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -356,10 +365,10 @@ export function getNoReadMessageNum() {
  */
 export function myTrackList(params) {
   return http.request({
-    url: `/footprint`,
+    url: `/member/footprint`,
     method: Method.GET,
     needToken: true,
-	params
+    params,
   });
 }
 
@@ -369,10 +378,10 @@ 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
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -384,8 +393,8 @@ export function getMemberCoupons(data) {
     url: `/promotion/coupon/getCoupons`,
     method: Method.GET,
     needToken: true,
-    params:data
-  })
+    params: data,
+  });
 }
 
 /**
@@ -396,8 +405,8 @@ export function getCouponsNum() {
   return http.request({
     url: `/promotion/coupon/getCouponsNum`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
@@ -407,6 +416,6 @@ export function getCouponsNum() {
 export function getMemberPointSum() {
   return http.request({
     url: `member/memberPointsHistory/getMemberPointsHistoryVO`,
-    method: Method.GET
-  })
+    method: Method.GET,
+  });
 }

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,
+  });
+}
 
 /**
  * 获取物流消息列表
@@ -67,15 +85,28 @@ export function getLogisticsMessages(params) {
 
 
 /**
- * TODO 获取版本更新信息 暂无此功能。后续会优化更新
  * @param appType
  * @returns {AxiosPromise}
  * 
  */	
-export function getAppVersionList(appType) {
+ export function getAppVersion(appType) {
   return http.request({
-    url: `/appVersion/${appType}`,
+    url: `/other/appVersion/${appType}`,
     method: Method.GET,
     type:"manager"
   });
 }
+
+/**
+ * @param appType
+ * @returns {AxiosPromise}
+ * 
+ */	
+ export function getAppVersionList(type,data) {
+  return http.request({
+    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/promotions.js

@@ -1,8 +1,21 @@
 /**
  * 促销相关API
  */
-import {http, Method} from '@/utils/request.js';
+import { http, Method } from "@/utils/request.js";
 
+/**
+ * 获取当前直播列表
+ *
+ * @param {*}
+ * @returns
+ */
+export function getLiveList(params) {
+  return http.request({
+    url: `broadcast/studio`,
+    method: Method.GET,
+    params,
+  });
+}
 
 /**
  * 获取当前拼团活动的未成团的会员
@@ -14,24 +27,22 @@ export function getPromotionGroupMember(pintuanId) {
   });
 }
 
-
 /** 获取拼团列表 */
 export function getAssembleList(params) {
   return http.request({
-    url: 'promotion/pintuan',
+    url: "promotion/pintuan",
     method: Method.GET,
     loading: false,
-    params
-  })
+    params,
+  });
 }
 
-
 /**
  * 获取积分商城分类
  */
 export function getPointsCategory() {
   return http.request({
-    url: '/promotion/pointsGoods/category',
+    url: "/promotion/pointsGoods/category",
     method: Method.GET,
   });
 }
@@ -42,18 +53,30 @@ export function getPointsCategory() {
  */
  export function getPointsGoods(params) {
   return http.request({
-    url: '/promotion/pointsGoods',
+    url: "/promotion/pointsGoods",
     method: Method.GET,
     params,
   });
 }
+/**
+ * 获取积分商城商品详情
+ * @param params
+ */
+export function getPointsGoodsDetail(id) {
+  return http.request({
+    url: "/promotion/pointsGoods/"+id,
+    method: Method.GET,
+  });
+}
+
+
 
 /**
  * 获取限时抢购时间线 当天限时抢购信息
  */
 export function getSeckillTimeLine() {
   return http.request({
-    url: 'promotion/seckill',
+    url: "promotion/seckill",
     method: Method.GET,
   });
 }
@@ -75,8 +98,91 @@ export function getSeckillTimeGoods(timeline) {
  */
 export function getAllCoupons(params) {
   return http.request({
-    url: '/promotion/coupon',
+    url: "/promotion/coupon",
     method: Method.GET,
     params,
   });
 }
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainList(params) {
+  return http.request({
+    url: "/promotion/kanjiaGoods",
+    method: Method.GET,
+    params,
+  });
+}
+
+/**
+ * 分页获取砍价商品
+ * @param params
+ */
+export function getBargainDetail(id) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/${id}`,
+    method: Method.GET,
+  });
+}
+
+/**
+ * 获取砍价活动
+ * @param params
+ */
+export function getBargainActivity(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity`,
+    method: Method.POST,
+    params,
+  });
+}
+
+/**
+ * 发起砍价活动
+ * @param params
+ */
+export function openBargain(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods`,
+    method: Method.POST,
+    header: { "content-type": "application/x-www-form-urlencoded" },
+    data: params,
+  });
+}
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+export function getBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/getKanjiaActivity/logs`,
+    method: Method.GET,
+    data: params,
+  });
+}
+
+
+/**
+ * 分页获取砍价活动-帮砍记录
+ */
+ export function helpBargain(kanJiaActivityId) {
+  return http.request({
+    url: `promotion/kanjiaGoods/help/${kanJiaActivityId}`,
+    method: Method.POST,
+  });
+}
+
+/**
+ * 分页获取已参与的砍价活动
+ */
+export function getMineBargainLog(params) {
+  return http.request({
+    url: `/promotion/kanjiaGoods/kanjiaActivity/mine/`,
+    method: Method.GET,
+    params
+  });
+}
+
+

api/store.js

@@ -4,11 +4,14 @@
 
 import {http, Method} from '@/utils/request.js';
 
+
+
+
 /**
  * 获取店铺列表
  * @param params
  */
-export function getstoreList(params) {
+export function getStoreList(params) {
   return http.request({
     url: '/store',
     method: Method.GET,
@@ -20,10 +23,37 @@ export function getstoreList(params) {
  * 获取店铺基本信息
  * @param storeId
  */
-export function getstoreBaseInfo(storeId) {
+ export function getStoreBaseInfo(storeId) {
   return http.request({
-    url: `/store/get/detail/${storeId}`,
+    url: `/store/store/get/detail/${storeId}`,
     method: Method.GET,
     loading: false,
   });
 }
+
+/**
+ * 获取店铺分类
+ * @param id
+ */
+ export function getStoreCategory(id) {
+  return http.request({
+    url: `/store/store/label/get/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+/**
+ * 营业执照
+ * @param id
+ */
+ export function getLicencePhoto(id) {
+  return http.request({
+    url: `/store/store/get/licencePhoto/${id}`,
+    method: Method.GET,
+  });
+}
+
+
+
+

api/trade.js

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

components/m-buy/README.md

@@ -0,0 +1,3 @@
+## 购买组件
+1.本组件是砍价，积分购买，参团等复用组
+2.后续会将此组件和商品购买组件合并，文档后续再出

components/m-buy/goods.vue

@@ -0,0 +1,536 @@
+<template>
+	<div class="wrapper">
+		<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>
+					</view>
+					<view class="goods-skus">
+						<!-- 有活动商品价格 -->
+						<view class="goods-price"
+							v-if="goodsDetail.promotionPrice && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
+							<span v-if="goodsDetail.promotionPrice && !pointDetail">
+								￥
+								<span class="goods-price-promotionShow goods-price-bigshow">{{
+                  $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">{{
+                  $options.filters.goodsFormatPrice(goodsDetail.price)[0]
+                }}</span>
+								.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
+							</div>
+						</view>
+						<!-- 正常商品的价格 -->
+						<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">{{
+									    $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">
+							已选
+							<span class="goods-check-skus-name">
+								{{ selectName }}
+								<span>，{{ num }}个</span>
+							</span>
+						</view>
+						<view class="goods-check-skus">
+							库存
+							<span class="goods-check-skus-name">
+								<span>{{ goodsDetail.quantity }}</span>
+							</span>
+						</view>
+					</view>
+				</view>
+				<!-- 商品信息 -->
+				<scroll-view class="goods-skus-box" :scroll-y="true">
+					<!-- 规格 -->
+					<view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
+						<view class="skus-view-list">
+							<view class="view-class-title">{{ spec.name }}</view>
+
+							<!-- 正常逻辑 循环出sku -->
+							<view v-if="!parentOrder" :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
+							</view>
+
+							<!-- 拼团购买，仅筛选出当前拼团类型商品 -->
+							<view v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+								:class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+								v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
+							</view>
+						</view>
+					</view>
+					<!-- 数量 -->
+					<view class="goods-skus-number flex flex-a-c flex-j-sb">
+						<view class="view-class-title">数量</view>
+						
+						<u-input  class="view-class-input" v-model="num" type="number"  />
+					</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 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,
+				
+				selectName: "", //选中商品的昵称
+				selectSkuList: "", //选中商铺sku,
+				selectedSpecImg: "", //选中的图片路径
+				buyType: "", //用于存储促销，拼团等活动类型
+				parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
+				formatList: [],
+				currentSelceted: [],
+				skuList: "",
+				isClose: false, //是否可以点击遮罩关闭
+				
+			};
+		},
+		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){
+				if(val){
+					if(val > this.goodsDetail.quantity){
+						this.val = this.goodsDetail.quantity
+					}
+				}
+			},
+			buyType: {
+				handler(val) {
+					if (val) {
+						this.buyType = val;
+					}
+				},
+				immediate: true,
+			},
+			selectSkuList: {
+				handler(val, oldval) {
+					this.$emit("changed", val);
+				},
+				deep: true,
+			},
+		},
+
+		methods: {
+			closeMask() {
+				this.$emit("closeBuy", false);
+			},
+
+			/**点击规格 */
+			handleClickSpec(val, index, specValue) {
+				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;
+					}
+				});
+				if (selectedSkuId?.skuId) {
+					this.$set(this.currentSelceted, index, specValue.value);
+					this.selectSkuList = {
+						spec: {
+							specName: val.name,
+							specValue: specValue.value,
+						},
+						data: this.goodsDetail,
+					};
+					this.selectName = specValue.value;
+
+					this.$emit("handleClickSku", {
+						skuId: selectedSkuId.skuId,
+						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)
+            )}`,
+						});
+					}
+				});
+			},
+
+			/**
+			 * 添加到购物车或购买
+			 */
+			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))}`,
+							});
+						}
+					});
+				}
+			},
+			formatSku(list) {
+				// 格式化数据
+				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") {
+							return;
+						}
+
+						arr.forEach((arrItem, arrIndex) => {
+							if (
+								arrItem.name == name &&
+								arrItem.values &&
+								!arrItem.values.find((i) => {
+									return 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;
+				// console.log(" this.skuList", this.skuList)
+			},
+		},
+
+		mounted() {
+			this.formatSku(this.goodsSpec);
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	@import "./popup.scss";
+	.price-row{
+		text-align: center;
+		
+	}
+	.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;
+		
+		>.view-class-title{
+			flex: 8;
+		}
+		>.view-class-input{
+			flex:1
+		}
+	}
+
+	/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;
+			}
+		}
+	}
+	.wholesale-item{
+		color: #999 !important;
+		font-size: 24rpx;
+		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
+	}
+
+	.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;
+		margin-right: 20rpx;
+		>* {
+			color: $price-color;
+			line-height: 80rpx;
+	
+		}
+	}
+
+	.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>

components/m-buy/popup.scss

@@ -14,7 +14,7 @@
     line-height: 80rpx;
     height: 80rpx;
     
-    background: $jd-color;
+    background: $price-color;
     color: #fff;
     border-radius: 200px;
     text-align: center;

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,276 @@
+<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="aspectFill"
+          >
+            <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"
+              :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.content.id}&goodsId=${item.content.goodsId}`,
+				});
+			},
+			// 跳转地址
+			navigateToStoreDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=${item.content.storeId}`,
+				});
+			},
+		},
+	}
+</script>
+
+<style lang='scss' scoped>
+	
+</style>

components/m-goods-list/list.vue

@@ -0,0 +1,337 @@
+<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.content.thumbnail" width="100%" height='330rpx' mode="aspectFill">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</view>
+				<view class="goods-detail">
+					<div class="title clamp" v-html="lightSearchStr(keyword,item.content.goodsName)"
+						@click="navigateToDetailPage(item)">
+
+					</div>
+					<view class="price-box" @click="navigateToDetailPage(item)">
+						<div class="price" v-if="item.content.price!=undefined">
+							¥<span>{{ $options.filters.goodsFormatPrice(item.content.price )[0] }} </span>.{{
+	            $options.filters.goodsFormatPrice(item.content.price )[1]
+	          }}
+						</div>
+					</view>
+					<div class="promotion" @click="navigateToDetailPage(item)">
+						<div v-if="item.content.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.content.buyCount || "0" }}</span>
+						<span>{{ item.content.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.content.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" :src="item.content.thumbnail">
+							<u-loading slot="loading"></u-loading>
+						</u-image>
+					</div>
+					<div class="goods-detail">
+						<div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
+						<view class="price-box" @click="navigateToDetailPage(item)">
+							<div class="price" v-if="item.content.price!=undefined">
+								¥<span>{{ $options.filters.goodsFormatPrice(item.content.price )[0] }} </span>.{{
+			            $options.filters.goodsFormatPrice(item.content.price )[1]
+			          }}
+							</div>
+						</view>
+						<div class="promotion" @click="navigateToDetailPage(item)">
+							<div v-if="item.content.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.content.buyCount || '0' }}</span>
+							<span style="float: right; font-size: 22rpx">{{ item.content.commentNum || '0' }}条评论</span>
+						</div>
+						<div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
+							<div class="text-hidden" 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.content.storeName }}</span>
+								<span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon>
+								</span>
+							</div>
+							<span>
+								<u-icon name="arrow-right" color="#c5c5c5"></u-icon>
+							</span>
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+
+	</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.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.content.id}&goodsId=${item.content.goodsId}`,
+				});
+			},
+			// 跳转地址
+			navigateToStoreDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=${item.content.storeId}`,
+				});
+			},
+		}
+	}
+</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/promotion.vue

@@ -0,0 +1,166 @@
+<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" 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>
+						</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/README.md

@@ -0,0 +1,10 @@
+## 商品推荐 
+
+
+### OBJECT 参数说明
+属性|说明|类型|必填
+---|---|---|---
+`title`|标题，用于顶部显示的内容|String|否
+`pageSize`|显示多少条数据，建议是2的倍数,默认为12条|*|否
+`categoryId`|分类id|Function|否
+`storeId`|卖家id，搜索店铺商品的时候使用|String|否

components/m-goods-recommend/index.vue

@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <div class="goods-recommend">{{title ? `--${title}-- `:''}}</div>
+		 <goodsTemplate :res='goodsList' />
+  </div>
+</template>
+<script>
+	import goodsTemplate from '@/components/m-goods-list/list'
+import { getGoodsList } from "@/api/goods.js";
+export default {
+  data() {
+    return {
+      goodsList: [],
+      params: {
+        pageNumber: 1,
+      },
+    };
+  },
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    pageSize: {
+      type: null,
+      default: 12,
+    },
+    categoryId: {
+      type: null,
+      default: "",
+    },
+    storeId: {
+      type: null,
+      default: "",
+    },
+  },
+	components:{goodsTemplate},
+  mounted() {
+    this.initGoods();
+  },
+  methods: {
+    /**
+     * 初始化商品
+     */
+    async initGoods() {
+      let submit = JSON.parse(
+        JSON.stringify(
+          Object.assign(this.params, {
+            pageSize: this.pageSize,
+            categoryId: this.categoryId,
+            storeId: this.storeId,
+          })
+        )
+      );
+
+      Object.keys(submit).map((key) => {
+        if (!submit[key] || submit[key].length == 0) {
+          delete submit[key];
+        }
+      });
+      let goodsList = await getGoodsList(submit);
+      this.goodsList.push(...goodsList.data.result.content);
+    },
+    handleClick(item) {
+      uni.navigateTo({
+        url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/**商品代码 */
+$w_94: 94%;
+.goods-recommend {
+  background: #f7f7f7;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 30rpx;
+  font-weight: bold;
+}
+.goods-list {
+  display: flex;
+  flex-wrap: wrap;
+  background: #f7f7f7;
+}
+.goods-item {
+  width: 50%;
+  margin-bottom: 10px;
+  border-radius: 0.4em;
+  overflow: hidden;
+}
+.goods-img {
+  position: relative;
+  margin: 0 auto;
+  width: $w_94;
+  height: 350rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  overflow: hidden;
+  > img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.goods-desc {
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  width: $w_94;
+  background: #fff;
+  padding: 8rpx 0 8rpx 8rpx;
+  margin: 0 auto;
+  > .goods-title {
+    font-size: 12px;
+    height: 70rpx;
+    display: -webkit-box;
+    font-weight: 500;
+    -webkit-box-orient: vertical;
+
+    -webkit-line-clamp: 2;
+
+    overflow: hidden;
+  }
+
+  > .goods-bottom {
+    display: flex;
+    font-weight: bold;
+
+    > .goods-price {
+      line-height: 2;
+      color: $main-color;
+    }
+  }
+}
+</style>

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>
@@ -58,24 +58,31 @@ export default {
   // 图片缩略图、 商品名称 、 type（goods,shop,pintuan) 拼团商品分享以及店铺分享
 
   props: ["thumbnail", "goodsName", "type", "goodsId", "link"],
-  // #ifdef MP-WEIXIN
-  onShareAppMessage(res) {
-    return {
-      imageUrl: this.thumbnail || require("@/static/logo.png"),
-    };
-  },
-  // #endif
   methods: {
     close() {
       this.$emit("close");
     },
+    weChatShare(){
+      this.$u.mpShare = {
+        title:  this.shareTitle(), // 默认为小程序名称，可自定义
+        path: '', // 默认为当前页面路径，一般无需修改，QQ小程序不支持
+        // 分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径。
+        // 支持PNG及JPG，默认为当前页面的截图
+        imageUrl: this.thumbnail ||''
+      }
+    },
+
     // h5复制链接
     // #ifdef H5
     copyLink() {
-      let content =
+      let content;
+      if (this.link) {
+        content = this.configs.shareLink + this.link;
+      } else {
+        content =
           this.configs.shareLink +
           getCurrentPages()[getCurrentPages().length - 1].__page__.fullPath;
-
+      }
       if (content === null || content === undefined) {
         content = "";
       } else content = content + "";
@@ -93,19 +100,24 @@ export default {
     },
     // #endif
 
+    shareTitle() {
+      let shareTitle;
+      if (this.type == "goods") {
+        shareTitle = `[好友推荐]${this.goodsName}快来跟我一起看看吧`;
+      } else if (this.type == "shops") {
+        shareTitle = `[好友发现]${this.goodsName}快来跟我一起看看吧`;
+      } else if (this.type == "pintuan") {
+        shareTitle = `[好友邀请]${this.goodsName}快来跟我一起抢购吧!`;
+      } else if (this.type == "kanjia") {
+        shareTitle = `[好友邀请]请快来帮我砍一刀${this.goodsName}`;
+      }
+      return shareTitle;
+    },
+
     // #ifdef APP-PLUS
     handleShare(val) {
+      console.log("12312312")
       if (val.type <= 1) {
-        let shareTitle;
-
-        if (this.type == "goods") {
-          shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
-        } else if (this.type == "shops") {
-          shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
-        } else if (this.type == "pintuan") {
-          shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
-        }
-
         let scene; //  "WXSenceTimeline 朋友圈   WXSceneSession 微信好友"
         val.type == 1
           ? (scene = "WXSenceTimeline")
@@ -113,11 +125,11 @@ export default {
         uni.share({
           provider: "weixin",
           scene: scene,
-          href: configs.downloadLink + this.link,
+          href: configs.shareLink + this.link,
           imageUrl: this.thumbnail,
           type: 0,
           summary: this.goodsName,
-          title: shareTitle,
+          title: this.shareTitle(),
           success: function (res) {
             uni.showToast({
               title: "分享成功!",

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/popups/popups.vue

@@ -0,0 +1,343 @@
+<template>
+  <view class="shadow" :class="!show?'':'shadow-show'" :style="{backgroundColor:show?maskBg:'rgba(0,0,0,0)'}" @tap="tapMask">
+    <view class="popups" :class="[theme]" :style="{top: popupsTop ,left: popupsLeft,flexDirection:direction}">
+      <text :class="dynPlace" :style="{width:'0px',height:'0px'}" v-if="triangle"></text>
+      <view v-for="(item,index) in popData" :key="index" @tap.stop="tapItem(item)" class="itemChild view" :class="[direction=='row'?'solid-right':'solid-bottom',item.disabled?'disabledColor':'']">
+        <u-icon size="35" :name="item.icon" v-if="item.icon"></u-icon><span class="title">{{item.title}}</span>
+      </view>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    maskBg: {
+      type: String,
+      default: "rgba(0,0,0,0)",
+    },
+    placement: {
+      type: String,
+      default: "default", //default top-start top-end bottom-start bottom-end
+    },
+    direction: {
+      type: String,
+      default: "column", //column row
+    },
+    x: {
+      type: Number,
+      default: 0,
+    },
+    y: {
+      type: Number,
+      default: 0,
+    },
+    value: {
+      type: Boolean,
+      default: false,
+    },
+    popData: {
+      type: Array,
+      default: () => [],
+    },
+    theme: {
+      type: String,
+      default: "light", //light dark
+    },
+    dynamic: {
+      type: Boolean,
+      default: false,
+    },
+    gap: {
+      type: Number,
+      default: 20,
+    },
+    triangle: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      popupsTop: "0rpx",
+      popupsLeft: "0rpx",
+      show: false,
+      dynPlace: "",
+    };
+  },
+  mounted() {
+    this.popupsPosition();
+  },
+  methods: {
+    tapMask() {
+      this.$emit("input", !this.value);
+    },
+    tapItem(item) {
+      if (item.disabled) return;
+      this.$emit("tapPopup", item);
+      this.$emit("input", !this.value);
+    },
+    getStatusBar() {
+      let promise = new Promise((resolve, reject) => {
+        uni.getSystemInfo({
+          success: function (e) {
+            let customBar;
+            // #ifdef H5
+
+            customBar = e.statusBarHeight + e.windowTop;
+
+            // #endif
+            resolve(customBar);
+          },
+        });
+      });
+      return promise;
+    },
+    async popupsPosition() {
+      let statusBar = await this.getStatusBar();
+      let promise = new Promise((resolve, reject) => {
+        let popupsDom = uni.createSelectorQuery().in(this).select(".popups");
+        popupsDom
+          .fields(
+            {
+              size: true,
+            },
+            (data) => {
+              let width = data.width;
+              let height = data.height;
+
+             
+
+              let y = this.dynamic
+                ? this.dynamicGetY(this.y, this.gap)
+                : this.transformRpx(this.y);
+
+              let x = this.dynamic
+                ? this.dynamicGetX(this.x, this.gap)
+                : this.transformRpx(this.x);
+
+              // #ifdef H5
+              y = this.dynamic
+                ? this.y + statusBar
+                : this.transformRpx(this.y + statusBar);
+              // #endif
+
+              this.dynPlace =
+                this.placement == "default"
+                  ? this.getPlacement(x, y)
+                  : this.placement;
+
+              switch (this.dynPlace) {
+                case "top-start":
+                  this.popupsTop = `${y + 9}rpx`;
+                  this.popupsLeft = `${x - 15}rpx`;
+                  break;
+                case "top-end":
+                  this.popupsTop = `${y + 9}rpx`;
+                  this.popupsLeft = `${x + 15 - width}rpx`;
+                  break;
+                case "bottom-start":
+                  this.popupsTop = `${y - 18 - height}rpx`;
+                  this.popupsLeft = `${x - 15}rpx`;
+                  break;
+                case "bottom-end":
+                  this.popupsTop = `${y - 9 - height}rpx`;
+                  this.popupsLeft = `${x + 15 - width}rpx`;
+                  break;
+              }
+              resolve();
+            }
+          )
+          .exec();
+      });
+      return promise;
+    },
+    getPlacement(x, y) {
+      let width = uni.getSystemInfoSync().windowWidth;
+      let height = uni.getSystemInfoSync().windowHeight;
+      if (x > width / 2 && y > height / 2) {
+        return "bottom-end";
+      } else if (x < width / 2 && y < height / 2) {
+        return "top-start";
+      } else if (x > width / 2 && y < height / 2) {
+        return "top-end";
+      } else if (x < width / 2 && y > height / 2) {
+        return "bottom-start";
+      } else if (x > width / 2) {
+        return "top-end";
+      } else {
+        return "top-start";
+      }
+    },
+    dynamicGetY(y, gap) {
+      let height = uni.getSystemInfoSync().windowHeight;
+      y = y < gap ? gap : y;
+      y = height - y < gap ? height - gap : y;
+
+      return y;
+    },
+    dynamicGetX(x, gap) {
+      let width = uni.getSystemInfoSync().windowWidth;
+      x = x < gap ? gap : x;
+      x = width - x < gap ? width - gap : x;
+      return x;
+    },
+    transformRpx(params) {
+      return (params * uni.getSystemInfoSync().screenWidth) / 375;
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler: async function (newVal, oldVal) {
+        if (newVal) await this.popupsPosition();
+        this.show = newVal;
+      },
+    },
+    placement: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        this.dynPlace = newVal;
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  margin-left: 20rpx;
+}
+.shadow {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  z-index: 9999;
+  transition: background 0.3s ease-in-out;
+  visibility: hidden;
+
+  &.shadow-show {
+    visibility: visible;
+  }
+}
+
+.popups {
+  position: absolute;
+  padding: 20rpx;
+  border-radius: 5px;
+  display: flex;
+  .view {
+    display: flex;
+    align-items: center;
+    padding: 15rpx 10rpx;
+    font-size: 25rpx;
+  }
+  .image {
+    display: inline-block;
+    vertical-align: middle;
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 20rpx;
+  }
+}
+.dark {
+  background-color: #4c4c4c;
+  color: #fff;
+  .top-start:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    left: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #4c4c4c;
+  }
+  .top-end:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    right: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #4c4c4c;
+  }
+  .bottom-start:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    left: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #4c4c4c transparent transparent;
+  }
+  .bottom-end:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    right: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #4c4c4c transparent transparent;
+  }
+  .disabledColor {
+    color: #c5c8ce;
+  }
+}
+.light {
+  color: #515a6e;
+  box-shadow: 0upx 0upx 30upx rgba(0, 0, 0, 0.2);
+  background: #fff;
+  .top-start:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    left: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #fff;
+  }
+  .top-end:after {
+    content: "";
+    position: absolute;
+    top: -18rpx;
+    right: 10rpx;
+    border-width: 0 20rpx 20rpx;
+    border-style: solid;
+    border-color: transparent transparent #fff;
+  }
+  .bottom-start:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    left: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #fff transparent transparent;
+  }
+  .bottom-end:after {
+    content: "";
+    position: absolute;
+    bottom: -18rpx;
+    right: 10rpx;
+    border-width: 20rpx 20rpx 0;
+    border-style: solid;
+    border-color: #fff transparent transparent;
+  }
+  .disabledColor {
+    color: #c5c8ce;
+  }
+}
+.solid-bottom {
+  border-bottom: 1px solid #f3f5f7;
+}
+.solid-right {
+  border-right: 1px solid #ccc;
+}
+.popups .itemChild:last-child {
+  border: none;
+}
+</style>

components/uni-badge/uni-badge.vue

@@ -1,151 +0,0 @@
-<template>
-	<text v-if="text" :class="inverted ? 'uni-badge--' + type + ' uni-badge--' + size + ' uni-badge--' + type + '-inverted' : 'uni-badge--' + type + ' uni-badge--' + size"
-	 :style="badgeStyle" class="uni-badge" @click="onClick()">{{ text }}</text>
-</template>
-
-<script>
-	/**
-	 * Badge 数字角标
-	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
-	 * @property {String} text 角标内容
-	 * @property {String} type = [default|primary|success|warning|error] 颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * @property {String} size = [normal|small] Badge 大小
-	 * 	@value normal 一般尺寸
-	 * 	@value small 小尺寸
-	 * @property {String} inverted = [true|false] 是否无需背景颜色
-	 * @event {Function} click 点击 Badge 触发事件
-	 * @example <uni-badge text="1"></uni-badge>
-	 */
-	export default {
-		name: 'UniBadge',
-		props: {
-			type: {
-				type: String,
-				default: 'default'
-			},
-			inverted: {
-				type: Boolean,
-				default: false
-			},
-			text: {
-				type: [String, Number],
-				default: ''
-			},
-			size: {
-				type: String,
-				default: 'normal'
-			}
-		},
-		data() {
-			return {
-				badgeStyle: ''
-			};
-		},
-		watch: {
-			text() {
-				this.setStyle()
-			}
-		},
-		mounted() {
-			this.setStyle()
-		},
-		methods: {
-			setStyle() {
-				this.badgeStyle = `width: ${String(this.text).length * 8 + 12}px`
-			},
-			onClick() {
-				this.$emit('click');
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$bage-size: 12px;
-	$bage-small: scale(0.8);
-	$bage-height: 20px;
-
-	.uni-badge {
-		/* #ifndef APP-PLUS */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		flex-direction: row;
-		height: $bage-height;
-		line-height: $bage-height;
-		color: $uni-text-color;
-		border-radius: 100px;
-		background-color: $uni-bg-color-hover;
-		background-color: transparent;
-		text-align: center;
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		font-size: $bage-size;
-		padding: 0px 6px;
-	}
-
-	.uni-badge--inverted {
-		padding: 0 5px 0 0;
-		color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default {
-		color: $uni-text-color;
-		background-color: $uni-bg-color-hover;
-	}
-
-	.uni-badge--default-inverted {
-		color: $uni-text-color-grey;
-		background-color: transparent;
-	}
-
-	.uni-badge--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-	}
-
-	.uni-badge--primary-inverted {
-		color: $uni-color-primary;
-		background-color: transparent;
-	}
-
-	.uni-badge--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-	}
-
-	.uni-badge--success-inverted {
-		color: $uni-color-success;
-		background-color: transparent;
-	}
-
-	.uni-badge--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-	}
-
-	.uni-badge--warning-inverted {
-		color: $uni-color-warning;
-		background-color: transparent;
-	}
-
-	.uni-badge--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-	}
-
-	.uni-badge--error-inverted {
-		color: $uni-color-error;
-		background-color: transparent;
-	}
-
-	.uni-badge--small {
-		transform: $bage-small;
-		transform-origin: center center;
-	}
-</style>

components/uni-drawer/uni-drawer.vue

@@ -1,170 +0,0 @@
-<template>
-	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
-		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
-		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Drawer 抽屉
-	 * @description 抽屉侧滑菜单
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
-	 * @property {Boolean} mask = [true | false] 是否显示遮罩
-	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
-	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
-	 * 	@value left 从左侧滑出
-	 * 	@value right 从右侧侧滑出
-	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
-	 * @event {Function} close 组件关闭时触发事件
-	 */
-	export default {
-		name: 'UniDrawer',
-		props: {
-			/**
-			 * 显示模式（左、右），只在初始化生效
-			 */
-			mode: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 蒙层显示状态
-			 */
-			mask: {
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 遮罩是否可点击关闭
-			 */
-			maskClick:{
-				type: Boolean,
-				default: true
-			},
-			/**
-			 * 抽屉宽度
-			 */
-			width: {
-				type: Number,
-				default: 220
-			}
-		},
-		data() {
-			return {
-				visibleSync: false,
-				showDrawer: false,
-				rightMode: false,
-				watchTimer: null,
-				drawerWidth: 220
-			}
-		},
-		created() {
-			// #ifndef APP-NVUE
-			this.drawerWidth = this.width
-			// #endif
-			this.rightMode = this.mode === 'right'
-		},
-		methods: {
-			clear(){},
-			close(type) {
-				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
-				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
-				this._change('showDrawer', 'visibleSync', false)
-			},
-			open() {
-				// fixed by mehaotian 处理重复点击打开的事件
-				if(this.visibleSync) return
-				this._change('visibleSync', 'showDrawer', true)
-			},
-			_change(param1, param2, status) {
-				this[param1] = status
-				if (this.watchTimer) {
-					clearTimeout(this.watchTimer)
-				}
-				this.watchTimer = setTimeout(() => {
-					this[param2] = status
-					this.$emit('change',status)
-				}, status ? 50 : 300)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	// 抽屉宽度
-	$drawer-width: 220px;
-
-	.uni-drawer {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		overflow: hidden;
-		z-index: 999;
-	}
-
-	.uni-drawer__content {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-		top: 0;
-		width: $drawer-width;
-		bottom: 0;
-		background-color: $uni-bg-color;
-		transition: transform 0.3s ease;
-	}
-
-	.uni-drawer--left {
-		left: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX(-$drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(-100%);
-		/* #endif */
-	}
-
-	.uni-drawer--right {
-		right: 0;
-		/* #ifdef APP-NVUE */
-		transform: translateX($drawer-width);
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		transform: translateX(100%);
-		/* #endif */
-	}
-
-	.uni-drawer__content--visible {
-		transform: translateX(0px);
-	}
-
-
-	.uni-drawer__mask {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 0;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		transition: opacity 0.3s;
-	}
-
-	.uni-drawer__mask--visible {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		opacity: 1;
-	}
-</style>

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-list-item/uni-list-item.vue

@@ -1,269 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell>
-		<!-- #endif -->
-		<view :class="disabled ? 'uni-list-item--disabled' : ''" :hover-class="disabled || showSwitch ? '' : 'uni-list-item--hover'" class="uni-list-item" @click="onClick">
-			<view class="uni-list-item__container" :class="{ 'uni-list-item--first': isFirstChild }">
-				<view v-if="thumb" class="uni-list-item__icon"><image :src="thumb" class="uni-list-item__icon-img" /></view>
-				<view v-else-if="showExtraIcon" class="uni-list-item__icon">
-					<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" class="uni-icon-wrapper" />
-				</view>
-				<view class="uni-list-item__content">
-					<slot name="left"></slot>
-					<text class="uni-list-item__content-title">{{ title }}</text>
-					<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
-				</view>
-				<view class="uni-list-item__extra">
-					<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
-					<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
-					<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked" @change="onSwitchChange" />
-					<slot name="right"></slot>
-					<uni-icons v-if="showArrow" :size="20" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-NVUE -->
-	</cell>
-	<!-- #endif -->
-</template>
-
-<script>
-import uniIcons from '../uni-icons/uni-icons.vue';
-import uniBadge from '../uni-badge/uni-badge.vue';
-
-/**
- * ListItem 列表子组件
- * @description 列表子组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=24
- * @property {String} title 标题
- * @property {String} note 描述
- * @property {String} thumb 左侧缩略图，若thumb有值，则不会显示扩展图标
- * @property {String} badgeText 数字角标内容
- * @property {String} badgeType 数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
- * @property {String} rightText 右侧文字内容
- * @property {Boolean} disabled = [true|false]是否禁用
- * @property {Boolean} showArrow = [true|false] 是否显示箭头图标
- * @property {Boolean} showBadge = [true|false] 是否显示数字角标
- * @property {Boolean} showSwitch = [true|false] 是否显示Switch
- * @property {Boolean} switchChecked = [true|false] Switch是否被选中
- * @property {Boolean} showExtraIcon = [true|false] 左侧是否显示扩展图标
- * @property {Boolean} scrollY = [true|false] 允许纵向滚动，需要显式的设置其宽高
- * @property {Object} extraIcon 扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
- * @event {Function} click 点击 uniListItem 触发事件
- * @event {Function} switchChange 点击切换 Switch 时触发
- */
-export default {
-	name: 'UniListItem',
-	components: {
-		uniIcons,
-		uniBadge
-	},
-	props: {
-		title: {
-			type: String,
-			default: ''
-		}, // 列表标题
-		note: {
-			type: String,
-			default: ''
-		}, // 列表描述
-		disabled: {
-			// 是否禁用
-			type: [Boolean, String],
-			default: false
-		},
-		showArrow: {
-			// 是否显示箭头
-			type: [Boolean, String],
-			default: true
-		},
-		showBadge: {
-			// 是否显示数字角标
-			type: [Boolean, String],
-			default: false
-		},
-		showSwitch: {
-			// 是否显示Switch
-			type: [Boolean, String],
-			default: false
-		},
-		switchChecked: {
-			// Switch是否被选中
-			type: [Boolean, String],
-			default: false
-		},
-		badgeText: {
-			// badge内容
-			type: String,
-			default: ''
-		},
-		badgeType: {
-			// badge类型
-			type: String,
-			default: 'success'
-		},
-		rightText: {
-			// 右侧文字内容
-			type: String,
-			default: ''
-		},
-		thumb: {
-			// 缩略图
-			type: String,
-			default: ''
-		},
-		showExtraIcon: {
-			// 是否显示扩展图标
-			type: [Boolean, String],
-			default: false
-		},
-		extraIcon: {
-			type: Object,
-			default() {
-				return {
-					type: 'contact',
-					color: '#000000',
-					size: 20
-				};
-			}
-		}
-	},
-	inject: ['list'],
-	data() {
-		return {
-			isFirstChild: false
-		};
-	},
-	mounted() {
-		if (!this.list.firstChildAppend) {
-			this.list.firstChildAppend = true;
-			this.isFirstChild = true;
-		}
-	},
-	methods: {
-		onClick() {
-			this.$emit('click');
-		},
-		onSwitchChange(e) {
-			this.$emit('switchChange', e.detail);
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
-
-.uni-list-item {
-	font-size: $uni-font-size-lg;
-	position: relative;
-	flex-direction: column;
-	justify-content: space-between;
-}
-
-.uni-list-item--disabled {
-	opacity: 0.3;
-}
-
-.uni-list-item--hover {
-	background-color: $uni-bg-color-hover;
-}
-
-.uni-list-item__container {
-	line-height: 48rpx;
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	padding: $list-item-pd;
-	padding-left: 0;
-	flex: 1;
-	position: relative;
-	justify-content: space-between;
-	align-items: center;
-	/* #ifdef APP-PLUS */
-	border-top-color: $uni-border-color;
-	border-top-style: solid;
-	border-top-width: 0.5px;
-	/* #endif */
-}
-
-.uni-list-item--first {
-	border-top-width: 0px;
-}
-
-/* #ifndef APP-NVUE */
-.uni-list-item__container:after {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-	background-color: $uni-border-color;
-}
-
-.uni-list-item--first:after {
-	height: 0px;
-}
-
-/* #endif */
-
-.uni-list-item__content {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex: 1;
-	overflow: hidden;
-	flex-direction: column;
-	color: #3b4144;
-}
-
-.uni-list-item__content-title {
-	font-size: $uni-font-size-base;
-	color: #3b4144;
-	overflow: hidden;
-}
-
-.uni-list-item__content-note {
-	margin-top: 6rpx;
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-	overflow: hidden;
-}
-
-.uni-list-item__extra {
-	// width: 25%;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	justify-content: flex-end;
-	align-items: center;
-}
-
-.uni-list-item__icon {
-	display: flex;
-	margin-right: 18rpx;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	
-	margin-left: 20rpx;
-}
-
-.uni-list-item__icon-img {
-	// height: $uni-img-size-base;
-	// width: $uni-img-size-base;
-	height: 38rpx;
-	width: 38rpx;
-}
-
-.uni-list-item__extra-text {
-	color: $uni-text-color-grey;
-	font-size: $uni-font-size-sm;
-}
-</style>

components/uni-list/uni-list.vue

@@ -1,75 +0,0 @@
-<template>
-	<!-- #ifndef APP-NVUE -->
-	<view class="uni-list">
-		<slot />
-	</view>
-	<!-- #endif -->
-	<!-- #ifdef APP-NVUE -->
-	<list class="uni-list" :enableBackToTop="enableBackToTop" loadmoreoffset="15" :scroll-y="scrollY" @loadmore="loadMore">
-		<slot />
-	</list>
-	<!-- #endif -->
-</template>
-
-<script>
-	/**
-	 * List 列表
-	 * @description 列表组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
-	 */
-	export default {
-		name: 'UniList',
-		'mp-weixin': {
-			options: {
-				multipleSlots: false
-			}
-		},
-		props: {
-			enableBackToTop: {
-				type: [Boolean, String],
-				default: false
-			},
-			scrollY: {
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		provide() {
-			return {
-				list: this
-			}
-		},
-		created() {
-			this.firstChildAppend = false
-		},
-		methods: {
-			loadMore(e) {
-				this.$emit("scrolltolower");
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-list {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		background-color: $uni-bg-color;
-		position: relative;
-		flex-direction: column;
-		// border-bottom-color: $uni-border-color;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-list:before {
-		height: 0;
-	}
-
-	.uni-list:after {
-		height: 0;
-	}
-
-	/* #endif */
-</style>

components/uni-list/uni-refresh.vue

@@ -1,65 +0,0 @@
-<template>
-    <!-- #ifdef APP-NVUE -->
-    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
-        <slot />
-    </refresh>
-    <!-- #endif -->
-    <!-- #ifndef APP-NVUE -->
-    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
-        <slot />
-    </view>
-    <!-- #endif -->
-</template>
-
-<script>
-    export default {
-        name: 'UniRefresh',
-        props: {
-            display: {
-                type: [String],
-                default: "hide"
-            }
-        },
-        data() {
-            return {
-                pulling: false
-            }
-        },
-        computed: {
-            isShow() {
-                if (this.display === "show" || this.pulling === true) {
-                    return true;
-                }
-                return false;
-            }
-        },
-        created() {},
-        methods: {
-            onchange(value) {
-                this.pulling = value;
-            },
-            onrefresh(e) {
-                this.$emit("refresh", e);
-            },
-            onpullingdown(e) {
-                // #ifdef APP-NVUE
-                this.$emit("pullingdown", e);
-                // #endif
-                // #ifndef APP-NVUE
-                var detail = {
-                    viewHeight: 90,
-                    pullingDistance: e.height
-                }
-                this.$emit("pullingdown", detail);
-                // #endif
-            }
-        }
-    }
-</script>
-
-<style>
-    .uni-refresh {
-        height: 0;
-        overflow: hidden;
-    }
-</style>

components/uni-list/uni-refresh.wxs

@@ -1,87 +0,0 @@
-var pullDown = {
-    threshold: 95,
-    maxHeight: 200,
-    callRefresh: 'onrefresh',
-    callPullingDown: 'onpullingdown',
-    refreshSelector: '.uni-refresh'
-};
-
-function ready(newValue, oldValue, ownerInstance, instance) {
-    var state = instance.getState()
-    state.canPullDown = newValue;
-    // console.log(newValue);
-}
-
-function touchStart(e, instance) {
-    var state = instance.getState();
-    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
-    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
-    if (!state.canPullDown) {
-        return
-    }
-
-    // console.log("touchStart");
-
-    state.height = 0;
-    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    state.refreshInstance.setStyle({
-        'height': 0
-    });
-    state.refreshInstance.callMethod("onchange", true);
-}
-
-function touchMove(e, ownerInstance) {
-    var instance = e.instance;
-    var state = instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    var oldHeight = state.height;
-    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
-    var height = endY - state.touchStartY;
-    if (height > pullDown.maxHeight) {
-        return;
-    }
-
-    var refreshInstance = state.refreshInstance;
-    refreshInstance.setStyle({
-        'height': height + 'px'
-    });
-
-    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
-    state.height = height;
-    refreshInstance.callMethod(pullDown.callPullingDown, {
-        height: height
-    });
-}
-
-function touchEnd(e, ownerInstance) {
-    var state = e.instance.getState();
-    if (!state.canPullDown) {
-        return
-    }
-
-    state.refreshInstance.callMethod("onchange", false);
-
-    var refreshInstance = state.refreshInstance;
-    if (state.height > pullDown.threshold) {
-        refreshInstance.callMethod(pullDown.callRefresh);
-        return;
-    }
-
-    refreshInstance.setStyle({
-        'height': 0
-    });
-}
-
-function propObserver(newValue, oldValue, instance) {
-    pullDown = newValue;
-}
-
-module.exports = {
-    touchmove: touchMove,
-    touchstart: touchStart,
-    touchend: touchEnd,
-    propObserver: propObserver
-}

components/uni-notice-bar/uni-notice-bar.vue

@@ -1,395 +0,0 @@
-<template>
-	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
-		<!-- #ifdef MP-ALIPAY -->
-		<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" @click="close">
-			<uni-icons type="closeempty" :color="color" size="12" />
-		</view>
-		<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
-			<uni-icons type="sound" :color="color" size="14" />
-		</view>
-		<!-- #endif -->
-		<!-- #ifndef MP-ALIPAY -->
-		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closeempty" :color="color"
-		 size="12" @click="close" />
-		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color"
-		 size="14" />
-		<!-- #endif -->
-		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
-			<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
-				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
-				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
-			</view>
-		</view>
-		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more" @click="clickMore">
-			<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
-			<uni-icons type="arrowright" :color="moreColor" size="14" />
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	// #ifdef APP-NVUE
-	const dom = weex.requireModule('dom');
-	const animation = weex.requireModule('animation');
-	// #endif
-
-	/**
-	 * NoticeBar 自定义导航栏
-	 * @description 通告栏组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
-	 * @property {Number} speed 文字滚动的速度，默认100px/秒
-	 * @property {String} text 显示文字
-	 * @property {String} backgroundColor 背景颜色
-	 * @property {String} color 文字颜色
-	 * @property {String} moreColor 查看更多文字的颜色
-	 * @property {String} moreText 设置“查看更多”的文本
-	 * @property {Boolean} single = [true|false] 是否单行
-	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
-	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
-	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
-	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
-	 * @event {Function} click 点击 NoticeBar 触发事件
-	 * @event {Function} close 关闭 NoticeBar 触发事件
-	 * @event {Function} getmore 点击”查看更多“时触发事件
-	 */
-
-	export default {
-		name: 'UniNoticeBar',
-		components: {
-			uniIcons
-		},
-		props: {
-			text: {
-				type: String,
-				default: ''
-			},
-			moreText: {
-				type: String,
-				default: ''
-			},
-			backgroundColor: {
-				type: String,
-				default: '#fffbe8'
-			},
-			speed: {
-				// 默认1s滚动100px
-				type: Number,
-				default: 100
-			},
-			color: {
-				type: String,
-				default: '#de8c17'
-			},
-			moreColor: {
-				type: String,
-				default: '#999999'
-			},
-			single: {
-				// 是否单行
-				type: [Boolean, String],
-				default: false
-			},
-			scrollable: {
-				// 是否滚动，添加后控制单行效果取消
-				type: [Boolean, String],
-				default: false
-			},
-			showIcon: {
-				// 是否显示左侧icon
-				type: [Boolean, String],
-				default: false
-			},
-			showGetMore: {
-				// 是否显示右侧查看更多
-				type: [Boolean, String],
-				default: false
-			},
-			showClose: {
-				// 是否显示左侧关闭按钮
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		data() {
-			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
-			return {
-				textWidth: 0,
-				boxWidth: 0,
-				wrapWidth: '',
-				webviewHide: false,
-				// #ifdef APP-NVUE
-				stopAnimation: false,
-				// #endif
-				elId: elId,
-				elIdBox: elIdBox,
-				show: true,
-				animationDuration: 'none',
-				animationPlayState: 'paused',
-				animationDelay: '0s'
-			}
-		},
-		mounted() {
-			// #ifdef APP-PLUS
-			var pages = getCurrentPages();
-			var page = pages[pages.length - 1];
-			var currentWebview = page.$getAppWebview();
-			currentWebview.addEventListener('hide',()=>{
-				this.webviewHide = true
-			})
-			currentWebview.addEventListener('show',()=>{
-				this.webviewHide = false
-			})
-			// #endif
-			this.$nextTick(() => {
-				this.initSize()
-			})
-		},
-		// #ifdef APP-NVUE
-		beforeDestroy() {
-			this.stopAnimation = true
-		},
-		// #endif
-		methods: {
-			initSize() {
-				if (this.scrollable) {
-					// #ifndef APP-NVUE
-					let query = [],
-						boxWidth = 0,
-						textWidth = 0;
-					let textQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elId}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.textWidth = ret[0].width
-								resolve()
-							})
-					})
-					let boxQuery = new Promise((resolve, reject) => {
-						uni.createSelectorQuery()
-							// #ifndef MP-ALIPAY
-							.in(this)
-							// #endif
-							.select(`#${this.elIdBox}`)
-							.boundingClientRect()
-							.exec(ret => {
-								this.boxWidth = ret[0].width
-								resolve()
-							})
-					})
-					query.push(textQuery)
-					query.push(boxQuery)
-					Promise.all(query).then(() => {
-						this.animationDuration = `${this.textWidth / this.speed}s`
-						this.animationDelay = `-${this.boxWidth / this.speed}s`
-						setTimeout(() => {
-							this.animationPlayState = 'running'
-						}, 1000)
-					})
-					// #endif
-					// #ifdef APP-NVUE
-					dom.getComponentRect(this.$refs['animationEle'], (res) => {
-						let winWidth = uni.getSystemInfoSync().windowWidth
-						this.textWidth = res.size.width
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${winWidth}px)`
-							},
-							duration: 0,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								animation.transition(this.$refs['animationEle'], {
-									styles: {
-										transform: `translateY(-${this.textWidth}px)`
-									},
-									timingFunction: 'linear',
-									duration: (this.textWidth - winWidth) / this.speed * 1000,
-									delay: 1000
-								}, () => {
-									if (!this.stopAnimation) {
-										this.loopAnimation()
-									}
-								});
-							}
-						});
-					})
-					// #endif
-				}
-				// #ifdef APP-NVUE
-				if (!this.scrollable && (this.single || this.moreText)) {
-					dom.getComponentRect(this.$refs['textBox'], (res) => {
-						this.wrapWidth = res.size.width
-					})
-				}
-				// #endif
-			},
-			loopAnimation() {
-				// #ifdef APP-NVUE
-				animation.transition(this.$refs['animationEle'], {
-					styles: {
-						transform: `translateY(0px)`
-					},
-					duration: 0
-				}, () => {
-					if (!this.stopAnimation) {
-						animation.transition(this.$refs['animationEle'], {
-							styles: {
-								transform: `translateY(-${this.textWidth}px)`
-							},
-							duration: this.textWidth / this.speed * 1000,
-							timingFunction: 'linear',
-							delay: 0
-						}, () => {
-							if (!this.stopAnimation) {
-								this.loopAnimation()
-							}
-						});
-					}
-				});
-				// #endif
-			},
-			clickMore() {
-				this.$emit('getmore')
-			},
-			close() {
-				this.show = false;
-				this.$emit('close')
-			},
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-	.uni-noticebar {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		box-sizing: border-box;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		padding: 6px 12px;
-		margin-bottom: 10px;
-	}
-
-	.uni-noticebar-close {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar-icon {
-		margin-right: 5px;
-	}
-
-	.uni-noticebar__content-wrapper {
-		flex: 1;
-		flex-direction: column;
-		overflow: hidden;
-	}
-
-	.uni-noticebar__content-wrapper--single {
-		/* #ifndef APP-NVUE */
-		line-height: 18px;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-wrapper--single,
-	.uni-noticebar__content-wrapper--scrollable {
-		flex-direction: row;
-	}
-
-	/* #ifndef APP-NVUE */
-	.uni-noticebar__content-wrapper--scrollable {
-		position: relative;
-		height: 18px;
-	}
-	/* #endif */
-
-	.uni-noticebar__content--scrollable {
-		/* #ifdef APP-NVUE */
-		flex: 0;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		flex: 1;
-		display: block;
-		overflow: hidden;
-		/* #endif */
-	}
-
-	.uni-noticebar__content--single {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex: none;
-		width: 100%;
-		justify-content: center;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text {
-		font-size: 14px;
-		line-height: 18px;
-		/* #ifndef APP-NVUE */
-		word-break: break-all;
-		/* #endif */
-	}
-
-	.uni-noticebar__content-text--single {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		display: block;
-		width: 100%;
-		white-space: nowrap;
-		/* #endif */
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.uni-noticebar__content-text--scrollable {
-		/* #ifdef APP-NVUE */
-		lines: 1;
-		padding-left: 750rpx;
-		/* #endif */
-		/* #ifndef APP-NVUE */
-		position: absolute;
-		display: block;
-		height: 18px;
-		line-height: 18px;
-		white-space: nowrap;
-		padding-left: 100%;
-		animation: notice 10s 0s linear infinite both;
-		animation-play-state: paused;
-		/* #endif */
-	}
-
-	.uni-noticebar__more {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: nowrap;
-		align-items: center;
-		padding-left: 5px;
-	}
-
-	.uni-noticebar__more-text {
-		font-size: 14px;
-	}
-
-	@keyframes notice {
-		100% {
-			transform: translate3d(-100%, 0, 0);
-		}
-	}
-</style>

components/uni-popup/message.js

@@ -1,29 +0,0 @@
-export default {
-	created() {
-		if (this.type === 'message') {
-			// 获取自组件对象
-			this.maskShow = false
-			this.children = null
-		}
-	},
-	created() {
-		if (this.type === 'message') {
-			// 不显示遮罩
-			this.maskShow = false 
-			// 获取子组件对象
-			this.childrenMsg = null
-		}
-	},
-	methods: {
-		customOpen() {
-			if (this.childrenMsg) {
-				this.childrenMsg.open()
-			}
-		},
-		customClose() {
-			if (this.childrenMsg) {
-				this.childrenMsg.close()
-			}
-		}
-	}
-}

components/uni-popup/popup.js

@@ -1,24 +0,0 @@
-import message from './message.js';
-// 定义 type 类型:弹出类型：top/bottom/center
-const config = {
-	// 顶部弹出
-	top:'top',
-	// 底部弹出
-	bottom:'bottom',
-	// 居中弹出
-	center:'center',
-	// 消息提示
-	message:'top',
-	// 对话框
-	dialog:'center',
-	// 分享
-	share:'bottom',
-}
-export default {
-	data(){
-		return {
-			config:config
-		}
-	},
-	mixins: [message],
-}

components/uni-popup/uni-popup-dialog.vue

@@ -1,243 +0,0 @@
-<template>
-	<view class="uni-popup-dialog">
-		<view class="uni-dialog-title">
-			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{title}}</text>
-		</view>
-		<view class="uni-dialog-content">
-			<text class="uni-dialog-content-text" v-if="mode === 'base'">{{content}}</text>
-			<input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus" >
-		</view>
-		<view class="uni-dialog-button-group">
-			<view class="uni-dialog-button" @click="close">
-				<text class="uni-dialog-button-text">取消</text>
-			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
-				<text class="uni-dialog-button-text uni-button-color">确定</text>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	/**
-	 * PopUp 弹出层-对话框样式
-	 * @description 弹出层-对话框样式
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} value input 模式下的默认值
-	 * @property {String} placeholder input 模式下输入提示
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} mode = [base|input] 模式、
-	 * 	@value base 基础对话框
-	 * 	@value input 可输入对话框
-	 * @property {String} content 对话框内容
-	 * @property {Boolean} beforeClose 是否拦截取消事件
-	 * @event {Function} confirm 点击确认按钮触发
-	 * @event {Function} close 点击取消按钮触发
-	 */
-
-	export default {
-		name: "uniPopupDialog",
-		props: {
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			placeholder: {
-				type: [String, Number],
-				default: '请输入内容'
-			},
-			/**
-			 * 对话框主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'error'
-			},
-			/**
-			 * 对话框模式 base/input
-			 */
-			mode: {
-				type: String,
-				default: 'base'
-			},
-			/**
-			 * 对话框标题
-			 */
-			title: {
-				type: String,
-				default: '提示'
-			},
-			/**
-			 * 对话框内容
-			 */
-			content: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 拦截取消事件 ，如果拦截取消事件，必须监听close事件，执行 done()
-			 */
-			beforeClose: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				dialogType: 'error',
-				focus: false,
-				val: ""
-			}
-		},
-		inject: ['popup'],
-		watch: {
-			type(val) {
-				this.dialogType = val
-			},
-			mode(val) {
-				if (val === 'input') {
-					this.dialogType = 'info'
-				}
-			},
-			value(val) {
-				this.val = val
-			}
-		},
-		created() {
-			// 对话框遮罩不可点击
-			this.popup.mkclick = false
-			if (this.mode === 'input') {
-				this.dialogType = 'info'
-				this.val = this.value
-			} else {
-				this.dialogType = this.type
-			}
-		},
-		mounted() {
-			this.focus = true
-		},
-		methods: {
-			/**
-			 * 点击确认按钮
-			 */
-			onOk() {
-				this.$emit('confirm', () => {
-					this.popup.close()
-					if (this.mode === 'input') this.val = this.value
-				}, this.mode === 'input' ? this.val : '')
-			},
-			/**
-			 * 点击取消按钮
-			 */
-			close() {
-				if (this.beforeClose) {
-					this.$emit('close', () => {
-						this.popup.close()
-					})
-					return
-				}
-				this.popup.close()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-popup-dialog {
-		width: 300px;
-		border-radius: 15px;
-		background-color: #fff;
-	}
-
-	.uni-dialog-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 15px;
-		padding-bottom: 5px;
-	}
-
-	.uni-dialog-title-text {
-		font-size: 16px;
-		font-weight: 500;
-	}
-
-	.uni-dialog-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 5px 15px 15px 15px;
-	}
-
-	.uni-dialog-content-text {
-		font-size: 14px;
-		color: #6e6e6e;
-	}
-
-	.uni-dialog-button-group {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		border-top-color: #f5f5f5;
-		border-top-style: solid;
-		border-top-width: 1px;
-	}
-
-	.uni-dialog-button {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		height: 45px;
-	}
-
-	.uni-border-left {
-		border-left-color: #f0f0f0;
-		border-left-style: solid;
-		border-left-width: 1px;
-	}
-
-	.uni-dialog-button-text {
-		font-size: 14px;
-	}
-
-	.uni-button-color {
-		color: $uni-color-primary;
-	}
-
-	.uni-dialog-input {
-		flex: 1;
-		font-size: 14px;
-	}
-
-	.uni-popup__success {
-		color: $uni-color-success;
-	}
-
-	.uni-popup__warn {
-		color: $uni-color-warning;
-	}
-
-	.uni-popup__error {
-		color: $uni-color-error;
-	}
-
-	.uni-popup__info {
-		color: #909399;
-	}
-</style>

components/uni-popup/uni-popup-message.vue

@@ -1,116 +0,0 @@
-<template>
-	<view class="uni-popup-message" :class="'uni-popup__'+[type]">
-		<text class="uni-popup-message-text" :class="'uni-popup__'+[type]+'-text'">{{message}}</text>
-	</view>
-</template>
-
-<script>
-	
-	/**
-	 * PopUp 弹出层-消息提示
-	 * @description 弹出层-消息提示
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [success|warning|info|error] 主题样式
-	 *  @value success 成功
-	 * 	@value warning 提示
-	 * 	@value info 消息
-	 * 	@value error 错误
-	 * @property {String} message 消息提示文字
-	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
-	 */
-	
-	export default {
-		name: 'UniPopupMessage',
-		props: {
-			/**
-			 * 主题 success/warning/info/error	  默认 success
-			 */
-			type: {
-				type: String,
-				default: 'success'
-			},
-			/**
-			 * 消息文字
-			 */
-			message: {
-				type: String,
-				default: ''
-			},
-			/**
-			 * 显示时间，设置为 0 则不会自动关闭
-			 */
-			duration: {
-				type: Number,
-				default: 3000
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {}
-		},
-		created() {
-			this.popup.childrenMsg = this
-		},
-		methods: {
-			open() {
-				if (this.duration === 0) return
-				clearTimeout(this.popuptimer)
-				this.popuptimer = setTimeout(() => {
-					this.popup.close()
-				}, this.duration)
-			},
-			close() {
-				clearTimeout(this.popuptimer)
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-message {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		background-color: #e1f3d8;
-		padding: 10px 15px;
-		border-color: #eee;
-		border-style: solid;
-		border-width: 1px;
-	}
-	.uni-popup-message-text {
-		font-size: 14px;
-		padding: 0;
-	}
-
-	.uni-popup__success {
-		background-color: #e1f3d8;
-	}
-
-	.uni-popup__success-text {
-		color: #67C23A;
-	}
-
-	.uni-popup__warn {
-		background-color: #faecd8;
-	}
-
-	.uni-popup__warn-text {
-		color: #E6A23C;
-	}
-
-	.uni-popup__error {
-		background-color: #fde2e2;
-	}
-
-	.uni-popup__error-text {
-		color: #F56C6C;
-	}
-
-	.uni-popup__info {
-		background-color: #F2F6FC;
-	}
-
-	.uni-popup__info-text {
-		color: #909399;
-	}
-</style>

components/uni-popup/uni-popup-share.vue

@@ -1,165 +0,0 @@
-<template>
-	<view class="uni-popup-share">
-		<view class="uni-share-title"><text class="uni-share-title-text">{{title}}</text></view>
-		<view class="uni-share-content">
-			<view class="uni-share-content-box">
-				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
-					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
-					<text class="uni-share-text">{{item.text}}</text>
-				</view>
-
-			</view>
-		</view>
-		<view class="uni-share-button-box">
-			<button class="uni-share-button" @click="close">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniPopupShare',
-		props: {
-			title: {
-				type: String,
-				default: '分享到'
-			}
-		},
-		inject: ['popup'],
-		data() {
-			return {
-				bottomData: [{
-						text: '微信',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-2.png',
-						name: 'wx'
-					},
-					{
-						text: '支付宝',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-8.png',
-						name: 'wx'
-					},
-					{
-						text: 'QQ',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/gird-3.png',
-						name: 'qq'
-					},
-					{
-						text: '新浪',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-1.png',
-						name: 'sina'
-					},
-					{
-						text: '百度',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-7.png',
-						name: 'copy'
-					},
-					{
-						text: '其他',
-						icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-5.png',
-						name: 'more'
-					}
-				]
-			}
-		},
-		created() {},
-		methods: {
-			/**
-			 * 选择内容
-			 */
-			select(item, index) {
-				this.$emit('select', {
-					item,
-					index
-				}, () => {
-					this.popup.close()
-				})
-			},
-			/**
-			 * 关闭窗口
-			 */
-			close() {
-				this.popup.close()
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup-share {
-		background-color: #fff;
-	}
-	.uni-share-title {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		height: 40px;
-	}
-	.uni-share-title-text {
-		font-size: 14px;
-		color: #666;
-	}
-	.uni-share-content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		padding-top: 10px;
-	}
-	
-	.uni-share-content-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		flex-wrap: wrap;
-		width: 360px;
-	}
-	
-	.uni-share-content-item {
-		width: 90px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		padding: 10px 0;
-		align-items: center;
-	}
-	
-	.uni-share-content-item:active {
-		background-color: #f5f5f5;
-	}
-	
-	.uni-share-image {
-		width: 30px;
-		height: 30px;
-	}
-	
-	.uni-share-text {
-		margin-top: 10px;
-		font-size: 14px;
-		color: #3B4144;
-	}
-	
-	.uni-share-button-box {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		padding: 10px 15px;
-	}
-	
-	.uni-share-button {
-		flex: 1;
-		border-radius: 50px;
-		color: #666;
-		font-size: 16px;
-	}
-	
-	.uni-share-button::after {
-		border-radius: 50px;
-	}
-</style>

components/uni-popup/uni-popup.vue

@@ -1,294 +0,0 @@
-<template>
-	<view v-if="showPopup" class="uni-popup" :class="[popupstyle]" @touchmove.stop.prevent="clear">
-		<uni-transition v-if="maskShow" :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans"
-		 @click="onTap" />
-		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
-			<view class="uni-popup__wrapper-box" @click.stop="clear">
-				<slot />
-			</view>
-		</uni-transition>
-	</view>
-</template>
-
-<script>
-	import uniTransition from '../uni-transition/uni-transition.vue'
-	import popup from './popup.js'
-	/**
-	 * PopUp 弹出层
-	 * @description 弹出层组件，为了解决遮罩弹层的问题
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
-	 * @property {String} type = [top|center|bottom] 弹出方式
-	 * 	@value top 顶部弹出
-	 * 	@value center 中间弹出
-	 * 	@value bottom 底部弹出
-	 * 	@value message 消息提示
-	 * 	@value dialog 对话框
-	 * 	@value share 底部分享示例
-	 * @property {Boolean} animation = [ture|false] 是否开启动画
-	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
-	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
-	 */
-
-	export default {
-		name: 'UniPopup',
-		components: {
-			uniTransition
-		},
-		props: {
-			// 开启动画
-			animation: {
-				type: Boolean,
-				default: true
-			},
-			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-			// message: 消息提示 ; dialog : 对话框
-			type: {
-				type: String,
-				default: 'center'
-			},
-			// maskClick
-			maskClick: {
-				type: Boolean,
-				default: true
-			}
-		},
-		provide() {
-			return {
-				popup: this
-			}
-		},
-		mixins: [popup],
-		watch: {
-			/**
-			 * 监听type类型
-			 */
-			type: {
-				handler: function(newVal) {
-					this[this.config[newVal]]()
-				},
-				immediate: true
-			},
-			/**
-			 * 监听遮罩是否可点击
-			 * @param {Object} val
-			 */
-			maskClick(val) {
-				this.mkclick = val
-			}
-		},
-		data() {
-			return {
-				duration: 300,
-				ani: [],
-				showPopup: false,
-				showTrans: false,
-				maskClass: {
-					'position': 'fixed',
-					'bottom': 0,
-					'top': 0,
-					'left': 0,
-					'right': 0,
-					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
-				},
-				transClass: {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				},
-				maskShow: true,
-				mkclick: true,
-				popupstyle: 'top'
-			}
-		},
-		created() {
-			this.mkclick = this.maskClick
-			if (this.animation) {
-				this.duration = 300
-			} else {
-				this.duration = 0
-			}
-		},
-		methods: {
-			clear(e) {
-				// TODO nvue 取消冒泡
-				e.stopPropagation()
-			},
-			open() {
-				this.showPopup = true
-				this.$nextTick(() => {
-					new Promise(resolve => {
-						clearTimeout(this.timer)
-						this.timer = setTimeout(() => {
-							this.showTrans = true
-							// fixed by mehaotian 兼容 app 端
-							this.$nextTick(() => {
-								resolve();
-							})
-						}, 50);
-					}).then(res => {
-						// 自定义打开事件
-						clearTimeout(this.msgtimer)
-						this.msgtimer = setTimeout(() => {
-							this.customOpen && this.customOpen()
-						}, 100)
-						this.$emit('change', {
-							show: true,
-							type: this.type
-						})
-					})
-				})
-			},
-			close(type) {
-				this.showTrans = false
-				this.$nextTick(() => {
-					this.$emit('change', {
-						show: false,
-						type: this.type
-					})
-					clearTimeout(this.timer)
-					// 自定义关闭事件
-					this.customOpen && this.customClose()
-					this.timer = setTimeout(() => {
-						this.showPopup = false
-					}, 300)
-				})
-			},
-			onTap() {
-				if (!this.mkclick) return
-				this.close()
-			},
-			/**
-			 * 顶部弹出样式处理
-			 */
-			top() {
-				this.popupstyle = 'top'
-				this.ani = ['slide-top']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-				}
-			},
-			/**
-			 * 底部弹出样式处理
-			 */
-			bottom() {
-				this.popupstyle = 'bottom'
-				this.ani = ['slide-bottom']
-				this.transClass = {
-					'position': 'fixed',
-					'left': 0,
-					'right': 0,
-					'bottom': 0
-				}
-			},
-			/**
-			 * 中间弹出样式处理
-			 */
-			center() {
-				this.popupstyle = 'center'
-				this.ani = ['zoom-out', 'fade']
-				this.transClass = {
-					'position': 'fixed',
-					/* #ifndef APP-NVUE */
-					'display': 'flex',
-					'flexDirection': 'column',
-					/* #endif */
-					'bottom': 0,
-					'left': 0,
-					'right': 0,
-					'top': 0,
-					'justifyContent': 'center',
-					'alignItems': 'center'
-				}
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-popup {
-		position: fixed;
-		/* #ifndef APP-NVUE */
-		z-index: 99;
-		/* #endif */
-	}
-
-	.uni-popup__mask {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: $uni-bg-color-mask;
-		opacity: 0;
-	}
-
-	.mask-ani {
-		transition-property: opacity;
-		transition-duration: 0.2s;
-	}
-
-	.uni-top-mask {
-		opacity: 1;
-	}
-
-	.uni-bottom-mask {
-		opacity: 1;
-	}
-
-	.uni-center-mask {
-		opacity: 1;
-	}
-
-	.uni-popup__wrapper {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: absolute;
-	}
-
-	.top {
-		/* #ifdef H5 */
-		top: var(--window-top);
-		/* #endif */
-		/* #ifndef H5 */
-		top: 0;
-		/* #endif */
-	}
-
-	.bottom {
-		bottom: 0;
-	}
-
-	.uni-popup__wrapper-box {
-		/* #ifndef APP-NVUE */
-		display: block;
-		/* #endif */
-		position: relative;
-		/* iphonex 等安全区设置，底部安全区适配 */
-		/* #ifndef APP-NVUE */
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-	}
-
-	.content-ani {
-		// transition: transform 0.3s;
-		transition-property: transform, opacity;
-		transition-duration: 0.2s;
-	}
-
-
-	.uni-top-content {
-		transform: translateY(0);
-	}
-
-	.uni-bottom-content {
-		transform: translateY(0);
-	}
-
-	.uni-center-content {
-		transform: scale(1);
-		opacity: 1;
-	}
-</style>

components/uni-section/uni-section.vue

@@ -1,135 +0,0 @@
-<template>
-	<view class="uni-section" nvue>
-		<view v-if="type" class="uni-section__head">
-			<view :class="type" class="uni-section__head-tag" />
-		</view>
-		<view class="uni-section__content">
-			<text :class="{'distraction':!subTitle}" class="uni-section__content-title">{{ title }}</text>
-			<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
-		</view>
-		<slot />
-	</view>
-</template>
-
-<script>
-
-	/**
-	 * Section 标题栏
-	 * @description 标题栏
-	 * @property {String} type = [line|circle] 标题装饰类型
-	 * 	@value line 竖线
-	 * 	@value circle 圆形
-	 * @property {String} title 主标题
-	 * @property {String} subTitle 副标题
-	 */
-
-	export default {
-		name: 'UniTitle',
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			title: {
-				type: String,
-				default: ''
-			},
-			subTitle: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {}
-		},
-		watch: {
-			title(newVal) {
-				if (uni.report && newVal !== '') {
-					uni.report('title', newVal)
-				}
-			}
-		},
-		methods: {
-			onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.uni-section {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		margin-top: 10px;
-		flex-direction: row;
-		align-items: center;
-		padding: 0 10px;
-		height: 50px;
-		background-color: $uni-bg-color-grey;
-		/* #ifdef APP-NVUE */
-		border-bottom-color: $uni-border-color;
-		border-bottom-style: solid;
-		border-bottom-width: 0.5px;
-		/* #endif */
-		font-weight: normal;
-	}
-	/* #ifndef APP-NVUE */
-	.uni-section:after {
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		left: 0;
-		height: 1px;
-		content: '';
-		-webkit-transform: scaleY(.5);
-		transform: scaleY(.5);
-		background-color: $uni-border-color;
-	}
-	/* #endif */
-
-	.uni-section__head {
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		margin-right: 10px;
-	}
-
-	.line {
-		height: 15px;
-		background-color: $uni-text-color-disable;
-		border-radius: 5px;
-		width: 3px;
-	}
-
-	.circle {
-		width: 8px;
-		height: 8px;
-		border-top-right-radius: 50px;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		border-bottom-right-radius: 50px;
-		background-color: $uni-text-color-disable;
-	}
-
-	.uni-section__content {
-		flex: 1;
-		color: $uni-text-color;
-	}
-
-	.uni-section__content-title {
-		font-size: $uni-font-size-base;
-		color: $uni-text-color;
-	}
-
-	.distraction {
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-section__content-sub {
-		font-size: $uni-font-size-sm;
-		color: $uni-text-color-grey;
-	}
-</style>

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/uni-steps/uni-steps.vue

@@ -1,253 +0,0 @@
-<template>
-	<view class="uni-steps">
-		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
-			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
-				<view v-for="(item,index) in options" :key="index" :class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
-					<text :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
-					<text v-if="direction=='column'" :style="{color:index<=active?activeColor:deactiveColor}" :class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
-				</view>
-			</view>
-			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
-				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']" v-for="(item,index) in options"
-				 :key="index">
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
-					 :style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']" v-if="index === active">
-						<uni-icons :color="activeColor" type="checkbox-filled" size="14"></uni-icons>
-					</view>
-					<view :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']" v-else :style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
-					<view :class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
-					 :style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}"></view>
-					<!-- <view v-if="index==0 && direction!='column'" class="address">北京市</view>
-					<view v-if="options.length-1 == index && direction!='column'" class="address">太原市</view> -->
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import uniIcons from '../uni-icons/uni-icons.vue'
-	export default {
-		name: 'UniSteps',
-		components: {
-			uniIcons
-		},
-		props: {
-			direction: {
-				// 排列方向 row column
-				type: String,
-				default: 'row'
-			},
-			activeColor: {
-				// 激活状态颜色
-				type: String,
-				default: '#1aad19'
-			},
-			deactiveColor: {
-				// 未激活状态颜色
-				type: String,
-				default: '#999999'
-			},
-			active: {
-				// 当前步骤
-				type: Number,
-				default: 0
-			},
-			options: {
-				type: Array,
-				default () {
-					return []
-				}
-			} // 数据
-		},
-		data() {
-			return {}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-steps {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		width: 100%;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		flex: 1;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__column {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row-reverse;
-	}
-
-	.uni-steps__row-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-text-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-	}
-
-	.uni-steps__row-text {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.uni-steps__column-text {
-		padding: 6px 0px;
-		// border-bottom-style: solid;
-		// border-bottom-width: 1px;
-		// border-bottom-color: $uni-border-color;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-	}
-
-	.uni-steps__row-title {
-		font-size: 24rpx;
-		line-height: 16px;
-		text-align: center;
-	}
-
-	.uni-steps__column-title {
-		font-size: 24rpx;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-desc {
-		font-size: 12px;
-		line-height: 14px;
-		text-align: center;
-	}
-
-	.uni-steps__column-desc {
-		font-size: $uni-font-size-sm;
-		text-align: left;
-		line-height: 18px;
-	}
-
-	.uni-steps__row-container {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-	}
-
-	.uni-steps__column-container {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		width: 30px;
-		flex-direction: column;
-	}
-
-	.uni-steps__row-line-item {
-		/* #ifndef APP-NVUE */
-		display: inline-flex;
-		/* #endif */
-		flex-direction: row;
-		flex: 1;
-		height: 14px;
-		line-height: 14px;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		.address{
-			position: absolute;
-			top: 40rpx;
-			left: 60rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
-
-	.uni-steps__column-line-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		flex: 1;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-steps__row-line {
-		flex: 1;
-		height: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__column-line {
-		width: 1px;
-		background-color: $uni-text-color-grey;
-	}
-
-	.uni-steps__row-line--after {
-		transform: translateX(1px);
-	}
-
-	.uni-steps__column-line--after {
-		flex: 1;
-		transform: translate(0px, 1px);
-	}
-
-	.uni-steps__row-line--before {
-		transform: translateX(-1px);
-	}
-
-	.uni-steps__column-line--before {
-		height: 6px;
-		transform: translate(0px, -1px);
-	}
-
-	.uni-steps__row-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 0px 3px;
-	}
-
-	.uni-steps__column-circle {
-		width: 5px;
-		height: 5px;
-		border-radius: 100px;
-		background-color: $uni-text-color-grey;
-		margin: 4px 0px 5px 0px;
-	}
-
-	.uni-steps__row-check {
-		margin: 0px 6px;
-	}
-
-	.uni-steps__column-check {
-		height: 14px;
-		line-height: 14px;
-		margin: 2px 0px;
-	}
-</style>

components/uni-swiper-dot/uni-swiper-dot.vue

@@ -1,184 +0,0 @@
-<template>
-	<view class="uni-swiper__warp">
-		<slot />
-		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
-			<view v-for="(item,index) in info" :style="{
-        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/3 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
-		</view>
-		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
-			<view v-for="(item,index) in info" :style="{
-        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item" />
-		</view>
-		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
-			<view v-for="(item,index) in info" :class="[index === current&&'uni-swiper__dots-long']" :style="{
-		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item " />
-		</view>
-		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
-			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
-		</view>
-		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
-			<view v-for="(item,index) in info" :style="{
-        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'UniSwiperDot',
-		props: {
-			info: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			current: {
-				type: Number,
-				default: 0
-			},
-			dotsStyles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 类型 ：default(默认) indexes long nav
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			// 只在 nav 模式下生效，变量名称
-			field: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				dots: {
-					width: 8,
-					height: 8,
-					bottom: 10,
-					color: '#fff',
-					backgroundColor: 'rgba(0, 0, 0, .3)',
-					border: '1px rgba(0, 0, 0, .3) solid',
-					selectedBackgroundColor: '#333',
-					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
-				}
-			}
-		},
-		watch: {
-			dotsStyles(newVal) {
-				this.dots = Object.assign(this.dots, this.dotsStyles)
-			},
-			mode(newVal) {
-				if (newVal === 'indexes') {
-					this.dots.width = 20
-					this.dots.height = 20
-				} else {
-					this.dots.width = 8
-					this.dots.height = 8
-				}
-			}
-
-		},
-		created() {
-			if (this.mode === 'indexes') {
-				this.dots.width = 20
-				this.dots.height = 20
-			}
-			this.dots = Object.assign(this.dots, this.dotsStyles)
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-swiper__warp {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.uni-swiper__dots-box {
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-item {
-		width: 8px;
-		border-radius: 100px;
-		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
-		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
-	}
-	
-	.uni-swiper__dots-item:first-child {
-		margin: 0;
-	}
-
-	.uni-swiper__dots-default {
-		border-radius: 100px;
-	}
-
-	.uni-swiper__dots-long {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-bar {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-nav {
-		bottom: 0px;
-		height: 40px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		background-color: rgba(0, 0, 0, 0.2);
-	}
-
-	.uni-swiper__dots-nav-item {
-		/* overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; */
-		font-size: $uni-font-size-base;
-		color: #fff;
-		margin: 0 15px;
-	}
-
-	.uni-swiper__dots-indexes {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex: 1;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-indexes-text {
-		color: #fff;
-		font-size: $uni-font-size-sm;
-	}
-</style>

components/uni-tag/uni-tag.vue

@@ -1,230 +0,0 @@
-<template>
-	<view :class="[
-      'uni-tag--' + type,
-      disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
-      inverted === true || inverted === 'true' ? type + '-uni-tag--inverted' : '',
-      circle === true || circle === 'true' ? 'uni-tag--circle' : '',
-      mark === true || mark === 'true' ? 'uni-tag--mark' : '',
-      'uni-tag--' + size
-    ]"
-	 @click="onClick()" class="uni-tag" v-if="text">
-		<text :class="[type === 'default' ? 'uni-tag--default':'uni-tag-text',inverted === true || inverted === 'true' ? 'uni-tag-text--'+type : '',size === 'small' ? 'uni-tag-text--small':'' ]">{{ text }}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Tag 标签
-	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
-	 * @property {String} text 标签内容
-	 * @property {String} size = [normal|small] 大小尺寸
-	 * 	@value normal 正常
-	 * 	@value small 小尺寸
-	 * @property {String} type = [default|primary|success｜warning｜error｜royal]  颜色类型
-	 * 	@value default 灰色
-	 * 	@value primary 蓝色
-	 * 	@value success 绿色
-	 * 	@value warning 黄色
-	 * 	@value error 红色
-	 * 	@value royal 紫色
-	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
-	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
-	 * @property {Boolean} circle = [true|false] 是否为圆角
-	 * @event {Function} click 点击 Tag 触发事件
-	 */
-
-	export default {
-		name: "UniTag",
-		props: {
-			type: {
-				// 标签类型default、primary、success、warning、error、royal
-				type: String,
-				default: "default"
-			},
-			size: {
-				// 标签大小 normal, small
-				type: String,
-				default: "normal"
-			},
-			// 标签内容
-			text: {
-				type: String,
-				default: ""
-			},
-			disabled: {
-				// 是否为禁用状态
-				type: [Boolean, String],
-				default: false
-			},
-			inverted: {
-				// 是否为空心
-				type: [Boolean, String],
-				default: false
-			},
-			circle: {
-				// 是否为圆角样式
-				type: [Boolean, String],
-				default: false
-			},
-			mark: {
-				// 是否为标记样式
-				type: [Boolean, String],
-				default: false
-			}
-		},
-		methods: {
-			onClick() {
-				if (this.disabled === true || this.disabled === "true") {
-					return;
-				}
-				this.$emit("click");
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	$tag-pd: 0px 16px;
-	$tag-small-pd: 0px 8px;
-
-	.uni-tag {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		padding: $tag-pd;
-		height: 30px;
-		line-height: 30px;
-		justify-content: center;
-		color: $uni-text-color;
-		border-radius: $uni-border-radius-base;
-		background-color: $uni-bg-color-grey;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-
-	.uni-tag--circle {
-		border-radius: 15px;
-	}
-
-	.uni-tag--mark {
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-top-right-radius: 15px;
-		border-bottom-right-radius: 15px;
-	}
-
-	.uni-tag--disabled {
-		opacity: 0.5;
-	}
-
-	.uni-tag--small {
-		height: 20px;
-		padding: $tag-small-pd;
-		line-height: 20px;
-		font-size: $uni-font-size-sm;
-	}
-
-	.uni-tag--default {
-		color: $uni-text-color;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--small {
-		font-size: $uni-font-size-sm !important;
-	}
-
-	.uni-tag-text {
-		color: $uni-text-color-inverse;
-		font-size: $uni-font-size-base;
-	}
-
-	.uni-tag-text--primary {
-		color: $uni-color-primary !important;
-	}
-
-	.uni-tag-text--success {
-		color: $uni-color-success !important;
-	}
-
-	.uni-tag-text--warning {
-		color: $uni-color-warning !important;
-	}
-
-	.uni-tag-text--error {
-		color: $uni-color-error !important;
-	}
-
-	.uni-tag--primary {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-primary;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.primary-uni-tag--inverted {
-		color: $uni-color-primary;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-primary;
-	}
-
-	.uni-tag--success {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-success;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.success-uni-tag--inverted {
-		color: $uni-color-success;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-success;
-	}
-
-	.uni-tag--warning {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-warning;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.warning-uni-tag--inverted {
-		color: $uni-color-warning;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-warning;
-	}
-
-	.uni-tag--error {
-		color: $uni-text-color-inverse;
-		background-color: $uni-color-error;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.error-uni-tag--inverted {
-		color: $uni-color-error;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-color-error;
-	}
-
-	.uni-tag--inverted {
-		color: $uni-text-color;
-		background-color: $uni-bg-color;
-		border-width: 1rpx;
-		border-style: solid;
-		border-color: $uni-bg-color-grey;
-	}
-</style>

components/uni-transition/uni-transition.vue

@@ -1,279 +0,0 @@
-<template>
-	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject"
-	 @click="change">
-		 <slot></slot>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const animation = uni.requireNativePlugin('animation');
-	// #endif
-	/**
-	 * Transition 过渡动画
-	 * @description 简单过渡动画组件
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
-	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
-     * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
-     *  @value fade 渐隐渐出过渡
-     *  @value slide-top 由上至下过渡
-     *  @value slide-right 由右至左过渡
-     *  @value slide-bottom 由下至上过渡
-     *  @value slide-left 由左至右过渡
-     *  @value zoom-in 由小到大过渡
-     *  @value zoom-out 由大到小过渡
-	 * @property {Number} duration 过渡动画持续时间
-	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
-	 */
-	export default {
-		name: 'uniTransition',
-		props: {
-			show: {
-				type: Boolean,
-				default: false
-			},
-			modeClass: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			duration: {
-				type: Number,
-				default: 300
-			},
-			styles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				isShow: false,
-				transform: '',
-				ani: { in: '',
-					active: ''
-				}
-			};
-		},
-		watch: {
-			show: {
-				handler(newVal) {
-					if (newVal) {
-						this.open()
-					} else {
-						this.close()
-					}
-				},
-				immediate: true
-			}
-		},
-		computed: {
-			stylesObject() {
-				let styles = {
-					...this.styles,
-					'transition-duration': this.duration / 1000 + 's'
-				}
-				let transfrom = ''
-				for (let i in styles) {
-					let line = this.toLine(i)
-					transfrom += line + ':' + styles[i] + ';'
-				}
-				return transfrom
-			}
-		},
-		created() {
-			// this.timer = null
-			// this.nextTick = (time = 50) => new Promise(resolve => {
-			// 	clearTimeout(this.timer)
-			// 	this.timer = setTimeout(resolve, time)
-			// 	return this.timer
-			// });
-		},
-		methods: {
-			change() {
-				this.$emit('click', {
-					detail: this.isShow
-				})
-			},
-			open() {
-				clearTimeout(this.timer)
-				this.isShow = true
-				this.transform = ''
-				this.ani.in = ''
-				for (let i in this.getTranfrom(false)) {
-					if (i === 'opacity') {
-						this.ani.in = 'fade-in'
-					} else {
-						this.transform += `${this.getTranfrom(false)[i]} `
-					}
-				}
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this._animation(true)
-					}, 50)
-				})
-
-			},
-			close(type) {
-				clearTimeout(this.timer)
-				this._animation(false)
-			},
-			_animation(type) {
-				let styles = this.getTranfrom(type)
-				// #ifdef APP-NVUE
-				if(!this.$refs['ani']) return
-				animation.transition(this.$refs['ani'].ref, {
-					styles,
-					duration: this.duration, //ms
-					timingFunction: 'ease',
-					needLayout: false,
-					delay: 0 //ms
-				}, () => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-				// #endif
-				// #ifndef APP-NVUE
-				this.transform = ''
-				for (let i in styles) {
-					if (i === 'opacity') {
-						this.ani.in = `fade-${type?'out':'in'}`
-					} else {
-						this.transform += `${styles[i]} `
-					}
-				}
-				this.timer = setTimeout(() => {
-					if (!type) {
-						this.isShow = false
-					}
-					this.$emit('change', {
-						detail: this.isShow
-					})
-
-				}, this.duration)
-				// #endif
-
-			},
-			getTranfrom(type) {
-				let styles = {
-					transform: ''
-				}
-				this.modeClass.forEach((mode) => {
-					switch (mode) {
-						case 'fade':
-							styles.opacity = type ? 1 : 0
-							break;
-						case 'slide-top':
-							styles.transform += `translateY(${type?'0':'-100%'}) `
-							break;
-						case 'slide-right':
-							styles.transform += `translateX(${type?'0':'100%'}) `
-							break;
-						case 'slide-bottom':
-							styles.transform += `translateY(${type?'0':'100%'}) `
-							break;
-						case 'slide-left':
-							styles.transform += `translateX(${type?'0':'-100%'}) `
-							break;
-						case 'zoom-in':
-							styles.transform += `scale(${type?1:0.8}) `
-							break;
-						case 'zoom-out':
-							styles.transform += `scale(${type?1:1.2}) `
-							break;
-					}
-				})
-				return styles
-			},
-			_modeClassArr(type) {
-				let mode = this.modeClass
-				if (typeof(mode) !== "string") {
-					let modestr = ''
-					mode.forEach((item) => {
-						modestr += (item + '-' + type + ',')
-					})
-					return modestr.substr(0, modestr.length - 1)
-				} else {
-					return mode + '-' + type
-				}
-			},
-			// getEl(el) {
-			// 	console.log(el || el.ref || null);
-			// 	return el || el.ref || null
-			// },
-			toLine(name) {
-				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
-			}
-		}
-	}
-</script>
-
-<style>
-	.uni-transition {
-		transition-timing-function: ease;
-		transition-duration: 0.3s;
-		transition-property: transform, opacity;
-	}
-
-	.fade-in {
-		opacity: 0;
-	}
-
-	.fade-active {
-		opacity: 1;
-	}
-
-	.slide-top-in {
-		/* transition-property: transform, opacity; */
-		transform: translateY(-100%);
-	}
-
-	.slide-top-active {
-		transform: translateY(0);
-		/* opacity: 1; */
-	}
-
-	.slide-right-in {
-		transform: translateX(100%);
-	}
-
-	.slide-right-active {
-		transform: translateX(0);
-	}
-
-	.slide-bottom-in {
-		transform: translateY(100%);
-	}
-
-	.slide-bottom-active {
-		transform: translateY(0);
-	}
-
-	.slide-left-in {
-		transform: translateX(-100%);
-	}
-
-	.slide-left-active {
-		transform: translateX(0);
-		opacity: 1;
-	}
-
-	.zoom-in-in {
-		transform: scale(0.8);
-	}
-
-	.zoom-out-active {
-		transform: scale(1);
-	}
-
-	.zoom-out-in {
-		transform: scale(1.2);
-	}
-</style>

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,46 +89,27 @@
           }}</text>
         </movable-area>
         <view class="flex-row-around padding-top" style="width: 100%">
-          <view @click="hide" class="cuIcon-close" style="font-size: 50rpx; color: #e25915">
-          </view>
+          <u-icon
+            @click="hide"
+            :color="mainColor"
+            size="40"
+            name="close"
+          ></u-icon>
 
           <text class="cu-tag bg-cyan round" @click="getCode">刷新拼图</text>
-          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1">Lili-FRAMEWORK</text>
-        </view>
-      </view>
-    </view>
-    <!-- <view
-      @click="hide"
-      v-show="flage"
-      class="flex-row-around"
-      style="border-radius: 10rpx; background-color: #ebebeb"
-      :style="{
-        width: width,
-        height: height,
-        'margin-left': left,
-        'margin-top': top,
-      }"
-      :class="vsr ? 'border-index' : ''"
-    >
-      <view class="flex-row-center" style="width: 45rpx; height: 45rpx">
-        <view v-show="!vsr" class="dh-wt"> </view>
-        <view
-          v-show="vsr"
-          class="cuIcon-roundcheck"
-          style="font-size: 45rpx; color: #07c160"
+          <text class="my-neirong-sm cuIcon-safe" style="color: #c1c1c1"
+            >Lili-FRAMEWORK</text
           >
         </view>
       </view>
-      <text :class="vsr ? 'ttcl' : ''" style="color: #5a5a5a">{{ vsrtx }}</text>
-      <view class="cuIcon-safe text-gray"> </view>
-    </view> -->
+    </view>
   </view>
 </template>
 
 <script>
 import api from "@/config/api.js";
 import storage from "@/utils/storage.js";
-
+import uuid from "@/utils/uuid.modified.js";
 const phone = uni.getSystemInfoSync();
 const l = phone.screenWidth / 750;
 export default {
@@ -89,12 +118,6 @@ export default {
     // 可自行调整
     this.scHight = phone.screenHeight / 2 - 200 + "px";
     this.getCode();
-    // 监听是否要重新验证
-    uni.$on("vert", (data) => {
-      this.vsr = data;
-      this.vsrtx = "点击进行验证";
-      this.getCode();
-    });
   },
   props: {
     height: {
@@ -120,6 +143,7 @@ export default {
   },
   data() {
     return {
+      mainColor: this.$mainColor,
       flage: false,
       key: "", //key
       vsrtx: "点击进行验证", //按钮提示语
@@ -160,12 +184,21 @@ export default {
         this.hid = !this.hid;
       }
     },
+    error() {
+      this.vsr = false;
+      this.hid = false;
+      this.moveX = 0;
+      this.moveCode = 0;
+    },
     // 获取验证图片
     getCode() {
       this.col = "#b3afae";
       this.hasImg = "图片加载中...";
+      if (!storage.getUuid()) {
+        storage.setUuid(uuid.v1());
+      }
       uni.request({
-        url: api.common + "/slider/" + this.business,
+        url: api.common + "/common/slider/" + this.business,
         header: {
           uuid: storage.getUuid(),
         },
@@ -200,7 +233,7 @@ export default {
         method: "POST",
         url:
           api.common +
-          "/slider/" +
+          "/common/slider/" +
           this.business +
           "?xPos=" +
           parseInt(this.moveCode * this.tl),
@@ -209,13 +242,12 @@ export default {
         },
         success: (res) => {
           this.endLoad = true;
-
           res.data.result == false
             ? (res.data.result = false)
             : (res.data.result = true);
 
           if (res.data && res.data.result) {
-            // // 验证成功后把key发送出去,后端会把验证信息存在缓存里
+            //验证成功后把key发送出去,后端会把验证信息存在缓存里
             this.$emit("send", this.key);
             this.hide();
             this.vsr = true;
@@ -274,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);
@@ -336,30 +364,6 @@ export default {
   width: 750rpx;
 }
 
-.border-bom {
-  border-bottom: 0.5rpx solid #dddddd;
-}
-
-.border-red {
-  border-bottom: 1rpx solid #d33e18;
-}
-
-.border-bom-big {
-  border-bottom: 8rpx solid #dddddd;
-}
-
-.border-bom-white {
-  border-bottom: 2rpx solid #ffffff;
-}
-
-.border-bom-green {
-  border-bottom: 4rpx solid #f8f9bd;
-}
-
-.border-bom-index {
-  border-bottom: 4rpx solid #27d9b3;
-}
-
 .padding-left {
   padding-left: 20rpx;
 }
@@ -389,33 +393,6 @@ export default {
   margin-top: -35rpx;
 }
 
-.lk-tag {
-  height: 50rpx;
-  padding: 0 10rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 2rpx solid #24bd9f;
-  border-radius: 6rpx;
-  color: #1c947a;
-  font-weight: 500;
-}
-
-.tb-tag-my {
-  border-radius: 15rpx;
-  font-size: 16rpx;
-  margin-left: 5rpx;
-}
-
-.my-green {
-  color: #29c7a5;
-}
-
-.my-hui {
-  color: #585858;
-  font-size: 22rpx;
-}
-
 .flex-column-center {
   display: flex;
   flex-direction: column;
@@ -524,76 +501,10 @@ export default {
   bottom: 70rpx;
 }
 
-.white-box {
-  padding: 0 20rpx;
-  margin-bottom: 15rpx;
-  margin-top: 5rpx;
-  width: 715rpx;
-  background-color: #ffffff;
-  border-radius: 30rpx;
-}
-
-.green-box {
-  padding: 0 20rpx;
-  margin-bottom: 15rpx;
-  margin-top: 5rpx;
-  width: 715rpx;
-  background-color: #ffffff;
-  border-radius: 30rpx;
-  background-image: linear-gradient(#1faf97, #29c7a5);
-}
-
-.yuan-sm {
-  width: 13rpx;
-  height: 13rpx;
-  border-radius: 50%;
-  background-color: #1fc189;
-  margin-left: 10rpx;
-}
-
-.yuan-normal {
-  width: 14rpx;
-  height: 14rpx;
-  border-radius: 50%;
-  background-color: #159f3c;
-  margin-left: 10rpx;
-}
-
-.yuan-normal-red {
-  width: 14rpx;
-  height: 14rpx;
-  border-radius: 50%;
-  background-color: #bc3c11;
-  margin-left: 10rpx;
-}
-
-.yuan-sm-red {
-  width: 13rpx;
-  height: 13rpx;
-  border-radius: 50%;
-  background-color: #de410d;
-  margin-left: 10rpx;
-}
-
-.white-box-all {
-  margin-top: 5rpx;
-  width: 750rpx;
-  background-color: #ffffff;
-  border-radius: 13px;
-}
-
 .moneycolor {
   color: #ea5002;
 }
 
-.text-bold-sm {
-  font-weight: 425;
-}
-
-.sm-moneycolor {
-  color: #e3793b;
-}
-
 .margin-top {
   margin-top: 20rpx;
 }
@@ -610,72 +521,10 @@ export default {
   margin-left: 20rpx;
 }
 
-.margin-left-top {
-  margin-left: 20rpx;
-  margin-top: 20rpx;
-}
-
 .margin-right {
   margin-right: 20rpx;
 }
 
-.my-absolute {
-  position: absolute;
-}
-
-.my-fixed {
-  position: fixed;
-}
-
-.my-seach {
-  width: 450rpx;
-  height: 55rpx;
-  background-color: #f8f8f8;
-  border-radius: 30rpx;
-  padding-left: 20rpx;
-}
-
-.move-view {
-  width: 48rpx;
-  height: 10rpx;
-  background-color: #28ba91;
-  border-radius: 4rpx;
-  margin-left: 100rpx;
-}
-
-.move-view-p {
-  width: 45rpx;
-  height: 10rpx;
-  background-color: #28ba91;
-  border-radius: 4rpx;
-}
-
-.header-dh {
-  position: fixed;
-  padding-top: 20rpx;
-  padding-bottom: 15rpx;
-  height: 70rpx;
-  width: 750rpx;
-  background-color: #f1f1f1;
-  z-index: 20;
-}
-
-.tp-normal {
-  width: 60rpx;
-  height: 60rpx;
-}
-
-.tp-sm {
-  width: 45rpx;
-  height: 45rpx;
-}
-
-.tp-big {
-  width: 70rpx;
-  height: 70rpx;
-  border-radius: 50%;
-}
-
 .main-color {
   color: #07d188;
 }

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

@@ -11,7 +11,6 @@ const dev = {
 const prod = {
   common: "https://common-api.pickmall.cn",
   buyer: "https://buyer-api.pickmall.cn",
- 
 };
 
 //默认生产环境
@@ -22,7 +21,7 @@ if (process.env.NODE_ENV == "development") {
 } else {
   api = prod;
 }
-//微信小程序，app的打包方式只能是生产环境，所以这块直接条件编译赋值
+//微信小程序，app的打包方式建议为生产环境，所以这块直接条件编译赋值
 // #ifdef MP-WEIXIN || APP-PLUS
 api = prod;
 // #endif

config/config.js

@@ -1,10 +1,24 @@
-const name = "lilishop";
+const name = "lilishop"; //全局商城name
+const schemeName = "lilishop"; //唤醒app需要的schemeName
 export default {
   name: name,
-  schemeLink: `${name}://`, //唤起app地址
-  downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址
-  shareLink: "https://m-b2b2c.pickmall.cn", //分享地址
+  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
+  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请Web服务key
+  scanAuthNavigation: ["https://m-b2b2c.pickmall.cn/"], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  iosAppId: "id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
+  logo: "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
+  customerServiceMobile: "13161366885", //客服电话
+  customerServiceEmail: "lili@lili.com", //客服邮箱
+  imWebSrc: "https://im.pickmall.cn", //IM地址
+  enableGetClipboard: true, //是否启用粘贴板获取 scanAuthNavigation 中的链接，如果匹配则会跳转到对应页面
+  enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app
+  /**
+   * 如需更换主题请修改此处以及uni.scss中的全局颜色
+   */
+  mainColor: "#ff3c2a", // 主题色
+  lightColor: "#ff6b35", // 高亮主题色
+  aiderLightColor: "#ff9f28", // 辅助高亮颜色
 };

js_sdk/lili-pay/wx-pay.js

@@ -1,7 +1,18 @@
+/**
+ * 微信小程序支付
+ * 此处针对于微信小程序开发的支付插件
+ * 第一次支付成功后会跳出订阅的消息 如果用户拒绝或同意都会跳转到支付成功页面
+ * 如果点击订阅 会将状态写进缓存 之后不再提醒。
+ * 
+ * @param {sn,price}
+ */
+
 import { initiatePay } from "@/api/trade";
+import { getWeChatMpMessage } from "@/api/message.js";
 class LiLiWXPay {
   constructor(...payList) {
     this.data = payList[0];
+    console.log(payList);
     // 调用支付
     this.pay = () => {
       uni.showLoading({
@@ -32,13 +43,7 @@ class LiLiWXPay {
               icon: "none",
               title: "支付成功!",
             });
-            // 之后成功后跳转到支付成功页面
-            uni.redirectTo({
-              url:
-                "/pages/cart/payment/success?paymentMethod=WECHAT" +
-                "&payPrice=" +
-                this.data.price,
-            });
+            sendMessage(payList[0].price);
           },
           fail: (e) => {
             this.exception = e;
@@ -59,4 +64,53 @@ class LiLiWXPay {
   }
 }
 
+function sendMessage(price) {
+  //判断用户是否已经进行了订阅
+  if (!uni.getStorageSync("acceptSubscribeMessage")) {
+    //订阅消息
+    getWeChatMpMessage().then((res) => {
+      var message = res.data.result;
+      var templateid = message.map((item) => item.code);
+      uni.requestSubscribeMessage({
+        tmplIds: templateid,
+        success: (res) => {
+          for (let key in res) {
+            // 表示用户拒绝订阅该信息
+            if (res[key] == "reject") {
+              this.checked = false;
+            } else {
+              uni.setStorageSync("acceptSubscribeMessage", res);
+            }
+          }
+        },
+        fail: (res) => {
+          uni.removeStorageSync("acceptSubscribeMessage");
+          this.checked = false;
+        },
+        complete: () => {
+          /**
+           * 已经支付成功
+           */
+          uni.redirectTo({
+            url:
+              "/pages/cart/payment/success?paymentMethod=WECHAT" +
+              "&payPrice=" +
+              price,
+          });
+        },
+      });
+    });
+  } else {
+    /**
+     * 已经支付成功
+     */
+    uni.redirectTo({
+      url:
+        "/pages/cart/payment/success?paymentMethod=WECHAT" +
+        "&payPrice=" +
+        price,
+    });
+  }
+}
+
 export default LiLiWXPay;

lib/wa-permission/permission.js

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

main.js

@@ -2,44 +2,52 @@ import Vue from "vue";
 import App from "./App";
 import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
-import empty from "./components/empty";
 import store from "./store";
-
-// #ifdef H5
-// 在h5页面手动挂载 h5唤醒app插件
+import config from '@/config/config';
 import airBtn from "@/components/m-airbtn/index.vue";
+/**
+ * 仅在h5中显示唤醒app功能
+ * 在h5页面手动挂载
+ * 
+ */
+// #ifdef H5
+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
+ */
+
 Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key]);
 });
 
-const msg = (title, duration = 1500, mask = false, icon = "none") => {
-  //统一提示方便全局修改
-  if (Boolean(title) === false) {
-    return;
-  }
-  uni.showToast({
-    title,
-    duration,
-    mask,
-    icon,
-  });
-};
-// 引入vuex
+// 引入Vuex
 Vue.prototype.$store = store;
-// 全局引入空组件
-Vue.component("empty", empty);
 Vue.use(uView);
 Vue.config.productionTip = false;
+
+
+/**
+ * 注意！
+ * 此处将常用的颜色嵌入到原型链上面
+ * 颜色使用驼峰命名对应 uni.scss中全局颜色变量名
+ * 如需更换主题请修改此处以及uni.scss中的全局颜色
+ */
 // 主题色
-Vue.prototype.$mainColor = "#ff3c2a";
+Vue.prototype.$mainColor = config.mainColor;
 // 高亮主题色
-Vue.prototype.$lightColor = "#ff6b35";
-// 可直接 this.$api调用
-Vue.prototype.$api = { msg };
+Vue.prototype.$lightColor = config.lightColor;
+// 辅助高亮颜色
+Vue.prototype.$aiderLightColor = config.aiderLightColor;
+
 
 App.mpType = "app";
 

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "lili商城",
-    "appid" : "__UNI__C100675",
+    "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.0.16",
-    "versionCode" : 4000016,
+    "versionName" : "4.2.7",
+    "versionCode" : 4000270,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -63,7 +63,16 @@
                     "<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,
@@ -72,17 +81,19 @@
                     "NSPhotoLibraryAddUsageDescription" : "保存商品图片到本地",
                     "NSFaceIDUsageDescription" : "使用面部识别进行登录",
                     "NSCameraUsageDescription" : "需要用与扫描二维码和商品评论图片拍摄",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示"
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
+                    "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                 },
-                "urltypes" : "lilishop"
+                "urltypes" : "lilishop",
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
@@ -91,15 +102,15 @@
                 "ad" : {},
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     }
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx6cfbe6e0ace12ce8",
-                        "appsecret" : "6dfbe0c72380dce5d49d65b3c91059b1",
-                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/"
+                        "appid" : "wx32788b91bdb614c0",
+                        "appsecret" : "230233cef7520ee935bbecad372a370e",
+                        "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/"
                     },
                     "apple" : {},
                     "qq" : {
@@ -185,13 +196,19 @@
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
-            "postcss" : true,
+            "postcss" : false,
             "es6" : true
         },
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "位置信息将用于高德地图的效果展示"
             }
+        },
+        "plugins" : {
+            "live-player-plugin" : {
+                "version" : "1.3.0",
+                "provider" : "wx2b03c6e691cd7370"
+            }
         }
     },
     "h5" : {
@@ -210,6 +227,7 @@
                 "enable" : true
             }
         },
-        "title" : "lilishop"
+        "title" : "lilishop",
+        "template" : ""
     }
 }

package-lock.json

@@ -1,42 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "async-validator": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
-      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-    },
-    "popper.js": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-0.6.4.tgz",
-      "integrity": "sha1-GDfEdgr1TSuyC2b5wJuSmT2Exik="
-    },
-    "uview": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/uview/-/uview-0.1.0.tgz",
-      "integrity": "sha1-tASc8q1kE1430huAdCtjeoLl7yo=",
-      "requires": {
-        "async-validator": "^1.7.1",
-        "core-js": "^2.4.1",
-        "deepmerge": "^1.5.0",
-        "popper.js": "^0.6.4"
-      }
-    },
-    "xmldom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
-    }
-  }
-}

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    //实现下拉刷新样式
 
 			}
 		}, {
@@ -36,29 +53,22 @@
 				
 			}
 		},
-		{
-			"path": "pages/navigation/point/point-mall",
-			"style": {
-				"navigationBarTitleText": "积分商城",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/navigation/selectShops",
-			"style": {
-				"navigationBarTitleText": "精选店铺"
-			}
-		},
-
 				
 		{
 			"path": "pages/navigation/search/searchPage",
 			"style": {
 				"navigationBarTitleText": "搜索",
 				"navigationStyle": "custom",
+				
 				"app-plus": {
 					//app页面不显示滚动条
-					"scrollIndicator": "none"
+					"scrollIndicator": "none",
+					"bottom": "0",
+					"contentAdjust": "false",
+					"bounce": "none",
+					"safearea": {
+					"bottom": "none"
+					}
 				}
 			}
 		}, {
@@ -75,6 +85,12 @@
 			"style": {
 				
 			}
+		},
+				{
+					"path": "pages/tabbar/special/special",
+					"style": {
+							"navigationBarTitleText": "专题"
+					}
 		}
 
 	],
@@ -94,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"
 						}
@@ -176,7 +185,28 @@
 				{
 					"path": "deposit/index",
 					"style": {
-						"navigationBarTitleText": "预存款列表"
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/operation",
+					"style": {
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/recharge",
+					"style": {
+						"navigationBarTitleText": "充值金额"
+
+					}
+				},
+				{
+					"path": "deposit/withdrawal",
+					"style": {
+						"navigationBarTitleText": "提现金额"
 
 					}
 				},
@@ -189,11 +219,6 @@
 				}
 			},
 				 {
-					"path": "aboutUs",
-					"style": {
-						"navigationBarTitleText": "关于我们"
-					}
-				}, {
 					"path": "address/address",
 					"style": {
 						"enablePullDownRefresh": true,
@@ -212,6 +237,13 @@
 						"navigationBarTitleText": "地址管理"
 					}
 				},
+				{
+					"path": "set/versionFunctionList",
+					"style": {
+						"navigationBarTitleText": "功能介绍"
+					}
+				},
+
 				{
 					"path": "set/securityCenter/fingerLogin",
 					"style": {
@@ -224,6 +256,8 @@
 						"navigationBarTitleText": "面容登录"
 					}
 				},
+				
+				
 				{
 					"path": "set/securityCenter/editPassword",
 					"style": {
@@ -251,7 +285,7 @@
 				{
 					"path": "set/editionIntro",
 					"style": {
-						"navigationBarTitleText": "版本说明"
+						"navigationBarTitleText": "关于我们"
 					}
 				},
 				{
@@ -328,7 +362,24 @@
 			"pages": [{
 				"path": "shopPage",
 				"style": {
-						"navigationBarTitleText": "详情展示",
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},{
+				"path": "shopList",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			},{
+				"path": "licencePhoto",
+				"style": {
+					"navigationBarTitleText": "营业执照"
+				}
+			},{
+				"path": "shopPageGoods",
+				"style": {
+					"navigationBarTitleText": "",
 					"navigationStyle": "custom"
 				}
 			},
@@ -364,6 +415,17 @@
 						//app页面不显示滚动条
 						"scrollIndicator": "none"
 					}
+				},
+				{ // 客服
+					"path": "customerservice/index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"usingComponents": {
+							// #ifdef MP-WEIXIN
+							"chat": "plugin://myPlugin/chat"
+							// #endif
+						}
+					}
 				}
 			]
 
@@ -403,7 +465,17 @@
 				{
 					"path": "wechatMPLogin",
 					"style": {
-						"navigationBarTitleText": "小程序登录"
+						"navigationBarTitleText": "小程序登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "scannerCodeLoginConfirm",
+					"style": {
+						"navigationBarTitleText": "扫码登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
 					}
 				}
 			]
@@ -413,18 +485,15 @@
 		{
 			"root": "pages/promotion",
 			"pages": [ {
-					"path": "sale",
-					"style": {
-						"navigationBarTitleText": "特惠推荐",
-						"navigationStyle": "custom"
-
-					}
-				}, {
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
-							"titleNView": {}
+							"titleNView": {
+								"homeButton":true
+							}
 						}
 					}
 				},
@@ -434,17 +503,50 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
-						
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"
 						}
 					}
 				},{
-					"path": "recommend",
+					"path": "lives",
 					"style": {
-						"navigationBarTitleText": "人气推荐",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+
+					}
+				},{
+					"path": "bargain/list",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "bargain/log",
+					"style": {
+						"navigationBarTitleText": "砍价记录"
+					}
+				},{
+					"path": "point/detail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "white"
+
+					}
+				},{
+					"path": "point/pointList",
+					"style": {
+						"navigationBarTitleText": "积分商城"
+						
 
 					}
 				}
@@ -459,16 +561,8 @@
 					"style": {
 						"navigationBarTitleText": "我的优惠券",
 						"app-plus": {
-							"bounce": "coupon/none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
+							"bounce": "coupon/none"
+							
 						}
 					}
 				},
@@ -489,19 +583,8 @@
 					"path": "coupon/couponCenter",
 					"style": {
 						"navigationBarTitleText": "领券中心",
-						"enablePullDownRefresh": true,
-						"app-plus": {
-							"bounce": "none",
-							"titleNView": {
-								"padding-right": "12",
-								"buttons": [{
-									"fontSrc": "/static/font/iconfont/iconfont.ttf",
-									"text": "\ue608",
-									"fontSize": "20",
-									"color": "#FFFFFF"
-								}]
-							}
-						}
+						"enablePullDownRefresh": true
+						
 					}
 				},
 				{
@@ -566,6 +649,7 @@
 						"enablePullDownRefresh": true,
 						"app-plus": {
 							"bounce": "none"
+						
 						}
 					}
 				},
@@ -694,12 +778,6 @@
 				"text": "分类"
 			},
 		
-			// {
-			// 	"pagePath": "pages/navigation/point/point-mall",
-			// 	"iconPath": "static/tabbar/point-mall.png",
-			// 	"selectedIconPath": "static/tabbar/point-mall-s.png",
-			// 	"text": "积分商城"
-			// },
 			{
 				"pagePath": "pages/tabbar/cart/cartList",
 				"iconPath": "static/tabbar/cart.png",

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>
+								<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_CATEGORY'">仅限品类</span>
-                  <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+									<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,21 +88,26 @@ 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();
 						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";
 							}
 						}
@@ -123,9 +138,9 @@ 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 +160,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 +172,7 @@ page {
 					width: 260rpx;
 					background-color: $light-color;
 					position: relative;
+
 					.message {
 						color: $font-color-white;
 						display: flex;
@@ -226,6 +208,7 @@ page {
 							margin-top: 4rpx;
 						}
 					}
+
 					.circle {
 						width: 40rpx;
 						height: 40rpx;
@@ -234,10 +217,12 @@ page {
 						border-radius: 50%;
 						z-index: 111;
 					}
+
 					.circle-top {
 						top: -20rpx;
 						right: -20rpx;
 					}
+
 					.circle-bottom {
 						bottom: -20rpx;
 						right: -20rpx;
@@ -254,10 +239,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 +286,9 @@ page {
 			}
 		}
 	}
+
+	.coupon-title {
+		width: 260rpx;
+
+	}
 </style>

pages/cart/coupon/couponDetail.vue

@@ -14,7 +14,7 @@
       </view>
       <view class="bottom-view">
         <view class="text">• 使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"

pages/cart/coupon/index.vue

@@ -1,9 +1,22 @@
 <template>
   <div class="wrapper">
+    <u-tabs
+      :list="list"
+      :is-scroll="false"
+      :active-color="lightColor"
+      :current="current"
+      @change="
+        (i) => {
+          current = i;
+        }
+      "
+    >
+    </u-tabs>
+
     <div class="empty" v-if="couponsList.length <= 0">
       <u-empty text="暂无优惠券" mode="coupon"></u-empty>
     </div>
-    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index" v-if="item.memberCouponStatus == 'NEW'">
+    <view class="coupon-item" v-for="(item, index) in couponsList" :key="index">
       <view class="left">
         <view class="wave-line">
           <view class="wave" v-for="(item, index) in 12" :key="index"></view>
@@ -19,29 +32,52 @@
         <view class="circle circle-bottom"></view>
       </view>
       <view class="right">
-        <view>
+        <view class="desc">
           <view v-if="item.scopeType">
-            <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+            <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-            <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
+            <view v-else
+              >{{
+                item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
+              }}使用</view
+            >
           </view>
-          <view>有效期至：{{item.endTime}}</view>
+          <view class="reason" v-if="item.reason">{{ item.reason }}</view>
+          <view class="end-time">有效期至:{{ item.endTime }}</view>
         </view>
-        <view class="receive" @click="clickWay(item)">
+        <view
+          class="receive"
+          v-if="current == 0 && !routerVal.selectedCoupon.includes(item.id)"
+          @click="clickWay(item)"
+        >
           <text>立即</text><br />
           <text>使用</text>
         </view>
+        <view class="used" v-else @click="clickWay(item)">
+          <text>取消</text><br />
+          <text>使用</text>
+        </view>
         <view class="bg-quan">券</view>
       </view>
     </view>
   </div>
 </template>
 <script>
-import { useCoupon, getMemberCanUse } from "@/api/trade.js";
+import { useCoupon } from "@/api/trade.js";
 
 export default {
   data() {
     return {
+      lightColor: this.$lightColor,
+      current: 0,
+      list: [
+        {
+          name: "可用优惠券",
+        },
+        {
+          name: "不可用优惠券",
+        },
+      ],
       couponsList: [], //优惠券集合
       params: {
         //传参
@@ -55,43 +91,37 @@ export default {
       routerVal: "", //上级传参
     };
   },
-  /**
-   * 赋值
-   */
-  onLoad(val) {
-    this.routerVal = val;
-    this.params.scopeId = val.skuId;
-    this.params.storeId = val.storeId;
+  onLoad(options) {
+    this.routerVal = options;
   },
+  watch: {
+    current(val) {
+      console.log(this.$store.state.cantUseCoupons);
+      val == 0
+        ? (this.couponsList = this.$store.state.canUseCoupons)
+        : (this.couponsList = this.$store.state.cantUseCoupons);
+    },
+  },
+
   mounted() {
-    uni.getStorage({
-      key: "totalPrice",
-      success: (res) => {
-        this.params.totalPrice = res.data;
-        this.getCoupons();
-      },
-    });
+    this.init();
+    console.log(this.routerVal);
   },
 
   methods: {
     /**
-     * 获取优惠券数量
+     * 从vuex中拿取优惠券信息
      */
-    getCoupons() {
-      getMemberCanUse(this.params).then((res) => {
-        if (res.data.success) {
-          this.couponsList = res.data.result.records;
-        }
-      });
+    init() {
+      this.couponsList = this.$store.state.canUseCoupons;
     },
-
     /**
      * 领取优惠券
      */
     clickWay(coupon) {
       useCoupon({
         memberCouponId: coupon.id,
-        used: true,
+        used: !this.routerVal.selectedCoupon.includes(coupon.id),
         way: this.routerVal.way,
       }).then((res) => {
         if (res.data.success) {
@@ -109,6 +139,20 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.desc {
+  height: 220rpx;
+  flex: 2;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.end-time,
+.reason {
+  color: #999;
+  line-height: 1.5;
+  font-size: 24rpx;
+}
+
 .empty {
   margin-top: 20px;
   text-align: center;
@@ -187,14 +231,14 @@ export default {
     align-items: center;
     width: 450rpx;
     font-size: $font-sm;
-    height: 100%;
+    height: 220rpx;
     background-color: #ffffff;
     overflow: hidden;
     position: relative;
     > view:nth-child(1) {
       color: #666666;
       margin-left: 20rpx;
-      line-height: 3em;
+
       > view:nth-child(1) {
         color: #ff6262;
         font-size: 30rpx;
@@ -215,6 +259,20 @@ export default {
       z-index: 2;
     }
 
+    .used {
+      color: #ffffff;
+      background-color: black;
+      border-radius: 50%;
+      width: 86rpx;
+      height: 86rpx;
+      text-align: center;
+      margin-right: 30rpx;
+      vertical-align: middle;
+      padding-top: 8rpx;
+      position: relative;
+      z-index: 2;
+    }
+
     .bg-quan {
       width: 244rpx;
       height: 244rpx;

pages/cart/coupon/myCoupon.vue

@@ -2,7 +2,8 @@
   <view class="b-content">
     <view class="navbar">
       <!-- 循环出头部tab栏 -->
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="handleTabClick(index)"><text :class="{ current: tabCurrentIndex === index }">{{
+      <view v-for="(item, index) in navList" :key="index" class="nav-item" @click="handleTabClick(index)"><text
+          :class="{ current: tabCurrentIndex === index }">{{
           item.text
         }}</text></view>
     </view>
@@ -11,8 +12,10 @@
         <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
           <!-- 空白页 -->
           <u-empty mode="coupon" text="暂无优惠券了" v-if="navItem.wheterEmpty"></u-empty>
+
           <!-- 数据 -->
-          <view v-if="navItem.dataList && coupon" class="coupon-item" :class="{ 'coupon-used': navIndex != 0 }" v-for="(coupon, index) in navItem.dataList" :key="index">
+          <view v-if="navItem.dataList && coupon" class="coupon-item" :class="{ 'coupon-used': navIndex != 0 }"
+            v-for="(coupon, index) in navItem.dataList" :key="index">
             <view class="left">
               <view class="wave-line">
                 <view class="wave" v-for="(item, index) in 12" :key="index"></view>
@@ -29,7 +32,7 @@
               <view class="content">
                 <view class="title-1">{{ coupon.title }}</view>
                 <view class="title-2">使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"
@@ -47,7 +50,7 @@
                 <text class="text-2" v-if="coupon.used_status == 1">将过期</text>
               </view>
               <image class="no-icon" v-if="navIndex == 1" src="@/static/img/used.png"></image>
-              <image class="no-icon" v-if="navIndex == 2" src="@/pages/floor/imgs/overdue.png"></image>
+              <image class="no-icon" v-if="navIndex == 2" src="@/static/img/overdue.png"></image>
               <view class="receive" v-if="navIndex == 0" @click="useItNow(coupon)">
                 <text>立即</text><br />
                 <text>使用</text>
@@ -112,7 +115,9 @@ export default {
     };
   },
 
-  onLoad() {
+  onShow() {
+    this.navList[this.tabCurrentIndex].params.pageNumber = 1
+    this.navList[this.tabCurrentIndex].dataList = [];
     this.getData();
   },
 
@@ -142,7 +147,7 @@ export default {
       let index = this.tabCurrentIndex;
       getMemberCoupons(this.navList[index].params).then((res) => {
         uni.stopPullDownRefresh();
-        if (res.statusCode == 200) {
+        if (res.data.success) {
           let data = res.data.result.records;
           if (data.length == 0) {
             if (res.data.pageNumber == 1) {
@@ -183,13 +188,13 @@ export default {
      * 立即使用优惠券
      */
     useItNow(item) {
-      if (item.storeId) {
+      if (item.storeId && item.storeId!='0') {
         uni.navigateTo({
           url: `/pages/product/shopPage?id=${item.storeId}`,
         });
       } else {
         uni.switchTab({
-          url: "/pages/tabbar/home/index",
+          url: "/pages/navigation/search/searchPage",
         });
       }
     },
@@ -220,7 +225,7 @@ $item-color: #fff;
 }
 
 .swiper-box {
-  height: calc(100% - 40px);
+  height: calc(100vh - 40px);
 }
 
 .list-scroll-content {

pages/cart/payment/payOrder.vue

@@ -6,8 +6,7 @@
         <p class="ptips">收银台</p>
 
         <p class="ptips">剩余支付时间：
-					<u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa"
-						border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
+          <u-count-down :show-days="false" :show-border="true" font-size="28" color="#008ffa" border-color="#008ffa" ref="uCountDown" :timestamp="autoCancel"></u-count-down>
         </p>
         <p class="ptips">
           支付金额
@@ -45,7 +44,7 @@
 </template>
 <script>
 	import * as API_Trade from "@/api/trade";
-
+	import {payCallback} from '@/api/members'
 	export default {
 		data() {
 			return {
@@ -71,6 +70,7 @@
 				walletValue: 0.0,
 				// 支付倒计时
 				autoCancel: 0,
+			
 			};
 		},
 		onLoad(val) {
@@ -91,12 +91,23 @@
 			// 区别是：h5是通过浏览器外部调用微信app进行支付，而JSAPI则是 在微信浏览器内部，或者小程序 调用微信支付
 			this.paymentClient = this.isWeiXin() ? "JSAPI" : "H5";
 			//#endif
+
+
+
+			// 
 		},
 		onBackPress(e) {
 			if (e.from == "backbutton") {
-				uni.redirectTo({
+							if(this.routerVal.recharge_sn){
+								uni.switchTab({
+									 url: '/pages/tabbar/user/my'
+								});
+							}
+							else{
+							uni.navigateTo({
 								url: "/pages/order/myOrder?status=0",
 							});
+							}
 							return true; //阻止默认返回行为
 							}
 		},
@@ -104,18 +115,31 @@
 			this.cashierData();
 		},
 		methods: {
-			navigateTo(url) {
+
+			/**
+			 * 支付成功后跳转
+			 */
+			callback(paymentMethod){
 				uni.navigateTo({
-					url,
+					url: "/pages/cart/payment/success?paymentMethod=" +
+					paymentMethod +
+					"&payPrice=" +
+					this.cashierParams.price+
+					"&orderType="+this.orderType 
 				});
 			},
-			// 获取收银详情
+			
+			/**
+			 * 获取收银详情
+			 */
 			cashierData() {
 				let parms = {};
 
 				if (this.routerVal.recharge_sn) {
+					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
 					this.orderType = "RECHARGE";
+					
 				} else if (this.routerVal.trade_sn) {
 					this.sn = this.routerVal.trade_sn;
 					this.orderType = "TRADE";
@@ -128,6 +152,8 @@
 				parms.clientType = this.paymentType;
 
 				API_Trade.getCashierData(parms).then((res) => {
+				
+					if(res.data.success){
 					this.cashierParams = res.data.result;
 
 					// #ifdef MP-WEIXIN
@@ -136,24 +162,61 @@
 					});
 					// #endif
 
-					// #ifndef MP-WEIXIN
+					
+				  if(this.routerVal.recharge_sn){
+						this.payList = res.data.result.support.filter((item) => {
+						return item != "WALLET";
+					})
+					}
+					 else{
 						this.payList = res.data.result.support;
+					}
+					// #ifdef H5
+					//判断是否微信浏览器
+					var ua = window.navigator.userAgent.toLowerCase();
+					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+					
+						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
+					
+				
+					
+
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
 						(res.data.result.autoCancel - new Date().getTime()) / 1000;
+					}
+					else if(res.data.code == 32000){
+						setTimeout(()=>{
+							uni.redirectTo({
+							 url: `/pages/order/myOrder?status=0`
+						});
+						},500)
+						
+					}
 				});
 			},
 
 
 			awaitPay(payment){
-
-				 this.$u.debounce(this.pay(payment), 3000)
-			
+				this.$u.throttle(()=>{
+					this.pay(payment)
+				}, 2000)
 			},
 
 			//订单支付
 			async pay(payment) {
+				
 				// 支付编号
 				const sn = this.sn;
 				// 交易类型【交易号|订单号】
@@ -171,43 +234,50 @@
 				// 客户端类型 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) => {
-
+						uni.hideLoading();
 						//如果支付异常
 						if (!signXml.data.success) {
-							uni.showModal({
-								content: signXml.data.message,
-								showCancel: false,
-							})
+							uni.showToast({
+								title: signXml.data.message,
+								duration: 2000
+							});
 							return;
 						}
 						
 						let payForm = signXml.data.result;
 						
-						console.log(payForm)
 						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: "支付成功!",
 							});
-								uni.navigateTo({
-									url: "/pages/payment/success?paymentType=" +
-										paymentType +
-										"&payPrice=" +
-										this.cashierParams.price,
+							this.callback(paymentMethod)
+						}
+						else{
+							uni.requestPayment({
+								provider: paymentType,
+								orderInfo: payForm || '',
+								success: (e) => {
+									uni.showToast({
+										icon: "none",
+										title: "支付成功!",
 									});
+									this.callback(paymentMethod)
 								},
 								fail: (e) => {
-								console.log(e);
+									console.log(this);
 									this.exception = e;
 									uni.showModal({
 										content: "支付失败,如果您已支付，请勿反复支付",
@@ -216,6 +286,7 @@
 								},
 							});
 						}
+					}
 				);
 				//APP pay
 				// #endif
@@ -225,16 +296,18 @@
 				await API_Trade.initiatePay(paymentMethod, paymentClient, params).then(
 					(res) => {
 						let response = res.data;
+						//如果非支付宝支付才需要进行判定，因为支付宝h5支付是直接输出的，没有返回所谓的消息状态
+						if(paymentMethod !== "ALIPAY"){
 							//如果支付异常
 							if (!response.success) {
-
-							uni.showModal({
-								content: response.message,
-								showCancel: false,
-							})
+								uni.showToast({
+									title: response.message,
+									duration: 2000,
+									icon:"none"
+								});
 								return;
 							}
-
+						}
 						if (paymentMethod === "ALIPAY") {
 							document.write(response);
 						} else if (paymentMethod === "WECHAT") {
@@ -243,7 +316,7 @@
 								WeixinJSBridge.invoke(
 									"getBrandWCPayRequest",
 									response.result,
-									function(res) {
+									(res) => {
 										if (res.err_msg == "get_brand_wcpay_request:ok") {
 											// 使用以上方式判断前端返回,微信团队郑重提示：
 											//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
@@ -251,12 +324,8 @@
 												icon: "none",
 												title: "支付成功!",
 											});
-											uni.navigateTo({
-												url: "/pages/cart/payment/success?paymentMethod=" +
-													paymentMethod +
-													"&payPrice=" +
-													this.cashierParams.price,
-											});
+											this.callback(paymentMethod)
+											 
 										} else {
 											uni.showModal({
 												content: "支付失败,如果您已支付，请勿反复支付",
@@ -274,12 +343,7 @@
 								icon: "none",
 							});
 							if (response.success) {
-								uni.navigateTo({
-									url: "/pages/cart/payment/success?paymentMethod=" +
-										paymentMethod +
-										"&payPrice=" +
-										this.cashierParams.price,
-								});
+								this.callback(paymentMethod)
 							}
 						}
 					}
@@ -315,12 +379,8 @@
 										icon: "none",
 										title: "支付成功!",
 									});
-									uni.navigateTo({
-										url: "/pages/cart/payment/success?paymentMethod=" +
-											paymentType +
-											"&payPrice=" +
-											this.cashierParams.price,
-									});
+									this.callback(paymentMethod)
+									 
 								},
 								fail: (e) => {
 									console.log(e);
@@ -336,12 +396,8 @@
 								icon: "none",
 								title: "支付成功!",
 							});
-							uni.navigateTo({
-								url: "/pages/cart/payment/success?paymentMethod=" +
-									paymentMethod +
-									"&payPrice=" +
-									this.cashierParams.price,
-							});
+							this.callback(paymentMethod)
+							 
 						}
 					}
 				);

pages/cart/payment/popup/goods.vue

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

pages/cart/payment/shareOrderGoods.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="wrapper">
+  <view class="wrapper" v-if="flage">
     <div class='goods' v-if="selectedGoods">
       <image class="goods-image" :src="selectedGoods.thumbnail" alt="">
         <p class="goodsName">{{selectedGoods.goodsName}}</p>
@@ -67,11 +67,12 @@ import { getGoods } from "@/api/goods.js";
 import { getPinTuanShare } from "@/api/order";
 import shares from "@/components/m-share/index";
 import storage from "@/utils/storage.js";
-import popupGoods from "./popup/goods"; //购物车商品的模块
+import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 
 export default {
   data() {
     return {
+      flage: false, //判断接口是否正常请求
       addr: {
         id: "",
       },
@@ -138,7 +139,8 @@ export default {
     // 实例化本页面
     async init(sn, sku) {
       let res = await getPinTuanShare(sn, sku);
-      if (res.data.success) {
+      if (res.data.success && res.data.result.promotionGoods) {
+        this.flage = true;
         this.data = res.data.result;
         this.selectedGoods = res.data.result.promotionGoods;
         let endTime = Date.parse(
@@ -170,21 +172,30 @@ export default {
         } else {
           this.isMaster = false;
           // 获取商品详情
-          this.getGoodsDetail(this.routers.sku, this.routers.goodsId);
+          this.getGoodsDetail({
+            id: this.routers.sku,
+            goodsId: this.routers.goodsId,
+          });
         }
 
         // 获取当前商品是否已经购买
         if (storage.getUserInfo().id) {
-         
           let isBuy = res.data.result.pintuanMemberVOS.filter((item) => {
             return item.memberId == storage.getUserInfo().id;
           });
           isBuy.length != 0 ? (this.isBuy = true) : (this.isBuy = false);
         }
+      } else {
+        uni.showToast({
+          title: "当前拼团单有误！请联系管理员重试",
+          duration: 2000,
+          icon: "none",
+        });
       }
     },
     // 获取商品详情
-    getGoodsDetail(id, goodsId) {
+    getGoodsDetail(val) {
+      let { id, goodsId } = val;
       uni.showLoading({
         title: "加载中",
         mask: true,

pages/cart/payment/success.vue

@@ -2,76 +2,45 @@
   <div class="wrapper">
     <div class="pay-wrapper">
       <div class="pay-money">
-        ￥{{ payPrice | unitPrice }}
+        ￥{{ Number(payPrice) | unitPrice }}
       </div>
       <div class="pay-btns">
-        <div v-show="!from" @click="navigateTo('/pages/order/myOrder?status=0')">查看订单</div>
+        <div v-show="!from" @click="checkOrder">查看{{this.orderType == "RECHARGE" ? '余额' : '订单'}}</div>
         <div @click="navigateTo('/pages/tabbar/home/index', 'switch')">回到首页</div>
-
       </div>
     </div>
     <div class="pay-box">
       <div class="pay-tag-box">
         <h2>订单支付成功!</h2>
-
         <div class="pay-item">
           <div>
             支付方式：
           </div>
           <div>{{paymentMethod | paymentTypeFilter}}</div>
         </div>
-
-      </div>
-      <!-- #ifdef MP-WEIXIN -->
-      <div class="subscribe flex">
-        <div>订阅订单状态</div>
-        <div>
-          <u-switch size="50" :disabled="checked" :active-color="activeColor" @change="changeStatus" v-model="checked"></u-switch>
-        </div>
-      </div>
-      <!-- #endif -->
-    </div>
-    <div class="goods-recommend">--商品推荐--</div>
-    <div class="goods-list">
-      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
-        <div class="goods-img">
-          <u-image :src="item.thumbnail" mode="aspectFill" height="350rpx" width="100%">
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-        </div>
-        <div class="goods-desc">
-          <div class="goods-title">
-            {{ item.goodsName }}
-          </div>
-          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
-          </div>
-        </div>
       </div>
     </div>
+    <goodsRecommend />
   </div>
 
-  </div>
 </template>
 <script>
-import { getGoodsList } from "@/api/goods.js";
-import { getWeChatMpMessage } from "@/api/message.js";
-
+import goodsRecommend from "@/components/m-goods-recommend";
 export default {
   data() {
     return {
       checked: false,
       paymentMethod: "",
+
       from: "",
       payPrice: 0,
       goodsList: [],
       activeColor: this.$mainColor,
-      params: {
-        pageSize: 12,
-        pageNumber: 0,
-      },
     };
   },
+  components: {
+    goodsRecommend,
+  },
   filters: {
     paymentTypeFilter(val) {
       switch (val) {
@@ -89,50 +58,30 @@ export default {
   onLoad(options) {
     this.paymentMethod = options.paymentMethod || "";
     this.from = options.from || "";
-    this.payPrice = parseInt(options.payPrice) || 0;
-    //搜索商品
-    this.initGoods();
+    this.payPrice = options.payPrice || 0;
+    this.orderType = options.orderType;
+    // this.sendMessage()
   },
   methods: {
+    checkOrder() {
+      /**
+       * 查看订单
+       * 1.充值跳转到明细里面
+       * 2.支付跳转到订单详情
+       */
+      if (this.orderType == "RECHARGE") {
+        uni.reLaunch({
+          url: `/pages/mine/deposit/operation`,
+        });
+      } else {
+        this.navigateTo("/pages/order/myOrder?status=0");
+      }
+    },
     changeStatus(val) {
       if (val) {
         this.sendMessage();
       }
     },
-    async initGoods() {
-      let goodsList = await getGoodsList(this.params);
-      this.goodsList.push(...goodsList.data.result.content);
-    },
-    sendMessage() {
-      //订阅消息
-      //#ifdef MP-WEIXIN
-      getWeChatMpMessage().then((res) => {
-        var message = res.data.result;
-        var templateid = message.map((item) => item.code);
-        uni.requestSubscribeMessage({
-          tmplIds: templateid,
-          success: (res) => {
-			  for(let key in res){
-				  if(res[key] == "reject"){
-					  this.checked = false;
-				  }
-			  }
-           
-          },
-          fail: (res) => {
-            uni.removeStorageSync("acceptSubscribeMessage");
-            this.checked = false;
-          },
-        });
-      });
-      //#endif
-    },
-
-    handleClick(item) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
-      });
-    },
 
     navigateTo(url, type) {
       if (type === "switch") {
@@ -155,7 +104,6 @@ export default {
   margin: 0 auto 40rpx auto;
   padding: 0 20rpx 20rpx;
   width: 80%;
-   
 }
 .pay-btns {
   display: flex;
@@ -221,84 +169,4 @@ export default {
   background: #fff;
   border-top-right-radius: 100rpx;
 }
-
-/**商品代码 */
-$w_94: 94%;
-
-.goods-recommend {
-  background: #f7f7f7;
-  height: 100rpx;
-  line-height: 100rpx;
-  text-align: center;
-  font-size: 30rpx;
-  font-weight: bold;
-}
-
-.goods-list {
-  display: flex;
-
-  flex-wrap: wrap;
-  background: #f7f7f7;
-}
-
-.goods-item {
-  width: 50%;
-  margin-bottom: 10px;
-  border-radius: 0.4em;
-  overflow: hidden;
-}
-
-.goods-img {
-  position: relative;
-  margin: 0 auto;
-  // width: 158px;
-  width: $w_94;
-  height: 350rpx;
-  border-top-left-radius: 20rpx;
-  border-top-right-radius: 20rpx;
-
-  overflow: hidden;
-
-  > img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.goods-desc {
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-  width: $w_94;
-  background: #fff;
-  padding: 8rpx 0 8rpx 8rpx;
-  margin: 0 auto;
-
-  > .goods-title {
-    font-size: 12px;
-    height: 70rpx;
-    display: -webkit-box;
-    font-weight: 500;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  > .goods-bottom {
-    display: flex;
-    font-weight: bold;
-
-    > .goods-price {
-      line-height: 2;
-      color: $main-color;
-    }
-  }
-}
-
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>

pages/mine/aboutUs.vue

@@ -1,139 +0,0 @@
-<template>
-  <view class="about-us">
-    <view class="box flex-center">
-      <image src="/static/logo.png" mode="scaleToFill"></image>
-      <view>{{config.name}}</view>
-    </view>
-    <u-cell-group :border="false">
-      <!--  #ifdef APP-PLUS -->
-      <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-group>
-    <view class="intro flex-center c-content">
-      <view>客服热线：13161366885</view>
-      <view>客服邮箱：lili@lili.com</view>
-    </view>
-    <view class="bottom flex-center">
-      <view @click="navigateTo('/pages/help/tips?type=user')">《lili商城用户协议》</view>
-      <view>CopyRight @ {{config.name}} </view>
-    </view>
-  </view>
-</template>
-
-<script>
-// #ifdef APP-PLUS
-import APPUpdate, { getCurrentNo, getServerNo } from "@/plugins/APPUpdate";
-import { getAppVersionList } from "@/api/message.js";
-// #endif
-import config from "@/config/config";
-export default {
-  data() {
-    return {
-      config,
-      showUpdate: false,
-      version: "",
-      currentNo: 0,
-      params: {
-        pageNumber: 1,
-        pageSize: 5,
-      },
-    };
-  },
-  onLoad() {
-    /**
-     * 根据当前app系统判断
-     */
-    // #ifdef APP-PLUS
-    let _this = this;
-    plus.runtime.getProperty(plus.runtime.appid, function (inf) {
-      var wgtVer = inf.version;
-      _this.currentVersion = wgtVer;
-    });
-    if (uni.getSystemInfoSync().platform === "android") {
-      this.params.type = 0;
-    } else {
-      this.params.type = 1;
-    }
-    // #endif
-  },
-  methods: {
-    /**
-     * 点击查看更新
-     */
-    async checkUpdate() {
-      // #ifdef APP-PLUS
-      let needUpdate = false;
-      getCurrentNo((res) => {
-        this.currentNo = res.versionCode;
-      });
-      let res = await getAppVersionList(this.params);
-      res.data.data.forEach((ele) => {
-        let versionDetail = ele.version.replace(/\./g, "");
-        if (versionDetail.length < this.currentNo.length) {
-          versionDetail = versionDetail.padEnd(this.currentNo.length, "0");
-        }
-        if (versionDetail > this.currentNo) {
-          needUpdate = true;
-        }
-      });
-      if (needUpdate) {
-        APPUpdate(true);
-      } else {
-        uni.showToast({
-          title: "已是最新版本！",
-        });
-      }
-      // #endif
-    },
-    navigateTo(url) {
-      uni.navigateTo({
-        url,
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.box {
-  width: 100%;
-  height: 242rpx;
-  image {
-    transform: scale(2.5);
-    width: 94rpx;
-    height: 94rpx;
-  }
-  view {
-    font-size: 30rpx;
-    margin-top: 25rpx;
-  }
-}
-.u-cell {
-  padding: 35rpx 20rpx;
-  height: 110rpx;
-}
-.intro {
-  color: #999999;
-  font-size: $font-sm;
-  margin-top: 20rpx;
-  border: none;
-  padding: 45rpx 0;
-  line-height: 2em;
-}
-.bottom {
-  :nth-child(1) {
-    color: $main-color;
-    font-size: 22rpx;
-    margin-bottom: 20rpx;
-  }
-  :last-child {
-    font-size: 20rpx;
-    color: $font-color-light;
-  }
-  margin-top: 110rpx;
-}
-</style>

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,7 +30,8 @@
         <div class="saveBtn" @click="save">保存</div>
       </u-form>
 
-      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4"></m-city>
+      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
+      </m-city>
 
       <uniMap v-if="mapFlage" @close="closeMap" @callback="callBackAddress" />
     </div>
@@ -149,15 +152,7 @@ export default {
             delete this.form.___path;
             addAddress(this.form).then((res) => {
               if (res.data.success) {
-                if (this.routerVal.type == "order") {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/address?way=${this.routerVal.way}`,
-                  });
-                } else {
-                  uni.redirectTo({
-                    url: `/pages/mine/address/addressManage`,
-                  });
-                }
+                uni.navigateBack();
               }
             });
           } else {
@@ -167,9 +162,7 @@ export default {
             delete this.form.updateTime;
             editAddress(this.form).then((res) => {
               if (res.data.success) {
-                uni.navigateTo({
-                  url: `/${beforePage.route}`,
-                });
+                uni.navigateBack();
               }
             });
           }
@@ -198,8 +191,8 @@ export default {
             return _child.id == item.id;
           });
 
-          this.form.lat = _town[0].center.split(",")[0];
-          this.form.lon = _town[0].center.split(",")[1];
+          this.form.lat = _town[0].center.split(",")[1];
+          this.form.lon = _town[0].center.split(",")[0];
         }
       });
     },

pages/mine/address/address.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="address">
 
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
+    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
     <view class="list" v-else>
       <view class="item c-content" v-for="(item, index) in addressList" :key="index">
         <view class="basic" @click="selectAddressData(item)">
@@ -50,7 +50,6 @@ export default {
     return {
       addressList: [], //地址列表
       showAction: false, //是否显示下栏框
-      empty: false, //是否为空
       removeList: [
         {
           text: "确定",
@@ -67,7 +66,11 @@ export default {
       },
     };
   },
-
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
   onLoad: function (val) {
     this.routerVal = val;
   },
@@ -76,19 +79,12 @@ export default {
     this.getAddressList();
   },
   onHide() {},
-  onBackPress(e) {
-    uni.redirectTo({
-      url: "/pages/order/fillorder?way=" + this.routerVal.way,
-    });
-    return true;
-  },
-
   methods: {
     async selectAddressData(val) {
       await API_Trade.setAddressId(val.id, this.routerVal.way);
 
-      uni.redirectTo({
-        url: `/pages/order/fillorder?way=${this.routerVal.way}`,
+      uni.navigateBack({
+        delta: 1,
       });
     },
     //获取地址列表
@@ -99,18 +95,11 @@ export default {
         this.params.pageNumber,
         this.params.pageSize
       ).then((res) => {
-      
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
         res.data.result.records.forEach((item) => {
           item.consigneeAddressPath = item.consigneeAddressPath.split(",");
         });
-
-          this.$set(this, "addressList", res.data.result.records);
-
-         
-        }
+        this.addressList = res.data.result.records;
+        console.log(this.addressList);
 
         uni.hideLoading();
       });
@@ -139,7 +128,6 @@ export default {
     },
     //新建。编辑地址
     addAddress(id) {
- 
       if (id) {
         uni.navigateTo({
           url:
@@ -177,5 +165,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>

pages/mine/address/addressManage.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="address">
-    <u-empty class="empty" v-if="empty" text="暂无收货地址" mode="address"></u-empty>
-    <view class="list" v-else>
+    <u-empty class="empty" v-if="this.addressList == 0" text="暂无收货地址" mode="address"></u-empty>
+    <view class="list" >
       <view class="item c-content" v-for="(item, index) in addressList" :key="index">
         <view class="basic">
           <text>{{ item.name }}</text>
@@ -50,7 +50,7 @@ export default {
     return {
       addressList: [], //地址列表
       showAction: false, //是否显示下栏框
-      empty: false, //是否为空
+  
       removeList: [
         {
           text: "确定",
@@ -77,27 +77,17 @@ export default {
   onLoad: function (val) {
     this.routerVal = val;
   },
+  onPullDownRefresh() {
+    //下拉刷新
+    this.addressList = [];
+    this.getAddressList();
+  },
   /**
    * 进入页面检测当前账户是否登录
    */
   onShow() {
-    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) {
-            uni.navigateTo({
-              url: "/pages/passport/login",
-            });
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
     } 
   },
   methods: {
@@ -108,14 +98,11 @@ export default {
         this.params.pageNumber,
         this.params.pageSize
       ).then((res) => {
-        if (res.data.result.records.length == 0) {
-          this.empty = true;
-        } else {
         res.data.result.records.forEach((item) => {
           item.consigneeAddressPath = item.consigneeAddressPath.split(",");
         });
         this.addressList = res.data.result.records;
-        }
+
         uni.hideLoading();
       });
     },
@@ -169,5 +156,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import './address.scss';
+@import "./address.scss";
 </style>

pages/mine/deposit/index.vue

@@ -1,14 +1,17 @@
 <template>
   <view class="wap">
+    <u-navbar  title="预存款列表">
+    </u-navbar>
     <view class="wrapper-show-money">
       <view class="money-view">
         <h3>预存款金额 </h3>
         <view class="money">￥{{walletNum | unitPrice }}</view>
+
       </view>
     </view>
     <view class="wrapper-tabs">
 
-      <swiper class="swiper-box" @change="changeSwiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+      <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">
@@ -25,7 +28,7 @@
             </view>
 
             <u-empty v-if="datas.length==0" mode="history" text="暂无记录" />
-            <u-loadmore v-else bg-color='#f8f8f8' :status="status" />
+      
           </scroll-view>
 
         </swiper-item>
@@ -37,13 +40,12 @@
 
 <script>
 import { getUserRecharge, getWalletLog } from "@/api/members";
-import storage from "@/utils/storage.js";
 import { getUserWallet } from "@/api/members";
 export default {
   data() {
     return {
       walletNum: 0,
-      status: "loadmore",
+
       current: 0,
       swiperCurrent: 0,
       userInfo: "", //用户详情信息
@@ -77,38 +79,32 @@ export default {
     this.walletNum = result.data.result.memberWallet;
   },
   methods: {
+   
     /**分页获取预存款充值记录 */
     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";
           }
         }
       });
     },
 
     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";
           }
         }
       });
     },
 
-    // 点击swiper的时候清空数据
-    changeSwiper() {
-      this.groupBuy = [];
-    },
+  
     changed(index) {
       this.datas = [];
       this.swiperCurrent = index;
@@ -121,19 +117,6 @@ export default {
       }
     },
 
-    // swiper-item左右移动，通知tabs的滑块跟随移动
-    transition({ detail: { dx } }) {
-      this.$refs.tabs.setDx(dx);
-    },
-    // 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
-    // swiper滑动结束，分别设置tabs和swiper的状态
-    animationfinish(e) {
-      // this.groupBuy = []
-      let current = e.detail.current;
-      this.$refs.tabs.setFinishCurrent(current);
-      this.swiperCurrent = current;
-      this.current = current;
-    },
     loadMore() {
       this.params.pageNumber++;
       this.getWallet();
@@ -184,9 +167,12 @@ export default {
     margin: 0 auto;
     height: 90rpx;
   }
-.wap {
-}
   
+  .operation {
+    font-size: 32rpx;
+    margin-right: 24rpx;
+    color: rgb(96, 98, 102);
+  }
   .money {
     font-size: 40rpx;
     font-weight: bold;

pages/mine/deposit/operation.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="wrapper">
+    <u-navbar :custom-back="back" title="余额"></u-navbar>
+    <div class="box">
+      <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>
+    </div>
+    <div class="box list" @click="navgition('/pages/mine/deposit/index')">
+      <div class="list-left">预存款明细</div>
+      <div class="list-right">
+        <u-icon name="arrow-right"></u-icon>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getUserWallet } from "@/api/members";
+export default {
+  data() {
+    return {
+      walletNum: 0,
+    };
+  },
+  async onShow() {
+    if (this.$options.filters.isLogin("auth")) {
+      let result = await getUserWallet(); //预存款
+      this.walletNum = result.data.result.memberWallet;
+    } else {
+      uni.showToast({
+        icon: "none",
+        duration: 3000,
+        title: "请先登录！",
+      });
+
+      this.$options.filters.navigateToLogin("redirectTo");
+    }
+  },
+  methods: {
+    back() {
+      uni.switchTab({
+        url: "/pages/tabbar/user/my",
+      });
+    },
+    /**
+     * 跳转
+     */
+    navgition(url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.list-left {
+  flex: 8;
+}
+.list-right {
+  flex: 2;
+  text-align: right;
+}
+.wrapper {
+  width: 94%;
+  margin: 0 3%;
+}
+.box {
+  margin: 20rpx 0;
+  background: #fff;
+  border-radius: 20rpx;
+
+  padding: 40rpx;
+}
+.operation-btns {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.money {
+  text-align: center;
+  color: #333;
+  font-size: 50rpx;
+  margin: 20rpx 0 40rpx 0;
+  letter-spacing: 2rpx;
+}
+.deposit {
+  margin-top: 50rpx;
+  text-align: center;
+  color: #999;
+  font-size: 28rpx;
+
+  letter-spacing: 2rpx;
+}
+.operation-btn {
+  background: #ee6d41;
+  color: #fff;
+  height: 90rpx;
+  width: 240rpx;
+  margin: 0 20rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  font-size: 32rpx;
+}
+.light {
+  background: #fdf2ee;
+  color: #ee6d41;
+}
+</style>

pages/mine/deposit/recharge.vue

@@ -0,0 +1,52 @@
+
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">充值金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder='金额' type="number" />
+					
+        </view>
+
+      </view>
+    </view>
+
+    <view class="submit" :class="{'light':flag}" @click="handlerRecharge">充值</view>
+  </view>
+</template>
+<script>
+import { recharge } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      flag: true,
+    };
+  },
+  watch: {
+    price(val) {
+      val <= 0 ? (this.flag = true) : (this.flag = false);
+    },
+  },
+  mounted() {},
+  methods: {
+    // 充值
+    async handlerRecharge() {
+      if (this.price > 0) {
+       
+        let res = await recharge({ price: this.price });
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`,
+          });
+        }
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import './style.scss';
+</style>

pages/mine/deposit/style.scss

@@ -0,0 +1,46 @@
+/deep/ .u-input__input,
+.u-input {
+  font-size: 80rpx !important;
+  height: 102rpx !important;
+}
+/deep/ .u-input__input {
+  height: 100%;
+  font-size: 80rpx;
+}
+.content {
+  display: flex;
+  > .price {
+    width: 60%;
+    margin: 20rpx 0;
+    font-size: 80rpx;
+    display: flex;
+  }
+  > .all {
+    justify-content: center;
+    width: 40%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+  }
+}
+.-list {
+  margin: 20rpx 0;
+  background: #fff;
+  padding: 16rpx 32rpx;
+}
+.title {
+  font-size: 35rpx;
+}
+.light {
+  opacity: 0.6;
+}
+.submit {
+  margin: 80rpx auto;
+  width: 94%;
+  background: $light-color;
+  height: 90rpx;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+}

pages/mine/deposit/withdrawal.vue

@@ -0,0 +1,78 @@
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">提现金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder="" type="number" />
+        </view>
+
+        <view class="all">
+          <view @click="handleAll" :style="{ color: $mainColor }">全部</view>
+          <view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view>
+        </view>
+
+      </view>
+      <view class="tips">
+        最低提现金额为1.00元
+      </view>
+    </view>
+
+    <view class="submit" @click="cashd">提现</view>
+  </view>
+</template>
+<script>
+import { getUserWallet, withdrawalApply } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      walletNum: 0,
+    };
+  },
+  async mounted() {
+    let result = await getUserWallet(); //预存款
+    this.walletNum = result.data.result.memberWallet;
+  },
+
+  methods: {
+    cashd() {
+      this.price = this.price + "";
+
+      if (this.$u.test.amount(parseInt(this.price))) {
+        withdrawalApply({ price: this.price }).then((res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "提现成功!",
+              duration: 2000,
+              icon: "none",
+            });
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 1000);
+          }
+        });
+      } else {
+        uni.showToast({
+          title: "请输入正确金额",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },
+    handleAll() {
+      this.price = this.walletNum;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./style.scss";
+.tips {
+  font-size: 24rpx;
+  color: #999;
+}
+</style>

pages/mine/distribution/auth.vue

@@ -8,10 +8,16 @@
             <u-input v-model="ruleForm.name" placeholder="请输入您的真实姓名" />
           </u-form-item>
           <u-form-item label="身份证" prop="idNumber">
-            <u-input
-              v-model="ruleForm.idNumber"
-              placeholder="请输入身份证号码"
-            />
+            <u-input v-model="ruleForm.idNumber" placeholder="请输入身份证号码" />
+          </u-form-item>
+          <u-form-item label="银行开户行" prop="settlementBankBranchName">
+            <u-input v-model="ruleForm.settlementBankBranchName" type="text" placeholder="请输入银行开户行" />
+          </u-form-item>
+          <u-form-item label="银行开户名" prop="settlementBankAccountName">
+            <u-input v-model="ruleForm.settlementBankAccountName" type="text" placeholder="请输入银行开户名" />
+          </u-form-item>
+          <u-form-item label="银行账号" prop="settlementBankAccountNum">
+            <u-input v-model="ruleForm.settlementBankAccountNum" type="text" placeholder="请输入银行账号" />
           </u-form-item>
           <!-- <u-form-item label="身份证正面照" prop="name">
             <u-upload></u-upload>
@@ -35,12 +41,16 @@
 </template>
 <script>
 import { applyDistribution } from "@/api/goods";
+import { checkBankno } from "@/utils/Foundation";
 export default {
   data() {
     return {
       ruleForm: {
         name: "",
         idNumber: "",
+        settlementBankBranchName: "", // 银行开户行
+        settlementBankAccountName: "", //银行开户名
+        settlementBankAccountNum: "", //银行账号
       },
       rules: {
         name: [
@@ -62,6 +72,50 @@ export default {
             trigger: ["change", "blur"],
           },
         ],
+        // 银行开户行
+        settlementBankBranchName: [
+          {
+            required: true,
+            message: "银行开户行",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return this.$u.test.chinese(value);
+            },
+            message: "银行开户行不正确",
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ], //银行开户名
+        settlementBankAccountName: [
+          {
+            required: true,
+            message: "银行开户名",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+        ],
+        //银行账号
+        settlementBankAccountNum: [
+          {
+            required: true,
+            message: "银行账号不正确",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              // 上面有说，返回true表示校验通过，返回false表示不通过
+              // this.$u.test.mobile()就是返回true或者false的
+              return checkBankno(value);
+            },
+            message: "银行账号不正确",
+          },
+        ],
         idNumber: [
           {
             required: true,
@@ -98,14 +152,12 @@ export default {
 
               setTimeout(() => {
                 uni.navigateBack();
-              },500)
-             
-            }
-            else{
+              }, 500);
+            } else {
               uni.showToast({
                 title: res.data.message,
                 duration: 2000,
-                icon:"none"
+                icon: "none",
               });
             }
           });

pages/mine/distribution/history.vue

@@ -1,6 +1,12 @@
 <template>
   <view class="log-list">
-    <view class="log-way" v-for="(item, index) in datas" :key="index">
+    <!-- 提现记录 -->
+    <view
+      class="log-way"
+      v-if="cashLogData.length != 0"
+      v-for="(item, index) in cashLogData"
+      :key="index"
+    >
       <view class="log-item">
         <view class="log-item-view">
           <view class="title">{{
@@ -18,10 +24,32 @@
         </view>
       </view>
     </view>
+    <!-- 分销业绩 -->
+    <view
+      class="log-way"
+      v-if="achievementData.length != 0"
+      v-for="(item, index) in achievementData"
+      :key="index"
+    >
+      <view class="log-item">
+        <view class="log-item-view">
+          <view class="title">{{ item.goodsName }}</view>
+          <view class="price">提成金额：+{{ item.rebate | unitPrice }}</view>
+        </view>
+        <view class="log-item-view">
+          <view>创建时间：{{ item.createTime }}</view>
+          <view>店铺：{{ item.storeName }}</view>
+        </view>
+        <view class="log-item-footer">
+          <view>会员名称：{{ item.memberName }}</view>
+        </view>
+        <view class="log-item-footers">
+          <view>订单号：{{ item.orderSn }}</view>
+        </view>
+      </view>
+    </view>
     <view class="empty" v-if="empty">
       <u-loadmore :status="status" :icon-type="iconType" bg-color="#f7f7f7" />
-
-      <!-- <u-empty   text="暂无更多提现历史" mode="order"></u-empty> -->
     </view>
   </view>
 </template>
@@ -30,7 +58,8 @@ import { cashLog, distributionOrderList } from "@/api/goods";
 export default {
   data() {
     return {
-      datas: "", //数据集合
+      cashLogData: [], //提现记录数据集合
+      achievementData: [], //分销业绩数据合集,
       status: "loadmore",
       iconType: "flower",
       empty: false,
@@ -42,9 +71,6 @@ export default {
       type: 0,
       routers: "",
       achParams: {
-        distributionId: (this.routers && this.routers.id) || "", //分销商id
-        distributionName: (this.routers && this.routers.name) || "", //分销商名称
-        distributionOrderStatus: "", //分销商订单状态
         pageNumber: 1,
         pageSize: 10,
       },
@@ -58,20 +84,30 @@ export default {
       title: title, //这是修改后的导航栏文字
     });
     this.routers = option;
-
+    this.type = option.type;
     option.type == 0 ? this.achievement() : this.history();
   },
   mounted() {},
   onReachBottom() {
     this.status = "loading";
-    this.params.pageNumber++;
-
-    this.type == 1 ? this.history() : this.achievement();
+    this.type == 0 ? this.achParams.pageNumber++ : this.params.pageNumber++;
+    this.type == 0 ? this.achievement() : this.history();
   },
   methods: {
     // 业绩
     achievement() {
-      distributionOrderList(this.achParams).then((res) => {});
+      uni.showLoading({
+        title: "加载中",
+      });
+      distributionOrderList(this.achParams).then((res) => {
+        if (res.data.success && res.data.result.records.length >= 1) {
+          this.achievementData.push(...res.data.result.records);
+        } else {
+          this.status = "nomore";
+          this.empty = true;
+        }
+        uni.hideLoading();
+      });
     },
     // 初始化提现历史
     history() {
@@ -80,7 +116,7 @@ export default {
       });
       cashLog(this.params).then((res) => {
         if (res.data.success && res.data.result.records.length >= 1) {
-          this.datas = res.data.result.records;
+          this.cashLogData.push(...res.data.result.records);
         } else {
           this.status = "nomore";
           this.empty = true;
@@ -118,6 +154,19 @@ export default {
 .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

@@ -40,10 +40,7 @@
         <view>提现</view>
       </view>
   
-      <view class="nav-item" @click="handleClick('/pages/mine/distribution/list')">
-        <u-icon size="50" color="#1e9ff2" name="home-fill"></u-icon>
-        <view>选品库</view>
-      </view>
+     
     </view>
 
   </view>
@@ -85,7 +82,7 @@ export default {
       });
     },
   },
-  mounted() {
+  onShow() {
     this.init();
   },
 };
@@ -93,21 +90,15 @@ export default {
 
 <style lang="scss" scoped>
 .nav {
-  //   height: 176rpx;
   background: #fff;
   align-items: center;
   display: flex;
-  //   border-radius: 20rpx;
-  //   transform: translateY(-20rpx);
-  //   box-shadow: 4rpx 10rpx 22rpx rgba(0, 0, 0, 0.1);
   flex-wrap: wrap;
 }
 .nav-list {
   color: #fff;
   padding: 40rpx 0;
   background: $aider-light-color;
-  //   border-bottom-left-radius: 100rpx;
-  //   border-bottom-right-radius: 100rpx;
 }
 .total {
   padding: 10rpx 0;

pages/mine/distribution/list.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="wrapper">
-    <!-- 筛选弹出层 -->
-    <u-popup width="90%" v-model="popup" mode="right">
+    <!-- 筛选弹出层 TODO后续版本更新 -->
+    <!-- <u-popup width="90%" v-model="popup" mode="right">
       <view class="screen-title">商品筛选</view>
 
       <view class="screen-view">
@@ -54,7 +54,7 @@
         <view class="screen-clear"> 重置 </view>
         <view class="screen-submit"> 确定 </view>
       </view>
-    </u-popup>
+    </u-popup> -->
 
     <!-- 导航栏 -->
     <view class="nav">
@@ -66,7 +66,10 @@
     <!-- 商品列表 -->
 
     <view class="goods-list">
-      <view class="goods-item" v-for="(item, index) in goodsList" :key="index">
+      <u-swipe-action v-for="(item, index) in goodsList" :disabled="!params.checked" :show="item.___selected" @open="openAction(item)" :index="index" :options="options" bg-color="#fff"
+        ref="swiperAction" :key="item.id" @click="changeActionTab(item)">
+
+        <div class="goods-item">
           <view class="goods-item-img" @click="handleNavgationGoods(item)">
             <u-image width="176rpx" height="176rpx" :src="item.thumbnail"></u-image>
           </view>
@@ -97,13 +100,16 @@
               </view>
             </view>
           </view>
-      </view>
+        </div>
+      </u-swipe-action>
+
       <view class="empty">
         <!-- <u-empty v-if="empty" text="没有分销商品了" mode="list"></u-empty> -->
       </view>
     </view>
     <canvas class="canvas-hide" canvas-id="qrcode" />
     <drawCanvas ref="drawCanvas" v-if="showFlag" :res="res" />
+    <u-modal v-model="deleteShow" :confirm-style="{'color':lightColor}" @confirm="delectConfirm" show-cancel-button :content="deleteContent" :async-close="true"></u-modal>
 
   </view>
 </template>
@@ -118,6 +124,17 @@ import drawCanvas from "@/components/m-canvas";
 export default {
   data() {
     return {
+      lightColor: this.$lightColor,
+      deleteContent: "解绑该商品？", //删除显示的信息
+      // 商品栏右侧滑动按钮
+      options: [
+        {
+          text: "解绑",
+          style: {
+            backgroundColor: this.$lightColor, //高亮颜色
+          },
+        },
+      ],
       showFlag: false, //分销分享开关
       empty: false,
       popup: false, //弹出层开关
@@ -147,6 +164,8 @@ export default {
       },
 
       routers: "",
+      deleteShow: false, //删除模态框
+      goodsVal: false, //分销商铺信息
     };
   },
   components: {
@@ -155,31 +174,75 @@ export default {
   onLoad(options) {
     this.routers = options;
   },
-  watch: {
-    showFlag(val) {
-   
-    },
-  },
+  watch: {},
   onShow() {
     this.goodsList = [];
     this.init();
   },
   methods: {
+    /**
+     * 滑动删除
+     */
+    changeActionTab(val) {
+      this.deleteShow = true;
+      this.goodsVal = val;
+    },
+
+    /**
+     * 点击解绑商品
+     */
+    delectConfirm() {
+      checkedDistributionGoods({ id: this.goodsVal.id, checked: false }).then(
+        (res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "此商品解绑成功",
+              duration: 2000,
+            });
+            this.deleteShow = false;
+            this.goodsList = [];
+            this.init();
+          }
+        }
+      );
+    },
+
+    /**
+     * 左滑打开删除
+     */
+    openAction(val) {
+      this.goodsList.forEach((item) => {
+        this.$set(item, "___selected", false);
+      });
+      this.$set(val, "___selected", true);
+    },
+
+    /**
+     * 查看图片
+     */
     handleNavgationGoods(val) {
       uni.navigateTo({
-        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.id}`,
+        url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`,
       });
     },
 
     async handleLink(goods) {
+      uni.showToast({
+        title: "请请按住保存图片",
+        duration: 2000,
+        icon: "none",
+      });
       let page = `pages/product/goods`;
-      let scene = `${goods.skuId},${goods.id},${this.routers.id}`;
+      let scene = `${goods.skuId},${goods.goodsId},${this.routers.id}`;
       let result = await getMpCode({ page, scene });
       if (result.data.success) {
         let callback = result.data.result;
         this.res.container.title = `${goods.goodsName}`;
         this.res.bottom.code = `data:image/png;base64,${callback}`;
-      this.res.bottom.price = this.$options.filters.unitPrice(goods.price, "￥");
+        this.res.bottom.price = this.$options.filters.unitPrice(
+          goods.price,
+          "￥"
+        );
         this.res.bottom.desc = `${goods.goodsName}`;
         this.res.bottom.img = `${goods.thumbnail}`;
 
@@ -187,12 +250,11 @@ export default {
           this.$refs.drawCanvas.init();
         }
         this.showFlag = true;
-      }
-      else{
+      } else {
         uni.showToast({
           title: `制作二维码失败！请稍后重试`,
           duration: 2000,
-          icon:"none"
+          icon: "none",
         });
       }
     },
@@ -209,12 +271,7 @@ export default {
 
     // 选择商品
     handleClickGoods(val) {
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      checkedDistributionGoods(val.id).then((res) => {
-        uni.hideLoading();
+      checkedDistributionGoods({ id: val.id, checked: true }).then((res) => {
         if (res.data.success) {
           uni.showToast({
             title: "已添加到我的选品库",
@@ -231,13 +288,11 @@ export default {
     },
 
     init() {
-      uni.showLoading({
-        title: "加载中",
-      });
       distributionGoods(this.params).then((res) => {
-        uni.hideLoading();
-
         if (res.data.success && res.data.result.records.length >= 1) {
+          res.data.result.records.forEach((item) => {
+            this.$set(item, "___selected", false);
+          });
           this.goodsList.push(...res.data.result.records);
         }
         if (this.goodsList.length == 0) {
@@ -399,7 +454,7 @@ export default {
       overflow: hidden;
     }
     > .-item-price {
-      color: $jd-color;
+      color: $price-color;
       > span {
         font-size: 36rpx;
       }

pages/mine/help/tips.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="wrapper">
-    <div v-html="res.content"></div>
+    <u-parse :show-with-animation="true" :lazy-load="true" :selectable="true" :html="res.content"></u-parse>
 
   </div>
 </template>

pages/mine/msgTips/packageMsg/logisticsDetail.vue

@@ -30,11 +30,8 @@
 </template>
 
 <script>
-import uniSteps from "@/components/uni-steps/uni-steps.vue";
 import { getExpress } from "@/api/trade.js";
-
 export default {
-  components: { uniSteps },
   data() {
     return {
       express: "",

pages/mine/myCollect.vue

@@ -1,19 +1,17 @@
 <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 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"
+					<u-swipe-action @open="openLeftChange(item, index, 'goods')" :show="item.selected" btn-width="180"
+						:options="LeftOptions" v-else v-for="(item, index) in goodList"
 						@click="clickGoodsSwiperAction(item, index)" :index="index" :key="index">
 						<view class="goods" @click="goGoodsDetail(item)">
 							<u-image width="131rpx" height="131rpx" :src="item.image" mode="aspectFit">
@@ -27,27 +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 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.storeId)">
+					<u-swipe-action @open="openLeftChange(item, 'store')" :show="item.selected" btn-width="180"
+						:options="LeftOptions" v-else v-for="(item, index) in storeList" :key="index"
+						@click="clickStoreSwiperAction(item)">
+						<view class="store" @click="goStoreMainPage(item.id)">
 							<view class="intro">
 								<view class="store-logo">
-                  <u-image width="102rpx" height="102rpx" :src="item.logo" :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>
@@ -55,7 +55,6 @@
 							</view>
 						</view>
 					</u-swipe-action>
-          <uni-load-more :status="storeLoad"></uni-load-more>
 				</scroll-view>
 			</view>
 		</view>
@@ -71,37 +70,35 @@ import {
 	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: [], //商品集合
@@ -110,7 +107,16 @@ export default {
 		},
 		onLoad() {
 			this.getGoodList();
-    this.getstoreList();
+			this.getStoreList();
+		},
+		onReachBottom() {
+			if (this.tabCurrentIndex == 0) {
+				this.navList[0].params.pageNumber++;
+				this.getGoodList();
+			} else {
+				this.navList[1].params.pageNumber++;
+				this.getStoreList();
+			}
 		},
 
 		methods: {
@@ -118,7 +124,10 @@ export default {
 			 * 打开商品左侧取消收藏
 			 */
 			openLeftChange(val, type) {
-      const { goodList, storeList } = this;
+				const {
+					goodList,
+					storeList
+				} = this;
 				let way;
 				type == "goods" ? (way = goodList) : (way = storeList);
 				way.forEach((item) => {
@@ -133,7 +142,6 @@ export default {
 			 */
 			clickGoodsSwiperAction(val) {
 				deleteGoodsCollection(val.skuId).then((res) => {
-      
 					if (res.statusCode == 200) {
 						this.storeList = [];
 						this.goodList = [];
@@ -145,11 +153,11 @@ export default {
 			/**
 			 * 点击店铺左侧取消收藏
 			 */
-    clickstoreSwiperAction(val) {
+			clickStoreSwiperAction(val) {
 				deleteStoreCollection(val.storeId).then((res) => {
 					if (res.statusCode == 200) {
 						this.storeList = [];
-          this.getstoreList();
+						this.getStoreList();
 					}
 				});
 			},
@@ -159,7 +167,6 @@ export default {
 			 */
 			tabClick(index) {
 				this.tabCurrentIndex = index;
-  
 			},
 
 			/**
@@ -175,7 +182,7 @@ export default {
 			/**
 			 * 查看店铺详情
 			 */
-    gostoreMainPage(id) {
+			goStoreMainPage(id) {
 				//店铺主页
 				uni.navigateTo({
 					url: "/pages/product/shopPage?id=" + id,
@@ -195,7 +202,8 @@ export default {
 					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) {
@@ -212,7 +220,7 @@ export default {
 			/**
 			 * 获取店铺集合
 			 */
-    getstoreList() {
+			getStoreList() {
 				uni.showLoading({
 					title: "加载中",
 				});
@@ -222,32 +230,16 @@ export default {
 					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();
-      }
-    },
 		},
 
 		/**
@@ -261,7 +253,7 @@ export default {
 			} else {
 				this.navList[1].params.pageNumber = 1;
 				this.storeList = [];
-      this.getstoreList();
+				this.getStoreList();
 			}
 		},
 	};
@@ -273,10 +265,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;
 	}
@@ -289,6 +289,7 @@ page,
 	/deep/ .u-swipe-content {
 		overflow: hidden;
 	}
+
 	.goods {
 		background-color: #fff;
 		border-bottom: 1px solid $border-color-light;
@@ -297,11 +298,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;
@@ -315,14 +318,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;
@@ -332,16 +338,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;
@@ -354,28 +363,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;
@@ -383,6 +398,7 @@ page,
 			}
 		}
 	}
+
 	.navbar {
 		display: flex;
 		height: 40px;
@@ -391,6 +407,7 @@ page,
 		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
 		z-index: 10;
+
 		.nav-item {
 			flex: 1;
 			display: flex;
@@ -402,10 +419,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,13 +1,17 @@
 <template>
 	<view class="myTracks">
-    <empty v-if="whetherEmpty"></empty>
-    <view v-else v-for="(item, index) in trackList" :key="index">
+		<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 class="myTracks-items">
+
+					<u-swipe-action style="width: 100%;" :show="item.show" :index="index" :key="item.id"
+						@click="delTracks" @open="open" :options="options">
 						<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)">
 								<image :src="item.thumbnail"></image>
 							</view>
@@ -21,45 +25,41 @@
 								</view>
 							</view>
 						</view>
+					</u-swipe-action>
+
 				</view>
 				<view class="myTracks-divider"></view>
-    </view>
-    <uni-load-more :status="loadStatus"></uni-load-more>
-    <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: [], //足迹列表
 			};
 		},
@@ -68,12 +68,15 @@ export default {
 		 * 滑到底部加载下一页数据
 		 */
 		onReachBottom() {
-    if (this.loadStatus != "noMore") {
 			this.params.pageNumber++;
 			this.getList();
-    }
 		},
-  onLoad() {
+		onShow() {
+			this.trackList = [];
+			this.getList();
+		},
+		onPullDownRefresh() {
+			this.trackList = [];
 			this.getList();
 		},
 		methods: {
@@ -85,35 +88,14 @@ export default {
 					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;
+				})
 			},
-
 			/**
 			 * 跳转详情
 			 */
@@ -134,60 +116,29 @@ export default {
 					uni.stopPullDownRefresh();
 					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({
@@ -199,18 +150,6 @@ export default {
 				});
 			},
 		},
-
-  /**
-   * 右侧标签栏切换
-   */
-  onNavigationBarButtonTap(e) {
-    if (!this.editFlag) {
-      this.setStyle("完成");
-    } else {
-      this.setStyle("编辑");
-    }
-    this.editFlag = !this.editFlag;
-  },
 	};
 </script>
 
@@ -261,6 +200,7 @@ export default {
 	.myTracks-item-img {
 		margin-right: 20rpx;
 		border-radius: 8rpx;
+
 		image {
 			width: 130rpx;
 			height: 130rpx;
@@ -284,6 +224,19 @@ export default {
 		padding: 10rpx 0 0 0;
 	}
 
+	.myTracks-action {
+		display: flex;
+		justify-content: space-between;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		background: #fff;
+		height: 75rpx;
+		align-items: center;
+		padding: 0 32rpx;
+	}
+
 	.myTracks-action-btn {
 		width: 130rpx;
 		height: 60rpx;
@@ -295,9 +248,7 @@ export default {
 		height: 20rpx;
 	}
 
-.myTracks-action-placeholder {
-  height: 110rpx;
-}
+
 
 	.myTracks-action-check {
 		align-items: center;

pages/mine/point/myPoint.vue

@@ -4,18 +4,18 @@
       <image src="/static/pointTrade/point_bg_1.png" mode=""></image>
       <image class="point-img" src="/static/pointTrade/tradehall.png" />
       <view class="position-point">
-        <view class="apply-point" @click="goIntro"><text>积分介绍</text></view>
+       
 
       </view>
     </view>
     <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>
 
@@ -25,7 +25,7 @@
           <view>{{ item.content }}</view>
           <view>{{ item.createTime}}</view>
         </view>
-        <view><span>{{item.pointType == "1" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
+        <view><span>{{item.pointType == "INCREASE" ? '+' : '-'}}</span>{{ item.variablePoint }}</view>
       </view>
       <uni-load-more :status="count.loadStatus"></uni-load-more>
     </div>

pages/mine/set/editionIntro.vue

@@ -1,122 +1,177 @@
-// TODO 第一版本暂无此功能 后续优化以及更新
+
 <template>
   <view class="edition-intro">
-    <view class="logo c-content">
+    <image :src="config.logo" class="logo" />
+    <h1> {{config.name}}</h1>
+    <view class='version'>
+      <!-- #ifdef APP-PLUS -->
+      Version {{localVersion.version}}
+      <!-- #endif -->
+	  <!-- #ifdef MP-WEIXIN -->
+	  小程序版本: {{localVersion.version}}  {{ localVersion.envVersion}}
+	  <!--  #endif -->
+    </view>
+
+    <!-- {{localVersion}} -->
+    <u-cell-group class="cell" :border="false">
+      <!--  #ifdef APP-PLUS -->
+      <u-cell-item v-if="IosWhether" @click="checkStar" title="去评分"></u-cell-item>
+      <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-group>
+
+    <view class="intro">
+      <view>{{config.customerServiceMobile ? `客服热线：${config.customerServiceMobile}` :  ``}}</view>
+      <view style="margin:20rpx 0 0 0;">{{config.customerServiceEmail ? `客服邮箱：${config.customerServiceEmail}` :  ``}}</view>
+
       <view>
-        <image src="/static/img/edition.png" mode=""></image>
+        <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《{{config.name}}用户协议》</view>
+        <view>CopyRight ©{{config.name}} </view>
       </view>
-      <view>版本不息&nbsp;优化不止</view>
-    </view>
-    <view class="edition c-content" v-for="(item,index) in editionHistory" :key="index">
-      <view class="level">
-        <text style="color: #1ABC9C;">{{item.version}}</text>
-        <text>{{$u.timeFormat(item.update_time, 'yyyy-mm-dd')}}</text>
-      </view>
-      <view class="detail" v-html="item.content"></view>
     </view>
   </view>
 </template>
 
 <script>
-import * as API_Message from "@/api/message.js";
+import APPUpdate from "@/plugins/APPUpdate";
+import config from "@/config/config";
+import { getAppVersion } from "@/api/message.js";
 export default {
   data() {
     return {
+      config,
+      IosWhether: false, //是否是ios
       editionHistory: [], //版本历史
+      versionData: {}, //版本信息
+      localVersion: "", //当前版本信息
       params: {
         pageNumber: 1,
         pageSize: 5,
       },
-      loadStatus: "more",
     };
   },
   onLoad() {
-    if (uni.getSystemInfoSync().platform === "android") {
+    // #ifdef APP-PLUS
+    const platform = uni.getSystemInfoSync().platform;
+    /**
+     * 获取是否是安卓
+     */
+    if (platform === "android") {
       this.params.type = 0;
     } else {
+      this.IosWhether = true;
       this.params.type = 1;
     }
-    this.GET_AppVersionList(true);
-  },
-  onReachBottom() {
-    if (this.loadStatus != "noMore") {
-      this.params.pageNumber++;
-      this.GET_AppVersionList(false);
-    }
+    this.getVersion(platform);
+
+    plus.runtime.getProperty(plus.runtime.appid, (inf) => {
+      this.localVersion = {
+        versionCode: inf.version.replace(/\./g, ""),
+        version: inf.version,
+      };
+    });
+    // #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: {
-    GET_AppVersionList(reset) {
-      if (reset) {
-        this.params.pageNumber = 1;
+    async getVersion(platform) {
+      let type;
+      platform == "android" ? (type = "ANDROID") : (type = "IOS");
+
+      let res = await getAppVersion(type);
+      if (res.data.success) {
+        this.versionData = res.data.result;
       }
-      uni.showLoading({
-        title: "加载中",
+    },
+
+    navigateTo(url) {
+      uni.navigateTo({
+        url,
       });
-      API_Message.getAppVersionList(this.params).then((response) => {
-        uni.hideLoading();
-        if (response.statusCode == 200) {
-          const { data } = response;
-          if (data.data.length < 10) {
-            this.loadStatus = "noMore";
-          }
-          this.editionHistory.push(...data.data);
-        }
+    },
+
+    /**
+     * ios点击评分
+     */
+    checkStar() {
+      plus.runtime.launchApplication({
+        action: `itms-apps://itunes.apple.com/app/${config.iosAppId}?action=write-review`,
       });
     },
+
+    /**
+     * 检查更新
+     */
+    checkUpdate() {
+      if (
+        this.versionData.version.replace(/\./g, "") <
+        this.localVersion.versionCode
+      ) {
+        APPUpdate();
+      } else {
+        uni.showToast({
+          title: "当前版本已是最新版",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+page {
+  background: #fff !important;
+}
+.cell {
+  width: 90%;
+  margin: 0 auto;
+}
 .edition-intro {
-  .logo {
+  min-height: 100vh;
+  background: #fff;
   display: flex;
+  flex-direction: column;
   justify-content: center;
   align-items: center;
-    flex-direction: column;
-    font-size: $font-lg;
-    color: $font-color-light;
-    height: 330rpx;
-    margin-bottom: 20rpx;
-    > view:nth-child(1) {
-      width: 144rpx;
-      height: 144rpx;
-      border: 1px solid #ffc71c;
-      border-radius: 50%;
-      position: relative;
-      margin-bottom: 30rpx;
-      image {
-        width: 80rpx;
-        height: 113rpx;
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        margin: auto;
+
+  > h1 {
+    margin: 20rpx 0 20rpx 0;
+    letter-spacing: 2rpx;
+  }
+  > .version {
+    font-size: 30rpx;
+    margin-bottom: 100rpx;
   }
 }
+.intro {
+  margin-top: 100rpx;
+  font-size: 24rpx;
+  letter-spacing: 2rpx;
 }
-  .edition {
-    margin-bottom: 20rpx;
-    color: $font-color-light;
-    font-size: $font-sm;
-    .level {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 20rpx 30rpx;
-      border-bottom: 2rpx solid $border-color-light;
-      text:nth-child(1) {
-        font-size: $font-base;
-        font-weight: 700;
-      }
-    }
-    .detail {
-      margin-left: 20rpx;
-      line-height: 2em;
-      padding: 20rpx 0;
-    }
-  }
+.logo {
+  width: 200rpx;
+  height: 200rpx;
 }
 </style>

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/notify.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="notify">
-		<u-cell-group>
-			<u-cell-item  title="账户通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40" v-model="setting.account"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="物流通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40" v-model="setting.logistics"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="优惠促销" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40"  v-model="setting.cheap"></u-switch>
-			</u-cell-item>
-			<u-cell-item  title="服务通知" :arrow="false">
-				<u-switch slot="right-icon" active-color="#1abc9c" size="40"  v-model="setting.service"></u-switch>
-			</u-cell-item>
-		</u-cell-group>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				setting:{
-					account:false,
-					logistics:false,
-					cheap:false,
-					service:false
-				}
-			};
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-uni-view{
-	font-size: 20rpx;
-}
-</style>

pages/mine/set/personMsg.vue

@@ -23,12 +23,16 @@
         <u-input v-model="form.___path" disabled @click="clickRegion" />
       </u-form-item>
       <view class="submit" @click="submit">保存</view>
+	  <view class="submit" @click="showModalDialog">退出登录</view>
+	  <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true"
+	    :content="'确定要退出登录么？'"></u-modal>
     </u-form>
 
     <m-city :provinceData="region" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4"></m-city>
   </view>
 </template>
 <script>
+import { logout } from "@/api/login";
 import { saveUserInfo } from "@/api/members.js";
 import { upload } from "@/api/common.js";
 import storage from "@/utils/storage.js";
@@ -38,6 +42,7 @@ export default {
   components: { uFormItem, "m-city": gkcity },
   data() {
     return {
+		quitShow: false,
       lightColor: this.$lightColor, //高亮颜色
       form: {
         nickName: storage.getUserInfo().nickName || "",
@@ -45,7 +50,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,6 +70,35 @@ export default {
     };
   },
   methods: {
+	  /**
+	   * 显示退出登录对话框
+	   */
+	  showModalDialog() {
+	    this.quitShow = true;
+	  },
+	  
+	  clear() {
+	    storage.setAccessToken("");
+	    storage.setRefreshToken("");
+	    storage.setUserInfo({});
+	    this.$options.filters.navigateToLogin("redirectTo");
+	  },
+	  
+	  /**
+	   * 确认退出
+	   * 清除缓存重新登录
+	   */
+	  async confirm() {
+	  		try{
+	  			await logout();
+	  			this.clear();
+	  		}catch(e){
+	  			//TODO handle the exception
+	  			this.clear();
+	  		}
+	    
+	  },
+	  
     /**
      * 选择地址回调
      */
@@ -98,23 +132,14 @@ export default {
      * 提交保存
      */
     submit() {
-      if (this.form.regionId.length != 0 && this.birthday) {
       delete this.form.___path;
       let params = JSON.parse(JSON.stringify(this.form));
       saveUserInfo(params).then((res) => {
-       
         if (res.statusCode == 200) {
           storage.setUserInfo(res.data.result);
           uni.navigateBack();
         }
       });
-      } else {
-        uni.showToast({
-          title: "请填写生日和城市!",
-          duration: 2000,
-          icon: "none",
-        });
-      }
     },
 
     /**

pages/mine/set/securityCenter/editPassword.vue

@@ -1,25 +1,28 @@
 <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 v-model="codeForm.mobile" placeholder="请输入您的手机号" />
+						<u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
 					</u-form-item>
 
 					<u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
 						<u-input v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-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="LOGIN" />
+					<myVerification keep-running @send="verification" class="verification" ref="verification"
+						business="FIND_USER" />
 				</view>
 				<view v-if="validateFlage">
 					<u-form-item label-width="120" label="旧密码">
@@ -36,12 +39,19 @@
 				</view>
 			</u-form>
 		</view>
+	</view>
 </template>
 
 <script>
-import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
-import storage from "@/utils/storage.js";
-import { md5 } from "@/utils/md5.js"; // md5
+	import {
+		sendMobile,
+		resetByMobile,
+		modifyPass
+	} from "@/api/login";
+
+	import {
+		md5
+	} from "@/utils/md5.js"; // md5
 	import myVerification from "@/components/verification/verification.vue"; //验证
 	import uuid from "@/utils/uuid.modified.js";
 	export default {
@@ -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).then((res) => {
+						sendMobile(this.codeForm.mobile, "FIND_USER").then((res) => {
 							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("请倒计时结束后再发送");
 					}
@@ -161,8 +169,7 @@ export default {
 					if (valid) {
 						resetByMobile(this.codeForm).then((res) => {
 							if (res.data.success) {
-              storage.setAccessToken(res.data.result.accessToken);
-              storage.setRefreshToken(res.data.result.refreshToken);
+								this.validateFlage = !this.validateFlage;
 								// 登录成功
 								uni.showToast({
 									title: "验证成功!",
@@ -177,7 +184,11 @@ export default {
 			codeChange(text) {
 				this.tips = text;
 			},
-    end() {},
+			end() {
+				
+				this.flage = false;
+					this.$refs.verification.getCode()
+			},
 
 			/**判断是否是当前用户的手机号 */
 			isUserPhone() {
@@ -199,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({
@@ -209,38 +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;