显示价格修改

更新@Neo0820提交的pr

.gitignore

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

App.vue

@@ -1,14 +1,35 @@
-
-
 <script>
 	/**
 	 * vuex管理登录状态，具体可以参考官方登录模板示例
 	 */
-import { mapMutations } from "vuex";
+	import {
+		mapMutations
+	} from "vuex";
 	import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
 	import config from "@/config/config";
-// 悬浮球
+	import storage from "@/utils/storage";
+
+	
+	
+	/**
+	 * 路由监听并删除路由
+	 * https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateTo.html
+	 * */
+	// #ifdef MP-WEIXIN
+	wx.onAppRoute((res) => {
+		const pages = getCurrentPages();
+		console.log("pages:" + pages.length,pages);
+		if (pages.length > 3) {
+			delete getCurrentPages()[2]
+		}
+		console.log('路由监听', {
+			res
+		})
+	})
+	// #endif
 
 	export default {
 		data() {
@@ -17,6 +38,7 @@ export default {
 			};
 		},
 
+
 		/**
 		 * 监听返回
 		 */
@@ -66,7 +88,18 @@ export default {
 
 		onShow() {
 			// #ifndef H5
+			if(this.config.enableGetClipboard){
 				this.getClipboard();
+			}
+			// #endif
+			// #ifdef APP-PLUS
+
+			if (storage.getShow()) {
+				if (uni.getSystemInfoSync().platform == 'ios') {
+					this.$u.route("/pages/tabbar/screen/fullScreen");
+
+				}
+			}
 			// #endif
 		},
 		methods: {
@@ -108,8 +141,7 @@ export default {
 						//app启动时打开启动广告页
 						var w = plus.webview.open(
 							"/hybrid/html/advertise/advertise.html",
-            "本地地址",
+							"本地地址", {
-            {
 								top: 0,
 								bottom: 0,
 								zindex: 999,
@@ -140,10 +172,13 @@ export default {
 			 */
 			async getClipboard() {
 				let res = await getClipboardData();
+
 				/**
 				 * 解析粘贴板数据
 				 */
-      if (res.indexOf(config.shareLink) != -1) {
+
+				if (res.indexOf(config.shareLink) != -1 && (res != this.$store.state.shareLink)) {
+					this.$store.state.shareLink = res
 					uni.showModal({
 						title: "提示",
 						content: "检测到一个分享链接是否跳转？",
@@ -206,15 +241,18 @@ export default {
 		height: auto !important;
 		padding-top: 10rpx;
 	}
+
 	// #endif
 
 	body {
 		background-color: $bg-color;
 	}
+
 	/************************ */
 	.w200 {
 		width: 200rpx !important;
 	}
+
 	.flex1 {
 		flex: 1; //必须父级设置flex
 	}

MP_verify_qSyvBPhDsPdxvOhC.txt

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

README.md

@@ -1,18 +1,22 @@
-## 🔥 Lilishop B2B2C商城系统
+## 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
+##### 交流 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)
 
@@ -20,148 +24,88 @@
 &nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
 
 
-### 🔥 商城介绍
+### 商城介绍
 **官网**：https://pickmall.cn
 
-Lilishop 商城系统 基于SpringBoot 研发，B2B2C多用户商城系统，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+Lilishop商城系统支持商家入驻，后端基于SpringBoot 研发，前端使用 Vue、uniapp开发， **系统全端全部代码开源**
 
-业务兼容O2O商城/B2B商城/B2B2C商城/F2B2C商城/S2B2C商城。支持小程序商城、H5商城、APP商城、 PC商城。
+前后端分离，支持分布式部署，支持Docker，各个API独立，并且有独立的消费者。
 
+### 商城 API/消费者 聚合版
+api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转
+https://gitee.com/beijing_hongye_huicheng/lilishop-simplify
 
-商城前后端分离、支持分布式部署。
+### 开发/使用/常见问题 帮助文档
-
-商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块
-
-商城包含各种中间件、搜索引擎、多级缓存、分布式事务、分布式任务调度等，支持Docker，支持k8s。是一款高性能，支持高并发的商城系统。
-
-##### 商城 API/消费者 聚合版
-api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转https://gitee.com/beijing_hongye_huicheng/lilishop-simplify
-
-### ☃️ 商城 开发/使用/常见问题 帮助文档
 
 https://docs.pickmall.cn
 
-### 💧 开源商城项目地址(gitee)
+### 项目地址
 
-**API（商城所有API）**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
+gitee : https://gitee.com/beijing_hongye_huicheng
 
-**UI（商城管理端/商家端/买家PC端）**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+github 镜像: https://github.com/lilishop?tab=repositories
 
-**uniapp（商城移动端，支持小程序/APP/H5）**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+商城UI 项目下3个文件夹 
-
+buyer：买家PC端，seller：商家端，manager：后台管理端
-**docker一键部署（商城部署脚本）**：https://gitee.com/beijing_hongye_huicheng/docker.git
-
-### 💧 开源商城项目地址(github)
-
-**API（商城所有API）**：https://github.com/hongyehuicheng/lilishop.git
-
-**UI（商城管理端/商家端/买家PC端）**： https://github.com/hongyehuicheng/lilishop-ui.git
-
-**uniapp（商城移动端，支持小程序/APP/H5）**：https://github.com/hongyehuicheng/lilishop-uniapp.git
-
-**docker一键部署（商城部署脚本）**：https://github.com/hongyehuicheng/docker.git
 
 
-☃️ UI 项目下3个文件夹 buyer：买家PC端，seller：商家端，manager：后台管理端
+### 演示地址
+PS：手机验证码为 ‘111111’
 
+**平台管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
 
-### 💧 演示地址(手机验证码为 ‘111111’)
+**店铺管理端**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
-
-**商城管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
-
-**商城店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
 
 **商城PC页面**：https://pc-b2b2c.pickmall.cn
 
-**商城移动端（请使浏览器手机模式，或者用手机浏览器打开）**：https://m-b2b2c.pickmall.cn
+**商城 小程序/公众号/APP**：扫描二维码
-
-**小程序/公众号**：扫描二维码
 
 ![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
 
-### 🚙 3行命令搭建本地商城（注：只能本机访问，如需调整，请自行操作镜像）
+### 快速本地部署
 
-温馨提示：由于服务中间件较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
+[点击跳转](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，按需执行）。
 
 
 
-#####  docker环境安装 [点击跳转](https://docs.pickmall.cn/deploy/%E8%BF%90%E8%A1%8C%E7%8E%AF%E5%A2%83%E5%87%86%E5%A4%87.html)
+### 功能列表
 
 
 
-##### 下载docker-compose脚本
+#### 平台管理端功能
-`git clone https://gitee.com/beijing_hongye_huicheng/docker.git `
 
-##### 部署商城所需中间件
+![平台管理端功能](https://pickmall.cn/assets/imgs/other/managerList1.jpg)
-`docker-compose up -d`
-
-##### 部署商城应用
-`docker-compose -f docker-compose-application.yml up -d`
 
 
 
-PS:商城数据库单独部署 https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql 这里有与tag版本一致的sql，根据tag获取sql，如果使用master代码，则需要在lilishop项目根目录的DB目录中，获取对应的升级sql。
+#### 卖家功能
-
-##### 商城 API/UI 地址
-
-| API           | 地址            |
-| -------------- | --------------- |
-| 商城买家API  | http://127.0.0.1:8888     |
-| 商城商家API   | http://127.0.0.1:8889      |
-| 商城管理端API     | http://127.0.0.1:8887   |
-| 商城基础API  | http://127.0.0.1:8890     |
-
-| 前端演示         | 地址            |
-| -------------- | --------------- |
-| 商城PC端    | http://127.0.0.1:10000     |
-| 商城WAP端     | http://127.0.0.1:10001      |
-| 商城卖家端    | http://127.0.0.1:10002   |
-| 商城管理端     | http://127.0.0.1:10003     |
-
-
-
-
-
-### ⚾️ 功能列表
-
-
-
-#### 🥎 商城平台功能
-
-![平台功能](https://pickmall.cn/assets/imgs/other/managerList.jpg)
-
-
-
-#### 🥎 商城卖家功能
 
 ![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg)
 
 
+### 商城前端功能展示
 
-
+#### 商城移动端
-
-### 🧩 商城前端功能展示
-
-
-
-#### ⚽️ 商城移动端
 
 <img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
 
-
+#### 平台管理端
-
-#### ⚽️ 商城管理端
 
 ![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
 
 
-### 商城技术选型
+### 技术选型
 
-#### 🥅 架构图
+#### 架构图
 
-![架构](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
+![技术选型](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
 
-##### 🕹 后台技术选型
+##### 后台技术选型
 
 | 说明           | 框架            | 说明           |               |
 | -------------- | --------------- | -------------- | ------------- |
@@ -175,7 +119,7 @@ PS:商城数据库单独部署 https://gitee.com/beijing_hongye_huicheng/docker/
 | 短信           | 阿里云短信      | 认证           | JWT           |
 | 日志处理       | Log4j           | 接口规范       | RESTful       |
 
-##### 🖥 前端-运营后台、店铺后台
+##### 前端-运营后台、店铺后台
 
 | 说明       | 框架       | 说明       | 框架    |
 | ---------- | ---------- | ---------- | ------- |
@@ -185,34 +129,43 @@ PS:商城数据库单独部署 https://gitee.com/beijing_hongye_huicheng/docker/
 | 基础UI库   | iView      | UI界面基于 | iView   |
 | 网络请求   | axios      |            |         |
 
-##### 📱前端-移动端
+##### 前端-移动端
 
 | 说明      | 架构    | 说明     | 架构    |
 | --------- | ------- | -------- | ------- |
 | 基础UI库  | uViewui | 基础框架 | uni-app |
 | CSS预处理 | scss    | 地图引擎 | amap    |
 
-### 🌟 版本升级
+### 版本升级
 
 ```
-商城后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
+系统后续会提供多场景解决方案。
-
+更多架构：微服务、Saas、中台等，都会支持。 支持差价升级商业授权
-后续会考虑推出微服务商城系统/商城中台等
 ```
 
+### 商业授权
+商业版本与开源版本代码一致，没有区分
 
-### ⚠️ 开源须知
+商业使用需要授权，授权方式可选择联系官网客服，或者qq群联系群主。
+
+商业授权模式为永久授权，支持永久升级。
+
+商业案例由于涉及部分多层二开关系，如需了解可以咨询销售。
+
+
+### 开源须知
 1.仅允许用于个人学习研究使用.
 
 2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
 
 3.软件受国家计算机软件著作权保护（登记号：2021SR0805085）。
 
-4.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+4.限制商用，如果需要商业使用请联系我们。QQ3409056806.或者加入qq群联系群主。
 
 
-### 🐧 交流群
+
+### 交流群
 
 ##### 官方qq 1群 961316482（已满）
-##### 官方qq 2群 875294241
+##### 官方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

@@ -25,7 +25,7 @@ export function getAddressList(pageNumber, pageSize) {
  */
 export function getLogistics() {
   return http.request({
-    url: "/logistics",
+    url: "/other/logistics",
     method: Method.GET,
     needToken: true,
     params: { pageNumber: 1, pageSize: 200, disabled: "OPEN" },

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,
+  });
+}
 
 /**
  * 获取广告图

api/login.js

@@ -14,6 +14,23 @@ export function resetByMobile(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
@@ -74,3 +91,20 @@ export function logout () {
     needToken: true,
   })
 }
+
+export function scannerCodeLogin(params){
+	return http.request({
+	  url: '/passport/member/app_scanner',
+	  method: "POST",
+	  params,
+	  needToken: true,
+	});
+}
+export function scannerCodeLoginConfirm(params){
+	return http.request({
+	  url: '/passport/member/app_confirm',
+	  method: "POST",
+	  params,
+	  needToken: true,
+	});
+}

api/message.js

@@ -14,7 +14,7 @@ import api from '@/config/api.js';
  */
 export function getWeChatMpMessage() { 
   return http.request({
-    url: 'mini-program/subscribeMessage',
+    url: 'passport/connect/miniProgram/subscribeMessage',
     method: Method.GET
   });
 }
@@ -48,6 +48,24 @@ export function messageMarkAsRead(ids) {
   });
 }
 
+//读取站内消息
+export function editMessages(message_id,params){
+  return http.request({
+    url:`/message/member/${message_id}`,
+    method:Method.PUT,
+    needToken:true,
+    params
+  })
+}
+//获取站内消息
+export function messages(params) {
+  return http.request({
+    url: "/message/member",
+    method: Method.GET,
+    needToken: true,
+    params,
+  });
+}
 
 /**
  * 获取物流消息列表
@@ -73,7 +91,7 @@ export function getLogisticsMessages(params) {
  */	
  export function getAppVersion(appType) {
   return http.request({
-    url: `/appVersion/${appType}`,
+    url: `/other/appVersion/${appType}`,
     method: Method.GET,
     type:"manager"
   });
@@ -86,7 +104,7 @@ export function getLogisticsMessages(params) {
  */	
  export function getAppVersionList(type,data) {
   return http.request({
-    url: `/appVersion/appVersion/${type}`,
+    url: `/other/appVersion/appVersion/${type}`,
     method: Method.GET,
     type:"manager",
     data

components/m-buy/goods.vue

@@ -1,35 +1,24 @@
 <template>
 	<div class="wrapper">
-    <u-popup
+		<u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-      class="popup"
+			:border-radius="setup.radius" @close="closeMask()">
-      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
+						<u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
-              width="200rpx"
+							:src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
-              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)">
+						<view class="goods-price"
+							v-if="goodsDetail.promotionPrice && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
 							<span v-if="goodsDetail.promotionPrice && !pointDetail">
 								￥
 								<span class="goods-price-promotionShow goods-price-bigshow">{{
-                  formatPrice(goodsDetail.promotionPrice)[0]
+                  $options.filters.goodsFormatPrice(goodsDetail.promotionPrice)[0]
                 }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
+								.{{ $options.filters.goodsFormatPrice(goodsDetail.promotionPrice)[1] }}
 							</span>
 							<span v-if="pointDetail.points">
 								<span class="goods-price-promotionShow goods-price-bigshow">{{
@@ -40,20 +29,38 @@
 							<div class="promotion-box">
 								￥
 								<span class="goods-price-bigshow">{{
-                  formatPrice(goodsDetail.price)[0]
+                  $options.filters.goodsFormatPrice(goodsDetail.price)[0]
                 }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
+								.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
 							</div>
 						</view>
 						<!-- 正常商品的价格 -->
-            <view class="goods-price" v-else>
+						<view v-else>
+							
+							<!-- 批发价格 -->
+							<div class='price-row flex' v-if="goodsDetail.salesModel === 'WHOLESALE'">
+								<div class='goods-price' v-for="(item,index) in wholesaleList" :key="index">
 									<span>
 										￥
 										<span class="goods-price-bigshow">{{
-                  formatPrice(goodsDetail.price)[0]
+									    $options.filters.goodsFormatPrice(item.price)[0]
 									  }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
+										.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
 									</span>
+									<span class='wholesale-item'>
+										{{item.num}}{{goodsDetail.goodsUnit}}
+									</span>
+								</div>
+							</div>
+							<div class="goods-price" v-else>
+								<span>
+									￥
+									<span class="goods-price-bigshow">{{
+							    $options.filters.goodsFormatPrice(goodsDetail.price)[0]
+							  }}</span>
+									.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
+								</span>
+							</div>
 						</view>
 						<view class="goods-check-skus">
 							已选
@@ -62,66 +69,46 @@
 								<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
+					<view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
-            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
+							<view v-if="!parentOrder" :class="{ active: spec_val.value == currentSelceted[specIndex] }"
-                v-if="!parentOrder"
+								class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
-                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 v-if="parentOrder && spec_val.skuId == goodsDetail.id"
-                v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+								:class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
-                class="skus-view-item"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
-                v-for="(spec_val, spec_index) in spec.values"
-                :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)"
-                >{{ spec_val.value }}
 							</view>
 						</view>
 					</view>
 					<!-- 数量 -->
-          <view class="goods-skus-number">
+					<view class="goods-skus-number flex flex-a-c flex-j-sb">
 						<view class="view-class-title">数量</view>
-            <u-number-box
+						
-              :bg-color="numberBox.bgColor"
+						<u-input  class="view-class-input" v-model="num" type="number"  />
-              :max="200"
-              :color="numberBox.color"
-              :input-width="numberBox.width"
-              :input-height="numberBox.height"
-              :size="numberBox.size"
-              :min="1"
-              v-model="num"
-            >
-            </u-number-box>
 					</view>
 				</scroll-view>
 				<!-- 按钮 -->
 				<view class="btns">
-          <view
+					<view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
-            class="box-btn card"
+						@click="addToCartOrBuy('cart')">加入购物车</view>
-            v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
-            @click="addToCartOrBuy('cart')"
-            >加入购物车</view
-          >
 					<view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
 				</view>
 			</view>
@@ -137,14 +124,7 @@ export default {
 			return {
 				setup,
 				num: 1,
-      // 步进器的大小尺寸单位是 rpx
+				
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
 				selectName: "", //选中商品的昵称
 				selectSkuList: "", //选中商铺sku,
 				selectedSpecImg: "", //选中的图片路径
@@ -154,9 +134,14 @@ export default {
 				currentSelceted: [],
 				skuList: "",
 				isClose: false, //是否可以点击遮罩关闭
+				
 			};
 		},
 		props: {
+			wholesaleList:{
+				type: null,
+				default: false,
+			},
 			buyMask: {
 				type: Boolean,
 				default: false,
@@ -186,7 +171,22 @@ export 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) {
@@ -204,14 +204,6 @@ export default {
 		},
 
 		methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
 			closeMask() {
 				this.$emit("closeBuy", false);
 			},
@@ -398,7 +390,10 @@ export default {
 </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);
@@ -419,6 +414,13 @@ export default {
 	.goods-skus-number {
 		justify-content: space-between;
 		display: flex;
+		
+		>.view-class-title{
+			flex: 8;
+		}
+		>.view-class-input{
+			flex:1
+		}
 	}
 
 	/deep/ .uni-scroll-view {
@@ -464,6 +466,13 @@ export default {
 			}
 		}
 	}
+	.wholesale-item{
+		color: #999 !important;
+		font-size: 24rpx;
+		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
+	}
 
 	.goods-header {
 		height: 200rpx;
@@ -483,8 +492,14 @@ export default {
 	.goods-price {
 		color: $price-color;
 		line-height: 80rpx;
-  display: flex;
+		margin-right: 20rpx;
+		>* {
+			color: $price-color;
+			line-height: 80rpx;
+	
 		}
+	}
+
 	.promotion-box {
 		line-height: 1;
 		display: flex;
@@ -492,22 +507,28 @@ export default {
 		text-decoration: line-through;
 		color: #999;
 		margin-left: 10rpx;
+
 		/deep/ span {
 			font-size: 30rpx;
 		}
 	}
+
 	.promotion {
 		font-size: 30rpx;
 	}
+
 	.goods-price-promotionShow {
 		font-size: 48rpx;
 	}
+
 	.goods-check-skus {
 		font-size: 24rpx;
 		color: #999;
+
 		>.goods-check-skus-name {
 			margin-left: 4rpx;
 		}
+
 		>span {
 			color: #333;
 		}

components/m-city/m-city.vue

@@ -200,7 +200,7 @@ export default {
             this.tabCurrentIndex++;
 
             // 当前距离重新为最上面
-            this.scrollTop = 0;
+						this.$set(this,'scrollTop',0)
           }
         } else {
           this.$emit("funcValue", this.tabbars);

components/m-goods-list/README.md

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

components/m-goods-list/base-list.vue

@@ -0,0 +1,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/index.vue

@@ -1,27 +1,11 @@
 <template>
   <div>
     <div class="goods-recommend">{{title ? `--${title}-- `:''}}</div>
-    <div class="goods-list">
+		 <goodsTemplate :res='goodsList' />
-      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
-        <div class="goods-img">
-          <u-image :src="item.content.thumbnail" mode="aspectFill" height="350rpx" width="100%">
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-        </div>
-        <div class="goods-desc">
-          <div class="goods-title">
-            {{ item.content.goodsName }}
-          </div>
-          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.content.price | unitPrice }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
-
 <script>
+	import goodsTemplate from '@/components/m-goods-list/list'
 import { getGoodsList } from "@/api/goods.js";
 export default {
   data() {
@@ -50,6 +34,7 @@ export default {
       default: "",
     },
   },
+	components:{goodsTemplate},
   mounted() {
     this.initGoods();
   },

components/m-share/index.vue

@@ -8,7 +8,7 @@
     <view class="share-list">
       <!-- #ifdef MP-WEIXIN -->
       <view class="share-item">
-        <button class="share-btn" open-type="share">
+        <button class="share-btn" @click="weChatShare" open-type="share">
           <u-icon color="#04BE02" size="80" name="weixin-fill"></u-icon>微信好友
         </button>
       </view>
@@ -62,6 +62,16 @@ export default {
     close() {
       this.$emit("close");
     },
+    weChatShare(){
+      this.$u.mpShare = {
+        title:  this.shareTitle(), // 默认为小程序名称，可自定义
+        path: '', // 默认为当前页面路径，一般无需修改，QQ小程序不支持
+        // 分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径。
+        // 支持PNG及JPG，默认为当前页面的截图
+        imageUrl: this.thumbnail ||''
+      }
+    },
+
     // h5复制链接
     // #ifdef H5
     copyLink() {
@@ -93,13 +103,13 @@ export default {
     shareTitle() {
       let shareTitle;
       if (this.type == "goods") {
-        shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`;
+        shareTitle = `[好友推荐]${this.goodsName}快来跟我一起看看吧`;
       } else if (this.type == "shops") {
-        shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`;
+        shareTitle = `[好友发现]${this.goodsName}快来跟我一起看看吧`;
       } else if (this.type == "pintuan") {
-        shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`;
+        shareTitle = `[好友邀请]${this.goodsName}快来跟我一起抢购吧!`;
       } else if (this.type == "kanjia") {
-        shareTitle = `请快来帮我砍一刀${this.goodsName}`;
+        shareTitle = `[好友邀请]请快来帮我砍一刀${this.goodsName}`;
       }
       return shareTitle;
     },

config/api.js

@@ -4,12 +4,8 @@
  */
 // 开发环境
 const dev = {
-  // common: "https://common-api.pickmall.cn",
+  common: "https://common-api.pickmall.cn",
-  // buyer: "https://buyer-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
-  
-        common: "http://192.168.111:8890",
-        buyer: "http://192.168.111:8888",
-
 };
 // 生产环境
 const prod = {

config/config.js

@@ -1,16 +1,24 @@
 const name = "lilishop"; //全局商城name
-const schemeName = 'lilishop' //唤醒app需要的schemeName
+const schemeName = "lilishop"; //唤醒app需要的schemeName
 export default {
   name: name,
   schemeLink: `${schemeName}://`, //唤起app地址
   downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址
   shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址
   appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
-  appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看
+  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请Web服务key
-  aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
+  scanAuthNavigation: ["https://m-b2b2c.pickmall.cn/"], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
-  scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
   iosAppId: "id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
   logo: "https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址
   customerServiceMobile: "13161366885", //客服电话
-  customerServiceEmail:"lili@lili.com" //客服邮箱 
+  customerServiceEmail: "lili@lili.com", //客服邮箱
+  imWebSrc: "https://im.pickmall.cn", //IM地址
+  enableGetClipboard: true, //是否启用粘贴板获取 scanAuthNavigation 中的链接，如果匹配则会跳转到对应页面
+  enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app
+  /**
+   * 如需更换主题请修改此处以及uni.scss中的全局颜色
+   */
+  mainColor: "#ff3c2a", // 主题色
+  lightColor: "#ff6b35", // 高亮主题色
+  aiderLightColor: "#ff9f28", // 辅助高亮颜色
 };

main.js

@@ -3,19 +3,23 @@ import App from "./App";
 import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
 import store from "./store";
-
+import config from '@/config/config';
-
+import airBtn from "@/components/m-airbtn/index.vue";
 /**
  * 仅在h5中显示唤醒app功能
  * 在h5页面手动挂载
  * 
  */
 // #ifdef H5
-import airBtn from "@/components/m-airbtn/index.vue";
+if(config.enableMiniBarStartUpApp){
   let btn = Vue.component("airBtn", airBtn); //全局注册
   document.body.appendChild(new btn().$mount().$el);
+}
 // #endif
 
+// 引入uView对小程序分享的mixin封装
+let mpShare = require('uview-ui/libs/mixin/mpShare.js');
+Vue.mixin(mpShare)
 
 /**
  * 全局filters
@@ -38,11 +42,11 @@ Vue.config.productionTip = false;
  * 如需更换主题请修改此处以及uni.scss中的全局颜色
  */
 // 主题色
-Vue.prototype.$mainColor = "#ff3c2a";
+Vue.prototype.$mainColor = config.mainColor;
 // 高亮主题色
-Vue.prototype.$lightColor = "#ff6b35";
+Vue.prototype.$lightColor = config.lightColor;
 // 辅助高亮颜色
-Vue.prototype.$aiderLightColor = "#ff9f28";
+Vue.prototype.$aiderLightColor = config.aiderLightColor;
 
 
 App.mpType = "app";

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "lili商城",
-    "appid" : "__UNI__C100675",
+    "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.0.49",
+    "versionName" : "4.2.7",
-    "versionCode" : 4000049,
+    "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,
@@ -75,7 +84,8 @@
                     "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
                     "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                 },
-                "urltypes" : "lilishop"
+                "urltypes" : "lilishop",
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {
@@ -195,10 +205,6 @@
             }
         },
         "plugins" : {
-            "myPlugin" : {
-                "version" : "1.1.0",
-                "provider" : "wx738958e0f4c894f9"
-            },
             "live-player-plugin" : {
                 "version" : "1.3.0",
                 "provider" : "wx2b03c6e691cd7370"

pages.json

@@ -14,7 +14,24 @@
 				"enablePullDownRefresh":true  
 			}
 		}, 
-		
+		{
+			"path":"pages/tabbar/screen/fullScreen",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus":{
+					"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+					"background": "transparent", // 背景透明
+					"backgroundColor": "rgba(0,0,0,0)", // 背景透明
+					"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+				}
+			}
+		},
+		{
+			"path": "pages/tabbar/home/title",
+			"style": {
+				"navigationBarTitleText": "消息"
+			}
+		},
 		{
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
@@ -68,6 +85,12 @@
 			"style": {
 				
 			}
+		},
+				{
+					"path": "pages/tabbar/special/special",
+					"style": {
+							"navigationBarTitleText": "专题"
+					}
 		}
 
 	],
@@ -233,6 +256,8 @@
 						"navigationBarTitleText": "面容登录"
 					}
 				},
+				
+				
 				{
 					"path": "set/securityCenter/editPassword",
 					"style": {
@@ -444,6 +469,14 @@
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "scannerCodeLoginConfirm",
+					"style": {
+						"navigationBarTitleText": "扫码登录",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]
 
@@ -455,6 +488,8 @@
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -468,6 +503,7 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"

pages/cart/coupon/couponCenter.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="coupon-center">
-    <swiper class="swiper-box">
+		<div class="swiper-box">
-      <swiper-item class="swiper-item">
+			<div class="swiper-item">
-        <scroll-view class="scroll-v" enableBackToTop="true" scroll-y @scrolltolower="loadMore">
+				<div class="scroll-v" enableBackToTop="true" scroll-y>
-          <u-empty mode="coupon" text="没有优惠券了" v-if="whetherEmpty"></u-empty>
+					<u-empty mode="coupon" style='margin-top: 20%;' text="没有优惠券了" v-if="whetherEmpty"></u-empty>
 					<view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
 						<view class="left">
 							<view class="wave-line">
@@ -23,10 +23,11 @@
 						<view class="right">
 							<view>
 								<!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
-                <view v-if="item.scopeType">
+								<view class="coupon-title wes-3" 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 v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
 							</view>
@@ -37,16 +38,20 @@
 							<view class="bg-quan"> 券 </view>
 						</view>
 					</view>
-          <uni-load-more :status="loadStatus"></uni-load-more>
+
-        </scroll-view>
+				</div>
-      </swiper-item>
+			</div>
-    </swiper>
+		</div>
 	</view>
 </template>
 
 <script>
-import { receiveCoupons } from "@/api/members.js";
+	import {
-import { getAllCoupons } from "@/api/promotions.js";
+		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;
+							this.couponData = res.data.result
-              if (data.total == 0) {
+							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

@@ -34,7 +34,7 @@
       <view class="right">
         <view class="desc">
           <view v-if="item.scopeType">
-            <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+            <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
             <view v-else
               >{{

pages/cart/coupon/myCoupon.vue

@@ -32,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"
                       ? "仅限品类"
@@ -188,7 +188,7 @@ export default {
      * 立即使用优惠券
      */
     useItNow(item) {
-      if (item.storeId && item.storeId!='platform') {
+      if (item.storeId && item.storeId!='0') {
         uni.navigateTo({
           url: `/pages/product/shopPage?id=${item.storeId}`,
         });

pages/cart/payment/payOrder.vue

@@ -104,7 +104,7 @@
 								});
 							}
 							else{
-				uni.redirectTo({
+							uni.navigateTo({
 								url: "/pages/order/myOrder?status=0",
 							});
 							}
@@ -139,6 +139,7 @@
 					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
 					this.orderType = "RECHARGE";
+					
 				} else if (this.routerVal.trade_sn) {
 					this.sn = this.routerVal.trade_sn;
 					this.orderType = "TRADE";
@@ -161,7 +162,7 @@
 					});
 					// #endif
 
-					// #ifndef MP-WEIXIN
+					
 				  if(this.routerVal.recharge_sn){
 						this.payList = res.data.result.support.filter((item) => {
 						return item != "WALLET";
@@ -170,7 +171,7 @@
 					 else{
 						this.payList = res.data.result.support;
 					}
-					// #ifndef APP-PLUS
+					// #ifdef H5
 					//判断是否微信浏览器
 					var ua = window.navigator.userAgent.toLowerCase();
 					if (ua.match(/MicroMessenger/i) == 'micromessenger') {
@@ -178,11 +179,17 @@
 						this.payList = res.data.result.support.filter((item) => {
 							return item != "ALIPAY";
 						});
+						// 充值的话仅保留微信支付
+						if(this.orderType == "RECHARGE"){
+							this.payList = res.data.result.support.filter((item) => {
+								return item == "WECHAT";
+							});
+						}
 						
 					}
 					// #endif
 					
-					// #endif
+				
 					
 
 					this.walletValue = res.data.result.walletValue;
@@ -227,12 +234,17 @@
 				// 客户端类型 APP/NATIVE/JSAPI/H5
 				const paymentClient = this.paymentClient;
 				
+				uni.showLoading({
+				  title: "正在唤起支付...",
+				  mask:true
+				});
+				
 				// #ifdef APP-PLUS
 				//APP pay
 				// 初始化支付签名
 				await API_Trade.initiatePay(paymentMethod, paymentClient, params).then(
 					(signXml) => {
-
+						uni.hideLoading();
 						//如果支付异常
 						if (!signXml.data.success) {
 							uni.showToast({
@@ -245,19 +257,24 @@
 						let payForm = signXml.data.result;
 						
 						let paymentType = paymentMethod === "WECHAT" ? "wxpay" : "alipay";
-						uni.requestPayment({
+						
-							provider: paymentType,
+						if(paymentMethod === "WALLET"){
-							orderInfo: payForm,
+							uni.showToast({
-							success: (e) => {
+								icon: "none",
-								console.log(e);
+								title: "支付成功!",
+							});
+							this.callback(paymentMethod)
+						}
+						else{
+							uni.requestPayment({
+								provider: paymentType,
+								orderInfo: payForm || '',
+								success: (e) => {
 									uni.showToast({
 										icon: "none",
 										title: "支付成功!",
 									});
-
 									this.callback(paymentMethod)
-								
-								 
 								},
 								fail: (e) => {
 									console.log(this);
@@ -269,6 +286,7 @@
 								},
 							});
 						}
+					}
 				);
 				//APP pay
 				// #endif

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>
@@ -160,9 +162,7 @@ export default {
             delete this.form.updateTime;
             editAddress(this.form).then((res) => {
               if (res.data.success) {
-                uni.navigateTo({
+                uni.navigateBack();
-                  url: `/${beforePage.route}`,
-                });
               }
             });
           }

pages/mine/address/addressManage.vue

@@ -86,22 +86,8 @@ export default {
    * 进入页面检测当前账户是否登录
    */
   onShow() {
-    let that = this;
+    if (this.$options.filters.tipsToLogin()) {
-    if (this.$options.filters.isLogin("auth")) {
       this.getAddressList();
-    } else {
-      uni.showModal({
-        title: "提示",
-        content: "检测到您的账号还未登录,是否去登录？",
-        confirmColor: this.$lightColor,
-        success: function (res) {
-          if (res.confirm) {
-            that.$options.filters.navigateToLogin();
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
     } 
   },
   methods: {

pages/mine/deposit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="wap">
-    <u-navbar back-text="" title="预存款列表">
+    <u-navbar  title="预存款列表">
     </u-navbar>
     <view class="wrapper-show-money">
       <view class="money-view">
@@ -28,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>
@@ -45,7 +45,7 @@ export default {
   data() {
     return {
       walletNum: 0,
-      status: "loadmore",
+
       current: 0,
       swiperCurrent: 0,
       userInfo: "", //用户详情信息
@@ -82,27 +82,23 @@ export default {
    
     /**分页获取预存款充值记录 */
     getRecharge() {
-      this.status = "loading";
+
       getUserRecharge(this.params).then((res) => {
         if (res.data.success) {
           if (res.data.result.records.length != 0) {
-            this.status = "loadmore";
+       
             this.datas.push(...res.data.result.records);
-          } else {
-            this.status = "nomore";
           }
         }
       });
     },
 
     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";
           }
         }
       });

pages/mine/deposit/recharge.vue

@@ -1,3 +1,4 @@
+
 <template>
   <view>
     <view class="-list">
@@ -5,7 +6,8 @@
       <view class="content">
         <view class="price">
           <span> ￥</span>
-          <u-input v-model="price" placeholder="" type="number" />
+          <u-input v-model="price" placeholder='金额' type="number" />
+					
         </view>
 
       </view>

pages/mine/distribution/history.vue

@@ -42,7 +42,6 @@
         </view>
         <view class="log-item-footer">
           <view>会员名称：{{ item.memberName }}</view>
-          <view>订单金额：{{ item.flowPrice | unitPrice }}</view>
         </view>
         <view class="log-item-footers">
           <view>订单号：{{ item.orderSn }}</view>

pages/mine/help/tips.vue

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

pages/mine/myTracks.vue

@@ -1,20 +1,17 @@
 <template>
 	<view class="myTracks">
 		<u-navbar title="我的足迹">
-      <div @click="changeRightBtn" slot="right" style="margin-right:32rpx">
+
-        {{edit}}
-      </div>
 		</u-navbar>
 		<u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
 		<div v-else>
 			<view v-for="(item, index) in trackList" :key="index">
 				<view class="myTracks-title" @click="navgaiteToStore(item)">{{item.storeName}}</view>
 				<view 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>
@@ -28,48 +25,41 @@
 								</view>
 							</view>
 						</view>
+					</u-swipe-action>
+
 				</view>
 				<view class="myTracks-divider"></view>
 
 			</view>
-      <uni-load-more :status="loadStatus"></uni-load-more>
-    </div>
-    <view v-if="editFlag">
-      <view class="myTracks-action">
-        <view class="myTracks-action-check">
-          <u-checkbox-group>
-            <u-checkbox v-model="allChecked" v-if="editFlag" active-color="#ff6b35" style="margin-right: 10rpx"
-              @change="checkedAllitem"></u-checkbox>
-            全选
-          </u-checkbox-group>
-        </view>
 
-        <view>
+		</div>
-          <u-button type="warning"  @click="delAllTracks" class="myTracks-action-btn">
+
-            删除
-          </u-button>
-        </view>
-      </view>
-    </view>
 	</view>
 </template>
 
 <script>
-import { myTrackList, deleteHistoryListId } from "@/api/members.js";
+	import {
+		myTrackList,
+		deleteHistoryListId
+	} from "@/api/members.js";
 
 	export default {
 		data() {
 			return {
-      edit: "编辑",
+
-      editFlag: false, //是否编辑
-      allChecked: false, //是否全选
-      loadStatus: "more", //底部下拉加载状态
 				whetherEmpty: false, //是否数据为空
 				params: {
 					pageNumber: 1,
 					pageSize: 10,
+					order: "desc",
+					sort: "updateTime",
 				},
-
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#dd524d'
+					}
+				}],
 				trackList: [], //足迹列表
 			};
 		},
@@ -78,12 +68,11 @@ export default {
 		 * 滑到底部加载下一页数据
 		 */
 		onReachBottom() {
-    if (this.loadStatus != "noMore") {
 			this.params.pageNumber++;
 			this.getList();
-    }
 		},
-  onLoad() {
+		onShow() {
+			this.trackList = [];
 			this.getList();
 		},
 		onPullDownRefresh() {
@@ -99,35 +88,14 @@ export default {
 					url: "/pages/product/shopPage?id=" + val.storeId,
 				});
 			},
-
+			open(index) {
-    /**
+				// 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
-     * 设置右侧导航栏文本
+				// 原本为'false'，再次设置为'false'会无效
-     */
+				this.trackList[index].show = true;
-    setStyle(text) {
+				this.trackList.map((val, idx) => {
-      //导航按钮文本设置
+					if (index != idx) this.trackList[idx].show = false;
-      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
 			},
-
 			/**
 			 * 跳转详情
 			 */
@@ -148,80 +116,29 @@ export default {
 					uni.stopPullDownRefresh();
 					uni.hideLoading();
 					if (res.statusCode == 200) {
-          res.data.result &&
+						res.data.result.records.length &&
-            res.data.result.forEach((item) => {
+							res.data.result.records.forEach((item) => {
-              item.___isDel = false;
+								item.show = false;
 							});
 
-          let data = res.data.result;
+						let data = res.data.result.records;
 						if (data.total == 0) {
 							this.whetherEmpty = true;
-          } else if (data.total < 10) {
-            this.loadStatus = "noMore";
-            this.trackList.push(...data);
 						} else {
 							this.trackList.push(...data);
-            if (data.length < 10) this.loadStatus = "noMore";
 						}
 					}
 				});
 			},
 
-    /**
-     * 点击后判断是不是全选
-     */
-    
-    changeChecked(val) {
-      var opt = null;
-      const isCheckedAll = this.trackList.every((key) => {
-        key.___isDel == val.___isDel;  
-        opt = key.___isDel;
-        return opt;
-      });
-      if(opt){
-        this.allChecked = isCheckedAll;
-      }else{
-        this.allChecked = false;
-      }     
-    },
-
-    /**
-     * 右侧标签栏切换
-     */
-    changeRightBtn(e) {
-      if (!this.editFlag) {
-        this.edit = "完成";
-      } else {
-        this.edit = "编辑";
-      }
-      this.editFlag = !this.editFlag;
-    },
-
-    /**
-     * 点击全选按钮
-     */
-    checkedAllitem() {
-      //全选按钮
-      this.trackList.forEach((key) => {
-        this.$set(key, "___isDel", this.allChecked);
-      });
-    },
 
 			/**
 			 * 删除足迹
 			 */
-    delAllTracks() {
+			delTracks(index) {
-      let way = [];
+				deleteHistoryListId(this.trackList[index].goodsId).then((res) => {
-      this.trackList.forEach((key) => {
-        if (key.___isDel) {
-          way.push(key.goodsId);
-        }
-      });
-      if (way.length == 0) return false;
-      deleteHistoryListId(way).then((res) => {
 					if (res.data.code == 200) {
 						this.trackList = [];
-          this.allChecked = false;
 						this.getList();
 					} else {
 						uni.showToast({
@@ -283,6 +200,7 @@ export default {
 	.myTracks-item-img {
 		margin-right: 20rpx;
 		border-radius: 8rpx;
+
 		image {
 			width: 130rpx;
 			height: 130rpx;
@@ -305,6 +223,7 @@ export default {
 		color: $light-color;
 		padding: 10rpx 0 0 0;
 	}
+
 	.myTracks-action {
 		display: flex;
 		justify-content: space-between;

pages/mine/point/myPoint.vue

@@ -11,11 +11,11 @@
     <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>剩余积分：</text>
-        <text class="pcolor">{{ pointData.variablePoint || 0 }}</text>
+        <text class="pcolor">{{ pointData.point || 0 }}</text>
       </u-col>
     </u-row>
 

pages/mine/set/editionIntro.vue

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

pages/mine/set/feedBack.vue

@@ -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>

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 || "",
@@ -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();
+	  		}
+	    
+	  },
+	  
     /**
      * 选择地址回调
      */

pages/mine/set/securityCenter/editPassword.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="box">
 		<view class="box-tips">
-      <h2>
+			<h2 class='h2'>
 				{{verificationTitle[validateFlage==false ? 0 : 1].title}}
 			</h2>
 			<view class="verification">{{verificationTitle[step].desc}}</view>
 		</view>
-    <u-form :model="codeForm" class="form" ref="validateCodeForm">
+		<view class="form">
+			<u-form :model="codeForm" ref="validateCodeForm">
 				<view v-if="!validateFlage">
 					<u-form-item label-width="120" label="手机号" prop="mobile">
 						<u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
@@ -14,12 +15,14 @@
 
 					<u-form-item class="sendCode" label-width="120" prop="code" label="验证码">
 						<u-input v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-verification-code unique-key="page-edit" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
+						<u-verification-code unique-key="page-edit" :seconds="seconds" @end="end" @start="start"
+							ref="uCode" @change="codeChange"></u-verification-code>
 						<view @tap="getCode" class="text-tips">{{ tips }}</view>
 					</u-form-item>
 
 					<view class="submit" @click="validatePhone">验证</view>
-        <myVerification keep-running @send="verification" class="verification" ref="verification" business="FIND_USER" />
+					<myVerification keep-running @send="verification" class="verification" ref="verification"
+						business="FIND_USER" />
 				</view>
 				<view v-if="validateFlage">
 					<u-form-item label-width="120" label="旧密码">
@@ -36,12 +39,19 @@
 				</view>
 			</u-form>
 		</view>
+	</view>
 </template>
 
 <script>
-import { sendMobile, resetByMobile, modifyPass } from "@/api/login";
+	import {
+		sendMobile,
+		resetByMobile,
+		modifyPass
+	} from "@/api/login";
 
-import { md5 } from "@/utils/md5.js"; // md5
+	import {
+		md5
+	} from "@/utils/md5.js"; // md5
 	import myVerification from "@/components/verification/verification.vue"; //验证
 	import uuid from "@/utils/uuid.modified.js";
 	export default {
@@ -52,8 +62,7 @@ export default {
 			return {
 				uuid,
 				validateFlage: false, //是否进行了手机号验证
-      verificationTitle: [
+				verificationTitle: [{
-        {
 						title: "安全验证",
 						desc: "请输入当前手机号进行安全验证",
 					},
@@ -72,28 +81,24 @@ export default {
 				newPassword: "", //新密码
 				password: "", //密码
 				tips: "", //提示
-      seconds: 60, // 60s等待时间
+				seconds: 69, // 60s等待时间
 
 				// 验证码登录校验
 				codeRules: {
-        mobile: [
+					mobile: [{
-          {
 						validator: (rule, value, callback) => {
 							return this.$u.test.mobile(value);
 						},
 						message: "手机号码不正确",
 						trigger: ["blur"],
-          },
+					}, ],
-        ],
+					code: [{
-        code: [
-          {
 						min: 4,
 						max: 6,
 						required: true,
 						message: "请输入验证码",
 						trigger: ["blur"],
-          },
+					}, ],
-        ],
 				},
 			};
 		},
@@ -104,6 +109,7 @@ export default {
 		watch: {
 			flage(val) {
 				if (val) {
+
 					if (this.$refs.uCode.canGetCode) {
 						uni.showLoading({
 							title: "正在获取验证码",
@@ -111,7 +117,7 @@ export default {
 						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("请倒计时结束后再发送");
 					}
@@ -176,7 +184,11 @@ export default {
 			codeChange(text) {
 				this.tips = text;
 			},
-    end() {},
+			end() {
+				
+				this.flage = false;
+					this.$refs.verification.getCode()
+			},
 
 			/**判断是否是当前用户的手机号 */
 			isUserPhone() {
@@ -198,7 +210,7 @@ export default {
 			getCode() {
 				if (this.isUserPhone()) {
 					if (this.tips == "重新获取") {
-          this.flage = true;
+						this.$refs.verification.error(); //发送
 					}
 					if (!this.$u.test.mobile(this.codeForm.mobile)) {
 						uni.showToast({
@@ -208,41 +220,55 @@ export default {
 						return false;
 					}
 					if (!this.flage) {
-          this.$refs.verification.hide();
+						this.$refs.verification.error(); //发送
 						return false;
 					}
 				}
 			},
 			start() {
 				this.$u.toast("验证码已发送");
-      this.flage = false;
+				this.flage = true;
+
+				this.$refs.verification.hide();
 			},
 		},
 	};
 </script>
 <style lang="scss" scoped>
-@import url("../../../passport/login.scss");
+	@import url("@/pages/passport/login.scss");
-.u-form-item {
+
+	/deep/ .u-form-item {
 		margin: 40rpx 0;
 	}
+
 	.sendCode {
 		/deep/ .u-form-item--right__content__slot {
 			display: flex;
 		}
 	}
+
+	.h2 {
+		font-size: 40rpx;
+		font-weight: bold;
+	}
+
 	page {
 		background: #fff;
 	}
+
 	.box {
 		padding: 80rpx 0;
 		border-radius: 20rpx;
 	}
+
 	.submit {
 		background: $light-color;
 	}
+
 	.box-tips {
 		margin: 0 72rpx;
 	}
+
 	.verification {
 		font-size: 24rpx;
 		color: #999;

pages/mine/set/setUp.vue

@@ -22,9 +22,9 @@
       <!-- #endif -->
       <u-cell-item :title="`关于${config.name}`" @click="navigateTo('/pages/mine/set/editionIntro')"></u-cell-item>
     </u-cell-group>
-    <view class="submit" @click="showModalDialog">{{userInfo.id ?'退出登录':'返回登录'}}</view>
+    <view class="submit" @click="showModalDialog">{{userInfo.id ?'退出登录':'登录'}}</view>
     <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true"
-      :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"></u-modal>
+      :content="userInfo.id ? '确定要退出登录么？' : '确定要登录么？'"></u-modal>
   </view>
 </template>
 
@@ -65,8 +65,14 @@ export default {
      * 清除缓存重新登录
      */
     async confirm() {
+			try{
 				await logout();
 				this.clear();
+			}catch(e){
+				//TODO handle the exception
+				this.clear();
+			}
+      
     },
 
     /**

pages/navigation/search/search.scss

@@ -22,19 +22,6 @@
   }
 }
 
-.promotion {
-  margin-top: 4rpx;
-  display: flex;
-  div {
-    span {
-      font-size: 24rpx;
-      color: $light-color;
-      margin-right: 10rpx;
-      padding: 0 4rpx;
-      border-radius: 2rpx;
-    }
-  }
-}
 .status_bar {
   height: var(--status-bar-height);
   background: #fff !important;
@@ -437,180 +424,13 @@ view {
       margin-left: 4rpx;
       font-size: 26rpx;
       color: #888;
-
-    
     }
 
     .xia {
       transform: scaleY(-1);
     }
   }
-
-  .cate-item {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    width: 80rpx;
-    position: relative;
-    font-size: 44rpx;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      border-left: 1px solid #ddd;
-      width: 0;
-      height: 36rpx;
 }
-  }
-}
-
-/* 分类 */
-.cate-mask {
-  position: fixed;
-  left: 0;
-  top: var(--window-top);
-  bottom: 0;
-  width: 100%;
-  background: rgba(0, 0, 0, 0);
-  z-index: 95;
-  transition: 0.3s;
-
-  .cate-content {
-    width: 630rpx;
-    height: 100%;
-    background: #fff;
-    float: right;
-    transform: translateX(100%);
-    transition: 0.3s;
-  }
-
-  &.none {
-    display: none;
-  }
-
-  &.show {
-    background: rgba(0, 0, 0, 0.4);
-
-    .cate-content {
-      transform: translateX(0);
-    }
-  }
-}
-
-.cate-list {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-
-  .cate-item {
-    display: flex;
-    align-items: center;
-    height: 90rpx;
-    padding-left: 30rpx;
-    font-size: 28rpx;
-    color: #555;
-    position: relative;
-  }
-
-  .two {
-    height: 64rpx;
-    color: #303133;
-    font-size: 30rpx;
-    background: #f8f8f8;
-  }
-}
-.price-box {
-  margin-top: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-right: 10rpx;
-  font-size: 24rpx;
-  color: $font-color-light;
-}
-
-.price {
-  font-size: 26rpx;
-  line-height: 1;
-  color: $main-color;
-  font-weight: bold;
-  /deep/ span:nth-of-type(1) {
-    font-size: 38rpx;
-  }
-}
-/* 商品列表 */
-.goods-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 10rpx 20rpx 284rpx;
-
-
-  // background: #fff;
-  width: 100%;
-  .goods-item {
-    background-color: #ffffff;
-    display: flex;
-    border-radius: 16rpx;
-    flex-direction: column;
-    width: calc(50% - 30rpx);
-    margin-bottom: 20rpx;
-    padding-bottom: 20rpx;
-
-    &:nth-child(2n + 1) {
-      margin-right: 20rpx;
-    }
-
-    .goods-detail {
-      margin: 0 20rpx;
-    }
-  }
-
-  .image-wrapper {
-    width: 100%;
-    height: 330rpx;
-    border-radius: 16rpx 16rpx 0 0;
-    overflow: hidden;
-    padding: 0;
-    image {
-      width: 100%;
-      height: 100%;
-      opacity: 1;
-      border-radius: 16rpx 16rpx 0 0;
-    }
-  }
-
-  .title {
-    font-size: $font-base;
-    color: $font-color-dark;
-    line-height: 1.5;
-    height: 84rpx;
-    padding: 10rpx 0 0;
-    display: -webkit-box;
-
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  .count-config,
-  .store-seller-name {
-    font-size: $font-sm;
-  }
-
-  .text-hidden {
-    
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
 .status_bar {
   height: var(--status-bar-height);
   width: 100%;

pages/navigation/search/searchPage.vue

@@ -35,6 +35,7 @@
               @click="doSearch(keyword)">
               <span>{{ keyword }} </span>
             </div>
+						
             <div @click="showMore" v-if="oldKeywordIndex > loadIndex" class="oldKeyItem">展示更多</div>
           </div>
         </view>
@@ -82,65 +83,10 @@
       <div v-if="isSWitch">
         <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250"
           @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
-          <div class="goods-class">
+          <goodsList :res='goodsList' type='oneColumns' :keyword='keyword' />
-            <div v-for="(item, index) in goodsList" :key="index" class="goods-row">
-              <div class="flex goods-col">
-                <div class="goods-img" @click="navigateToDetailPage(item)">
-                  <u-image width="230rpx" height="230rpx" :src="item.content.thumbnail">
-                    <u-loading slot="loading"></u-loading>
-                  </u-image>
-                </div>
-                <div class="goods-detail">
-                  <div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
-                  <view class="price-box" @click="navigateToDetailPage(item)">
-                    <div class="price" v-if="item.content.price!=undefined">
-                      ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
-                      formatPrice(item.content.price )[1]
-                    }}
-                    </div>
-                  </view>
-                  <div class="promotion" @click="navigateToDetailPage(item)">
-                    <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
-                      <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
-                      <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
-                      <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
-                    </div>
-                  </div>
-                  <div style="overflow: hidden" @click="navigateToDetailPage(item)" class="count-config">
-                    <span style="float: left; font-size: 22rpx">已售 {{ item.content.buyCount || '0' }}</span>
-                    <span style="float: right; font-size: 22rpx">{{ item.content.commentNum || '0' }}条评论</span>
-                  </div>
-                  <div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
-                    <div class="text-hidden">
-                      <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
-                        type="error" />
-                      <span class="line1-store-name">{{ item.content.storeName }}</span>
-                      <span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon></span>
-                    </div>
-                    <span>
-                      <u-icon name="arrow-right" color="#c5c5c5"></u-icon>
-                    </span>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-          </div>
           <uni-load-more :status="loadingType" @loadmore="loadmore()"></uni-load-more>
         </scroll-view>
       </div>
-      <div class="empty" v-if="goodsList == [] || goodsList == '' || goodsList == null">
-        <view>
-          <image style="width: 320rpx; height: 240rpx" src="/static/nodata.png">
-
-          </image>
-        </view>
-        <view>
-          <p>没有找到相关的商品信息</p>
-          <p>请换一个关键词试试吧</p>
-        </view>
-      </div>
-
       <!-- 一行两个商品展示 -->
       <div v-if="
           !isSWitch &&
@@ -148,45 +94,7 @@
         ">
         <scroll-view :style="{ height: goodsHeight }" scroll-anchoring enableBackToTop="true"
           @scrolltolower="loadmore()" scroll-with-animation scroll-y lower-threshold="250" class="scoll-page">
-          <view class="goods-list">
+					<goodsList :res='goodsList' :keyword='keyword' />
-            <view v-for="(item, index) in goodsList" :key="index" class="goods-item">
-              <view class="image-wrapper" @click="navigateToDetailPage(item)">
-                <image :src="item.content.thumbnail" mode="aspectFill"></image>
-              </view>
-              <view class="goods-detail">
-                <div class="title clamp" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
-                <view class="price-box" @click="navigateToDetailPage(item)">
-                  <div class="price" v-if="item.content.price!=undefined">
-                    ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
-                      formatPrice(item.content.price )[1]
-                    }}
-                  </div>
-                </view>
-
-                <div class="promotion" @click="navigateToDetailPage(item)">
-                  <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
-                    <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
-                    <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
-                    <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
-                  </div>
-                </div>
-                <div class="count-config" @click="navigateToDetailPage(item)">
-                  <span>已售 {{ item.content.buyCount || "0" }}</span>
-                  <span>{{ item.content.commentNum || "0" }}条评论</span>
-                </div>
-                <div class="store-seller-name" @click="navigateToStoreDetailPage(item)">
-                  <div class="text-hidden">
-                    <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
-                      type="error" />
-                    <span>{{ item.content.storeName || "暂无" }}</span>
-                  </div>
-                  <span>
-                    <u-icon name="arrow-right"></u-icon>
-                  </span>
-                </div>
-              </view>
-            </view>
-          </view>
           <uni-load-more :status="loadingType"></uni-load-more>
         </scroll-view>
       </div>
@@ -268,22 +176,34 @@
         </view>
       </view>
     </u-popup>
+	<div class="empty" v-if="empty">
+		<view>
+			<image style="width: 320rpx; height: 240rpx" src="/static/nodata.png">
+	
+			</image>
+		</view>
+		<view>
+			<p>没有找到相关的商品信息</p>
+			<p>请换一个关键词试试吧</p>
+		</view>
+	</div>
     <u-back-top :scroll-top="scrollTop"></u-back-top>
   </view>
 </template>
 
 <script>
 import { getGoodsList, getGoodsRelated } from "@/api/goods.js";
-
+import goodsList from '@/components/m-goods-list/list.vue'
 import { getHotKeywords } from "@/api/home.js";
 import mSearch from "@/components/m-search-revision/m-search-revision.vue";
 import storage from "@/utils/storage";
 export default {
   data() {
     return {
+	  empty:false,
       scrollTop: 0,
       loadIndex: 10,
-      oldKeywordIndex: "",
+      oldKeywordIndex: 0,
       selectedWay: {
         brand: [],
         categoryId: [],
@@ -339,6 +259,7 @@ export default {
       routerVal: "",
     };
   },
+	
   onPageScroll(e) {
     console.log(e);
     this.scrollTop = e.scrollTop;
@@ -371,6 +292,7 @@ export default {
   },
   components: {
     mSearch,
+		goodsList
   },
   watch: {
     /**
@@ -449,15 +371,6 @@ export default {
         return array;
       }
     },
-
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
     // 展示更多数据
     showMore() {
       this.loadOldKeyword(this.oldKeywordIndex);
@@ -658,7 +571,7 @@ export default {
         key: "OldKeys",
         success: (res) => {
           var OldKeys = JSON.parse(res.data);
-          this.oldKeywordIndex = res.data.length;
+          this.oldKeywordIndex = OldKeys.length;
           for (let i = 0; i < index; i++) {
             this.oldKeywordList.push(OldKeys[i]);
           }
@@ -710,6 +623,9 @@ export default {
 
       if (goodsList.data.result.content.length < 10) {
 		  this.loadingType = "noMore";
+		  this.empty = true
+	    } else {
+		  this.empty = false
 	    }
       this.goodsList.push(...goodsList.data.result.content);
       this.initSortGoods();
@@ -759,6 +675,9 @@ export default {
     doSearchSwitch() {
       this.isSWitch = !this.isSWitch;
       this.isShowSeachGoods = true;
+			this.params.pageNumber = 1 
+			this.params.pageSize = 10
+			this.loadData("refresh", 1);
     },
 
     /**

pages/order/afterSales/afterSales.vue

@@ -1,15 +1,31 @@
 <template>
   <view class="content">
     <view class="u-tabs-box">
-      <u-tabs bg-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"
+      <u-tabs
-        :active-color="$lightColor"></u-tabs>
+        bg-color="#fff"
+        :list="list"
+        :is-scroll="false"
+        :current="current"
+        @change="change"
+        :active-color="$lightColor"
+      ></u-tabs>
     </view>
     <div class="u-tabs-search">
-      <u-search placeholder="请输入订单编号" @search="handleGetOrderList(current)" @clear="handleGetOrderList(current)"
+      <u-search
-        @custom="handleGetOrderList(current)" v-model="params.orderSn"></u-search>
+        placeholder="请输入订单编号"
+        @search="submitSearchOrderList(current)"
+        @clear="submitSearchOrderList(current)"
+        @custom="submitSearchOrderList(current)"
+        v-model="orderSn"
+      >
+      </u-search>
     </div>
     <scroll-view class="body-view" scroll-y @scrolltolower="renderDate">
-      <view class="seller-view" v-for="(order, orderIndex) in orderList" :key="orderIndex">
+      <view
+        class="seller-view"
+        v-for="(order, orderIndex) in orderList"
+        :key="orderIndex"
+      >
         <!-- 店铺名称 -->
         <view class="seller-info u-flex u-row-between" v-if="current == 0">
           <view class="seller-name">
@@ -19,13 +35,20 @@
         </view>
         <!-- 申请记录 选项卡 -->
         <view class="seller-info u-flex u-row-between" v-if="current != 0">
-          <view class="order-sn">售后单号：{{ order.service_sn || order.sn }}</view>
+          <view class="order-sn"
+            >售后单号：{{ order.service_sn || order.sn }}</view
+          >
           <view class="order-sn">{{ order.serviceType_text }}</view>
         </view>
         <view v-for="(sku, goodsIndex) in order.orderItems" :key="goodsIndex">
           <view class="goods-item-view" @click="onDetail(order, sku)">
             <view class="goods-img">
-              <u-image border-radius="6" width="100%" height="100%" :src="sku.image"></u-image>
+              <u-image
+                border-radius="6"
+                width="100%"
+                height="100%"
+                :src="sku.image"
+              ></u-image>
             </view>
             <view class="goods-info">
               <view class="goods-title u-line-2">{{ sku.name }}</view>
@@ -38,80 +61,139 @@
               <view>x{{ sku.num }}</view>
             </view>
           </view>
-          <view class="btn-view u-flex u-row-between">
           <view class="description">
             <!-- 售后申请  -->
-              <view v-if="
+            <view v-if="current === 0 && order.groupAfterSaleStatus">
-                  current === 0 &&  order.groupAfterSaleStatus &&
+              <view
-                 order.groupAfterSaleStatus.includes('ALREADY_APPLIED') 
+                v-if="order.groupAfterSaleStatus.includes('ALREADY_APPLIED')"
-                " class="cannot_apply">
+                class="cannot_apply not_center"
+              >
                 <u-icon class="icon" name="info-circle-fill"></u-icon>
                 该商品已申请售后服务
               </view>
-              <view class="cannot_apply"
+            </view>
-                v-if="current === 0 && order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('EXPIRED')  "
+            <view v-if="current === 0 && order.groupAfterSaleStatus">
-                @click="tipsShow = true">
+              <view
+                v-if="order.groupAfterSaleStatus.includes('EXPIRED')"
+                class="cannot_apply not_center"
+                @click="tipsShow = true"
+              >
                 <u-icon class="icon" name="info-circle-fill"></u-icon>
                 该商品无法申请售后
               </view>
+            </view>
 
             <div v-if="current === 1 || current === 2">
               <!-- 申请中 -->
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_GOODS'">
+              <view
-                  退货处理-{{ order.serviceStatus | serviceStatusList  }}</view>
+                class="cannot_apply not_center"
-                <view class="cannot_apply" v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'">
+                v-if="order.serviceType == 'RETURN_GOODS'"
-                  补发商品-{{ order.serviceStatus | serviceStatusList  }}</view>
+              >
-                <view class="cannot_apply" v-if="order.serviceType == 'RETURN_MONEY'">
+                退货处理-{{ order.serviceStatus | serviceStatusList }}</view
-                  退款-{{ order.serviceStatus | serviceStatusList  }}</view>
+              >
-                <view class="cannot_apply" v-if="order.serviceType == 'EXCHANGE_GOODS'">
+              <view
-                  换货-{{ order.serviceStatus | serviceStatusList  }}</view>
+                class="cannot_apply not_center"
-                <view class="cannot_apply" v-if="order.serviceType == 'CANCEL'">
+                v-if="order.serviceType == 'SUPPLY_AGAIN_GOODS'"
-                  取消订单-{{ order.serviceStatus | serviceStatusList  }}</view>
+              >
+                补发商品-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'RETURN_MONEY'"
+              >
+                退款-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'EXCHANGE_GOODS'"
+              >
+                换货-{{ order.serviceStatus | serviceStatusList }}</view
+              >
+              <view
+                class="cannot_apply not_center"
+                v-if="order.serviceType == 'CANCEL'"
+              >
+                取消订单-{{ order.serviceStatus | serviceStatusList }}</view
+              >
             </div>
 
             <!-- 申请记录 -->
           </view>
+          <view class="btn-view u-flex u-row-right">
             <!-- 售后申请  -->
-              <div v-if="current === 0 && sku.afterSaleStatus && (sku.afterSaleStatus.includes('NOT_APPLIED') || sku.afterSaleStatus.includes('PART_AFTER_SALE')) "  @click="applyService(sku.sn, order, sku)" class="sale">
+
-                <view class=" default-btn border" >
+            <div class="sale" v-if="current === 0 && sku.afterSaleStatus">
-                  申请售后
+              <div
-                </view>
+                v-if="
+									order.flowPrice != 0 &&
+                  sku.afterSaleStatus.includes('NOT_APPLIED') ||
+                  sku.afterSaleStatus.includes('PART_AFTER_SALE')
+                "
+                @click="applyService(sku.sn, order, sku)"
+              >
+                <view class="default-btn border"> 申请售后 </view>
+              </div>
             </div>
             <view class="after-line">
-
               <!-- 申请中 -->
-              <view class="default-btn border" v-if="
+              <view
+                class="default-btn border"
+                v-if="
                   current === 2 &&
                   order.serviceStatus &&
                   order.serviceStatus == 'PASS' &&
                   order.serviceType != 'RETURN_MONEY'
-                " @click="onExpress(order, sku)">
+                "
+                @click="onExpress(order, sku)"
+              >
                 提交物流
               </view>
-              <view @click="close(order,sku)" v-if="current === 1" class="default-btn close">
+              <view
+                @click="close(order, sku)"
+                v-if="current === 1"
+                class="default-btn close"
+              >
                 取消售后
               </view>
-              <view @click="afterDetails(order, sku)" v-if="current === 1 || current === 2" class="default-btn border">
+              <view
+                @click="afterDetails(order, sku)"
+                v-if="current === 1 || current === 2"
+                class="default-btn border"
+              >
                 售后详情
               </view>
             </view>
           </view>
         </view>
-        <view v-if="
+        <view
-            current === 0 && order.groupAfterSaleStatus &&
+          v-if="
+            current === 0 &&
+            order.groupAfterSaleStatus &&
             order.groupAfterSaleStatus != 'ALREADY_APPLIED' &&
             order.orderItems.length >= 1
-          " class="btn-view u-flex u-row-between">
+          "
+          class="btn-view u-flex u-row-between"
+        >
           <!-- 多个商品显示订单总价格 -->
           <view class="cannot_apply">
-            订单总金额:<span class="countMoney">￥{{ order.flowPrice | unitPrice }}</span>
+            订单总金额:<span class="countMoney"
+              >￥{{ order.flowPrice | unitPrice }}</span
+            >
           </view>
         </view>
       </view>
       <u-loadmore bg-color="#f8f8f8" :status="status" />
     </scroll-view>
-    <u-modal show-cancel-button @confirm="closeService" v-model="cancelShow" content="确认取消售后"></u-modal>
+    <u-modal
-    <u-modal v-model="tipsShow" content="当订单未确认收货|已过售后服务有效期|已申请售后服务时，不能申请售后"></u-modal>
+      show-cancel-button
+      @confirm="closeService"
+      v-model="cancelShow"
+      content="确认取消售后"
+    ></u-modal>
+    <u-modal
+      v-model="tipsShow"
+      content="当订单未确认收货|已过售后服务有效期|已申请售后服务时，不能申请售后"
+    ></u-modal>
   </view>
 </template>
 
@@ -148,7 +230,7 @@ export default {
         pageNumber: 1,
         pageSize: 10,
         sort: "createTime",
-        flowPrice:  1,
+        flowPrice: 0,
         order: "desc",
       },
 
@@ -157,21 +239,27 @@ export default {
         pageSize: 10,
       },
       status: "loadmore",
+      orderSn: "", // 搜索订单sn
     };
   },
   onLoad(options) {
     this.orderList = [];
     this.params.pageNumber = 1;
     if (options.orderSn) this.params.orderSn = options.orderSn;
-    this.getOrderList(this.current);
+    this.searchOrderList(this.current);
   },
   onPullDownRefresh() {
     this.change(this.current);
   },
   methods: {
-    handleGetOrderList(current) {
+    /**
+     * 点击搜索执行搜索
+     */
+    submitSearchOrderList(current) {
+      this.params.pageNumber = 1;
+      this.logParams.pageNumber = 1;
       this.orderList = [];
-      this.getOrderList(current);
+      this.searchOrderList(current);
     },
     /**
      * 切换tab页时，初始化数据
@@ -184,8 +272,18 @@ export default {
       };
       this.orderList = [];
       //如果是2 则读取售后申请记录列表
+      this.searchOrderList(index);
+      uni.stopPullDownRefresh();
+    },
+
+    /**
+     * 搜索初始化
+     * 根据当前tab传值的索引进行更改
+     */
+    searchOrderList(index) {
       if (index == 0) {
-        this.getOrderList(index);
+        this.orderSn ? (this.params.orderSn = this.orderSn) : "";
+        this.getOrderList();
       } else {
         this.logParams = {
           pageNumber: 1,
@@ -196,16 +294,16 @@ export default {
         if (index === 1) {
           this.logParams.serviceStatus = "APPLY";
         }
+        this.orderSn ? (this.logParams.orderSn = this.orderSn) : "";
         this.orderList = [];
         this.getAfterSaleLogList();
       }
-      uni.stopPullDownRefresh();
     },
 
     /**
      * 获取订单列表
      */
-    getOrderList(index) {
+    getOrderList() {
       uni.showLoading({
         title: "加载中",
         mask: true,
@@ -245,7 +343,7 @@ export default {
         });
       }
       this.orderList = [];
-      this.getOrderList(this.current);
+      this.searchOrderList(this.current);
 
       uni.hideLoading();
     },
@@ -307,6 +405,10 @@ export default {
      */
     onExpress(order, sku) {
       sku.storeName = order.storeName;
+      let data = {
+        ...order,
+        ...sku,
+      };
 
       storage.setAfterSaleData(data);
       uni.navigateTo({
@@ -361,31 +463,38 @@ page,
   overflow-y: auto;
   height: calc(100vh - 44px - 80rpx - 104rpx);
 }
+
 .u-tabs-search {
   padding: 20rpx;
   background: #fff;
 }
+
 .countMoney {
   margin-left: 7rpx;
   color: $main-color;
   font-size: 28rpx;
 }
+
 .seller-view {
   background-color: #fff;
   margin: 20rpx 0rpx;
   padding: 0rpx 20rpx;
   border-radius: 20rpx;
+
   .seller-info {
     height: 70rpx;
+
     .seller-name {
       font-size: 28rpx;
       display: flex;
       flex-direction: row;
+
       .name {
         margin-left: 15rpx;
         margin-top: -2rpx;
       }
     }
+
     .order-sn {
       font-size: 22rpx;
       color: #909399;
@@ -429,6 +538,7 @@ page,
       color: $main-color;
     }
   }
+
   .btn-view {
     padding: 16rpx 0;
 
@@ -438,10 +548,12 @@ page,
     }
   }
 }
+
 .description {
   color: #909399;
   size: 25rpx;
 }
+
 .cannot_apply {
   text-align: center;
   font-size: 22rpx;
@@ -450,6 +562,10 @@ page,
   height: 70rpx;
   line-height: 70rpx;
 }
+.not_center {
+  text-align: left;
+}
+
 .icon {
   margin-right: 10rpx;
 }
@@ -459,6 +575,7 @@ page,
   display: flex;
   justify-content: flex-end;
 }
+
 .default-btn {
   background-color: #ffffff;
   margin-left: 15rpx;
@@ -469,9 +586,11 @@ page,
   padding: 0 24rpx;
   border-radius: 200px;
 }
+
 .close {
   color: $light-color;
 }
+
 .border {
   border: 2rpx solid $light-color;
   color: $light-color;

pages/order/afterSales/afterSalesDetail.vue

@@ -335,12 +335,6 @@ export default {
             type: "error",
           });
           return false;
-        } else if (checkBankno(this.form.bankAccountNumber) === false) {
-          this.$refs.uToast.show({
-            title: "银行卡卡号不正确",
-            type: "error",
-          });
-          return false;
         } else if (this.$u.test.chinese(this.form.bankAccountName) === false) {
           this.$refs.uToast.show({
             title: "银行开户名输入错误",

pages/order/fillorder.vue

@@ -10,7 +10,10 @@
               <!-- 省市区 -->
               <div class="flex flex-a-c">
                 <span class="default" v-if="address.isDefault">默认</span>
-                <div class="address-list" v-if="address.consigneeAddressPath.length != 0">
+                <div
+                  class="address-list"
+                  v-if="address.consigneeAddressPath.length != 0"
+                >
                   <span
                     class="address-item"
                     v-for="(item, index) in address.consigneeAddressPath"
@@ -89,14 +92,23 @@
     </view>
 
     <!-- 店铺商品信息 -->
-    <div class="box box2" v-for="(item, index) in orderMessage.cartList" :key="index">
+    <div
+      class="box box2"
+      v-for="(item, index) in orderMessage.cartList"
+      :key="index"
+    >
+      <div v-if="item.checked">
         <div @click="navigateToStore(item)">
           <div class="store-name">
             <span>{{ item.storeName }}</span>
           </div>
         </div>
         <div class="promotionNotice">{{ item.promotionNotice || "" }}</div>
-      <div class="flex goods-item" v-for="(val, i) in item.skuList" :key="i">
+        <div
+          class="flex goods-item"
+          v-for="(val, i) in item.checkedSkuList"
+          :key="i"
+        >
           <div
             class="goods-image"
             @click="
@@ -134,16 +146,24 @@
             </div>
             <p class="goods-prices">
               <span>￥</span>
-            <span class="goods-price">{{ formatPrice(val.goodsSku.price)[0] }}</span>
+              <span class="goods-price">{{
-            <span>.{{ formatPrice(val.goodsSku.price)[1] }}</span>
+                $options.filters.goodsFormatPrice(val.purchasePrice)[0]
+              }}</span>
+              <span>.{{ $options.filters.goodsFormatPrice(val.purchasePrice)[1] }}</span>
             </p>
           </div>
         </div>
         <u-row>
           <u-col :offset="0" :span="4">发票信息</u-col>
-        <u-col :span="8" class="tipsColor" textAlign="right" @click.native="invoice()">
+          <u-col
+            :span="8"
+            class="tipsColor"
+            textAlign="right"
+            @click.native="invoice()"
+          >
             <span v-if="receiptList"
-            >{{ receiptList.receiptTitle }} - {{ receiptList.receiptContent }}</span
+              >{{ receiptList.receiptTitle }} -
+              {{ receiptList.receiptContent }}</span
             >
             <span v-else>不开发票</span>
           </u-col>
@@ -170,7 +190,9 @@
           </u-col>
         </u-row>
         <u-row>
-        <u-col :offset="0" :span="4" class="tl" style="text-align: left">备注信息</u-col>
+          <u-col :offset="0" :span="4" class="tl" style="text-align: left"
+            >备注信息</u-col
+          >
           <u-col :span="8" textAlign="right">
             <u-input
               style="text-align: right"
@@ -180,9 +202,14 @@
           </u-col>
         </u-row>
       </div>
+    </div>
 
     <!-- 发票信息 -->
-    <invoices :res="receiptList" @callbackInvoice="callbackInvoice" v-if="invoiceFlag" />
+    <invoices
+      :res="receiptList"
+      @callbackInvoice="callbackInvoice"
+      v-if="invoiceFlag"
+    />
     <u-select v-model="shippingFlag" :list="shippingMethod"></u-select>
 
     <div class="box box5" v-if="orderMessage.priceDetailDTO">
@@ -190,22 +217,30 @@
         <u-row>
           <u-col :span="9">商品合计</u-col>
           <u-col :span="3" textAlign="right">
-            <span>￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}</span>
+            <span
+              >￥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}</span
+            >
           </u-col>
         </u-row>
       </div>
       <div>
         <u-row>
-          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
+          <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7"
+            >运费</u-col
+          >
           <u-col
             v-if="orderMessage.cartTypeEnum != 'VIRTUAL'"
             :span="5"
             class="tr tipsColor"
             textAlign="right"
           >
-            <span v-if="orderMessage.priceDetailDTO.freightPrice == 0">包邮</span>
+            <span v-if="orderMessage.priceDetailDTO.freightPrice == 0"
+              >包邮</span
+            >
             <span v-else
-              >￥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }}</span
+              >￥{{
+                orderMessage.priceDetailDTO.freightPrice | unitPrice
+              }}</span
             >
           </u-col>
         </u-row>
@@ -215,7 +250,10 @@
 
         <u-col
           :span="3"
-          v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice"
+          v-if="
+            orderMessage.priceDetailDTO &&
+            orderMessage.priceDetailDTO.couponPrice
+          "
           textAlign="right"
           @click="GET_Discount()"
         >
@@ -249,7 +287,9 @@
           <u-col :span="6">活动优惠</u-col>
           <u-col :span="6" class="tr tipsColor" textAlign="right">
             <span v-if="orderMessage.priceDetailDTO.discountPrice"
-              >-￥{{ orderMessage.priceDetailDTO.discountPrice | unitPrice }}</span
+              >-￥{{
+                orderMessage.priceDetailDTO.discountPrice | unitPrice
+              }}</span
             >
             <span v-else>0.00</span>
           </u-col>
@@ -275,9 +315,11 @@
         <div v-if="!orderMessage.priceDetailDTO.payPoint" class="number">
           <span>¥</span>
           <span class="price">{{
-            formatPrice(orderMessage.priceDetailDTO.flowPrice)[0]
+            $options.filters.goodsFormatPrice(orderMessage.priceDetailDTO.flowPrice)[0]
           }}</span>
-          <span>.{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} </span>
+          <span
+            >.{{ $options.filters.goodsFormatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }}
+          </span>
         </div>
         <span v-else class="number"
           ><span style="margin-right: 10rpx">{{
@@ -379,7 +421,7 @@ export default {
           item.route == "pages/tabbar/cart/cartList" ||
           item.route.indexOf("pages/product/goods") != -1
         ) {
-          uni.redirectTo({
+          uni.navigateTo({
             url: item.route,
           });
         }
@@ -413,13 +455,6 @@ export default {
   mounted() {},
 
   methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
     //发票回调 选择发票之后刷新购物车
     async callbackInvoice(val) {
       this.invoiceFlag = false;
@@ -448,7 +483,9 @@ export default {
       this.navigateTo(
         `/pages/mine/address/address?from=cart&way=${
           this.routerVal.way
-        }&parentOrder=${encodeURIComponent(JSON.stringify(this.routerVal.parentOrder))}`
+        }&parentOrder=${encodeURIComponent(
+          JSON.stringify(this.routerVal.parentOrder)
+        )}`
       );
     },
 
@@ -483,9 +520,11 @@ export default {
         this.orderMessage.storeCoupons &&
         Object.keys(this.orderMessage.storeCoupons)[0]
       ) {
-        let storeMemberCouponsId = Object.keys(this.orderMessage.storeCoupons)[0];
+        let storeMemberCouponsId = Object.keys(
-        let storeCouponId = this.orderMessage.storeCoupons[storeMemberCouponsId]
+          this.orderMessage.storeCoupons
-          .memberCoupon.id;
+        )[0];
+        let storeCouponId =
+          this.orderMessage.storeCoupons[storeMemberCouponsId].memberCoupon.id;
         selectedCoupon.push(storeCouponId);
       }
       this.orderMessage.cartList.forEach((item) => {
@@ -565,7 +604,7 @@ export default {
             });
             // 如果当前价格为0跳转到订单列表
             if (this.orderMessage.priceDetailDTO.billPrice == 0) {
-              uni.redirectTo({
+              uni.navigateTo({
                 url: "/pages/order/myOrder?status=0",
               });
             } else {
@@ -608,9 +647,8 @@ export default {
       // 如果没有商品选择地址的话 则选择 默认地址
       API_Address.getAddressDefault().then((res) => {
         if (res.data.result) {
-          res.data.result.consigneeAddressPath = res.data.result.consigneeAddressPath.split(
+          res.data.result.consigneeAddressPath =
-            ","
+            res.data.result.consigneeAddressPath.split(",");
-          );
           this.address = res.data.result;
         }
       });
@@ -621,8 +659,16 @@ export default {
       this.notSupportFreight = [];
       // 获取结算参数
       API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
+        if (
+          !res.data.result.checkedSkuList ||
+          res.data.result.checkedSkuList.length === 0
+        ) {
+          uni.switchTab({
+            url: "/pages/tabbar/cart/cartList",
+          });
+        }
         if (res.data.result.skuList.length <= 0) {
-          uni.redirectTo({
+          uni.navigateTo({
             url: "/pages/order/myOrder?status=0",
           });
         }
@@ -645,9 +691,8 @@ export default {
           this.getUserAddress();
         } else {
           this.address = res.data.result.memberAddress;
-          res.data.result.memberAddress.consigneeAddressPath = res.data.result.memberAddress.consigneeAddressPath.split(
+          res.data.result.memberAddress.consigneeAddressPath =
-            ","
+            res.data.result.memberAddress.consigneeAddressPath.split(",");
-          );
         }
 
         if (

pages/order/myOrder.vue

@@ -1,15 +1,43 @@
 <template>
   <view class="content">
     <view class="navbar">
-      <view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+      <view
+        v-for="(item, index) in navList"
+        :key="index"
+        class="nav-item"
+        :class="{ current: tabCurrentIndex === index }"
+        @click="tabClick(index)"
+        >{{ item.text }}</view
+      >
     </view>
-    <swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+    <swiper
-      <swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+      :current="tabCurrentIndex"
-        <scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData(tabIndex)">
+      class="swiper-box"
+      duration="300"
+      @change="changeTab"
+    >
+      <swiper-item
+        class="tab-content"
+        v-for="(tabItem, tabIndex) in navList"
+        :key="tabIndex"
+      >
+        <scroll-view
+          class="list-scroll-content"
+          scroll-y
+          @scrolltolower="loadData(tabIndex)"
+        >
           <!-- 空白页 -->
-          <u-empty text="暂无订单" mode="list" v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></u-empty>
+          <u-empty
+            text="暂无订单"
+            mode="list"
+            v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+          ></u-empty>
           <!-- 订单列表 -->
-          <view class="seller-view" :key="oderIndex" v-for="(order, oderIndex) in tabItem.orderList">
+          <view
+            class="seller-view"
+            :key="oderIndex"
+            v-for="(order, oderIndex) in tabItem.orderList"
+          >
             <!-- 店铺名称 -->
             <view class="seller-info u-flex u-row-between">
               <view class="seller-name" @click="navigateToStore(order)">
@@ -21,13 +49,32 @@
             </view>
             <view>
               <view>
-                <view class="goods-item-view" @click="navigateToOrderDetail(order.sn)">
+                <view
-                  <view class="goods-img" v-for="(goods, goodsIndex) in order.orderItems" :key="goodsIndex">
+                  class="goods-item-view"
-                    <u-image border-radius="6" width="100%" height="100%" :src="goods.image"></u-image>
+                  @click="navigateToOrderDetail(order.sn)"
+                >
+                  <view
+                    class="goods-img"
+                    v-for="(goods, goodsIndex) in order.orderItems"
+                    :key="goodsIndex"
+                  >
+                    <u-image
+                      border-radius="6"
+                      width="100%"
+                      height="100%"
+                      :src="goods.image"
+                    ></u-image>
                   </view>
                   <view class="goods-info">
-                    <view v-if="order.orderItems.length <= 1" class="goods-title u-line-2">{{ order.groupName }}</view>
+                    <view
-                    <view v-if="order.orderItems.length <= 1" class="goods-price">
+                      v-if="order.orderItems.length <= 1"
+                      class="goods-title u-line-2"
+                      >{{ order.groupName }}</view
+                    >
+                    <view
+                      v-if="order.orderItems.length <= 1"
+                      class="goods-price"
+                    >
                       ￥{{ order.flowPrice | unitPrice }}
                     </view>
                   </view>
@@ -45,19 +92,56 @@
                 </view>
                 <view>
                   <!-- 全部 -->
-                  <u-button ripple class="pay-btn" shape="circle" size="mini" v-if="order.allowOperationVO.pay" @click="waitPay(order)">立即付款</u-button>
+                  <u-button
+                    ripple
+                    class="pay-btn"
+                    shape="circle"
+                    size="mini"
+                    v-if="order.allowOperationVO.pay"
+                    @click="waitPay(order)"
+                    >立即付款</u-button
+                  >
                   <!-- 取消订单 -->
-                  <u-button ripple class="cancel-btn" shape="circle" size="mini" v-if="order.allowOperationVO.cancel" @click="onCancel(order.sn)">
+                  <u-button
+                    ripple
+                    class="cancel-btn"
+                    shape="circle"
+                    size="mini"
+                    v-if="order.allowOperationVO.cancel"
+                    @click="onCancel(order.sn)"
+                  >
                     取消订单
                   </u-button>
                   <!-- 等待收货 -->
-                  <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="order.allowOperationVO.showLogistics" @click="navigateToLogistics(order)">
+                  <u-button
+                    ripple
+                    shape="circle"
+                    class="rebuy-btn"
+                    size="mini"
+                    v-if="order.allowOperationVO.showLogistics"
+                    @click="navigateToLogistics(order)"
+                  >
                     查看物流
                   </u-button>
-                  <u-button ripple :customStyle="{'background':lightColor,'color':'#fff' }" shape="circle" class="pay-btn" size="mini" v-if="order.allowOperationVO.rog" @click="onRog(order.sn)">
+                  <u-button
+                    ripple
+                    :customStyle="{ background: lightColor, color: '#fff' }"
+                    shape="circle"
+                    class="pay-btn"
+                    size="mini"
+                    v-if="order.allowOperationVO.rog"
+                    @click="onRog(order.sn)"
+                  >
                     确认收货
                   </u-button>
-                  <u-button ripple shape="circle" class="cancel-btn" size="mini" v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyService(order)">
+                  <u-button
+                    ripple
+                    shape="circle"
+                    class="cancel-btn"
+                    size="mini"
+                    v-if="order.groupAfterSaleStatus && order.groupAfterSaleStatus.includes('NOT_APPLIED')"
+                    @click="applyService(order)"
+                  >
                     退款/售后
                   </u-button>
                   <!-- TODO 后续完善 -->
@@ -75,26 +159,57 @@
         </scroll-view>
       </swiper-item>
     </swiper>
-    <u-popup class="cancel-popup" v-model="cancelShow" mode="bottom" length="60%">
+    <u-popup
+      class="cancel-popup"
+      v-model="cancelShow"
+      mode="bottom"
+      length="60%"
+    >
       <view class="header">取消订单</view>
       <view class="body">
-        <view class="title">取消订单后，本单享有的优惠可能会一并取消，是否继续？</view>
+        <view class="title"
+          >取消订单后，本单享有的优惠可能会一并取消，是否继续？</view
+        >
         <view>
           <u-radio-group v-model="reason">
             <view class="value">
-              <view class="radio-view" :key="index" v-for="(item, index) in cancelList">
+              <view
-                <u-radio :active-color="lightColor" label-size="25" shape="circle" :name="item.reason" @change="reasonChange">{{ item.reason }}</u-radio>
+                class="radio-view"
+                :key="index"
+                v-for="(item, index) in cancelList"
+              >
+                <u-radio
+                  :active-color="lightColor"
+                  label-size="25"
+                  shape="circle"
+                  :name="item.reason"
+                  @change="reasonChange"
+                  >{{ item.reason }}</u-radio
+                >
               </view>
             </view>
           </u-radio-group>
         </view>
       </view>
       <view class="footer">
-        <u-button size="medium" ripple v-if="reason" shape="circle" @click="submitCancel">提交</u-button>
+        <u-button
+          size="medium"
+          ripple
+          v-if="reason"
+          shape="circle"
+          @click="submitCancel"
+          >提交</u-button
+        >
       </view>
     </u-popup>
     <u-toast ref="uToast" />
-    <u-modal :confirm-color="lightColor" v-model="rogShow" :show-cancel-button="true" :content="'是否确认收货?'" @confirm="confirmRog"></u-modal>
+    <u-modal
+      :confirm-color="lightColor"
+      v-model="rogShow"
+      :show-cancel-button="true"
+      :content="'是否确认收货?'"
+      @confirm="confirmRog"
+    ></u-modal>
   </view>
 </template>
 
@@ -196,17 +311,28 @@ export default {
    */
   onBackPress(e) {
     if (e.from == "backbutton") {
-      uni.reLaunch({
+      uni.switchTab({
         url: "/pages/tabbar/user/my",
       });
       return true; //阻止默认返回行为
     }
   },
   onPullDownRefresh() {
-    this.loadData(this.status);
+    if (this.tabCurrentIndex) {
+      this.initData(this.tabCurrentIndex);
+    } else {
+      this.initData(0);
+    }
+    // this.loadData(this.status);
+  },
+  onShow() {
+    if(this.$options.filters.tipsToLogin()){
+      if (!this.tabCurrentIndex) {
+        this.initData(0);
+      }
+    }
+    // this.loadData(this.status);
   },
-
-  
 
   onLoad(options) {
     /**
@@ -215,11 +341,11 @@ export default {
      */
     let status = Number(options.status);
     this.status = status;
-    this.tabCurrentIndex = status;
-    if (status == 0) {
-      this.loadData(status);
-    }
 		
+    this.tabCurrentIndex = status;
+    // if (status == 0) {
+    //   this.loadData(status);
+    // }
   },
 
   watch: {
@@ -236,16 +362,11 @@ export default {
     },
   },
   methods: {
-
-
     // 售后
     applyService(order) {
-      
-      
       uni.navigateTo({
-         url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`
+        url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`,
       });
-
     },
 
     // 店铺详情
@@ -314,6 +435,7 @@ export default {
      */
     loadData(index) {
       this.params.pageNumber = this.navList[index].pageNumber;
+      // this.params.tag = this.orderStatus[index].orderStatus;
       getOrderList(this.params).then((res) => {
         uni.stopPullDownRefresh();
         if (!res.data.success) {

pages/passport/login.vue

@@ -10,101 +10,70 @@
 				</div>
 			</div>
 			<!-- 手机号 -->
+			<div v-show="!enableUserPwdBox">
 				<div v-show="current == 0">
-        <u-input
+					<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入手机号 (11位)"
-          :custom-style="inputStyle"
+						class="mobile" focus v-model="mobile" type="number" maxlength="11" />
-          :placeholder-style="placeholderStyle"
+					<div :class="!enableFetchCode ? 'disable' : 'fetch'" @click="fetchCode" class="btn">
-          placeholder="请输入手机号 (11位)"
-          class="mobile"
-          focus
-          v-model="mobile"
-          type="number"
-          maxlength="11"
-        />
-        <div
-          :class="!enabuleFetchCode ? 'disable' : 'fetch'"
-          @click="fetchCode"
-          class="btn"
-        >
 						获取验证码
 					</div>
-        <div class="flex">
-          <u-checkbox-group :icon-size="24" width="45rpx">
-            <u-checkbox
-              shape="circle"
-              v-model="enabulePrivacy"
-              active-color="#FF5E00"
-            ></u-checkbox>
-          </u-checkbox-group>
-          <div class="tips">
-            未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span
-              @click="navigateToPrivacy('privacy')"
-              >《使用条款及隐私协议》</span
-            >
-          </div>
-        </div>
 				</div>
 				<!-- 输入验证码 -->
 				<div v-show="current == 1" class="box-code">
-        <verifyCode
+					<verifyCode type="bottom" @confirm="submit" boxActiveColor="#D8D8D8" v-model="code" isFocus
-          type="bottom"
+						boxNormalColor="#D8D8D8" cursorColor="#D8D8D8" />
-          @confirm="submit"
-          boxActiveColor="#D8D8D8"
-          v-model="code"
-          isFocus
-          boxNormalColor="#D8D8D8"
-          cursorColor="#D8D8D8"
-        />
 
 					<div class="fetch-btn">
-          <u-verification-code
+						<u-verification-code change-text="验证码已发送（x）" end-text="重新获取验证码" unique-key="page-login"
-            change-text="验证码已发送（x）"
+							:seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange">
-            end-text="重新获取验证码"
+						</u-verification-code>
-            unique-key="page-login"
+						<span @tap="fetchCode" :style="{ color: codeColor }">
-            :seconds="seconds"
+							{{ tips }}</span>
-            @end="end"
-            @start="start"
-            ref="uCode"
-            @change="codeChange"
-          ></u-verification-code>
-          <span @tap="fetchCode" :style="{ color: codeColor }"> {{ tips }}</span>
 					</div>
 				</div>
+			</div>
+
+			<!-- 帐号密码登录 -->
+			<div v-show="enableUserPwdBox">
+				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入用户名"
+					class="mobile" focus v-model="userData.username" />
+				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入密码"
+					class="mobile" focus v-model="userData.password" type="password" />
+
+				<div :class="!enableUserBtnColor ? 'disable' : 'fetch'" @click="passwordLogin" class="btn">
+					帐号密码登录
+				</div>
+			</div>
+
+			<div class="flex" v-show="current != 1">
+				<u-checkbox-group :icon-size="24" width="45rpx">
+					<u-checkbox shape="circle" v-model="enablePrivacy" active-color="#FF5E00"></u-checkbox>
+				</u-checkbox-group>
+				<div class="tips">
+					未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span @click="navigateToPrivacy('privacy')">《隐私协议》</span>
+					<span @click="navigateToPrivacys('user')">
+						《用户协议》
+					</span>
+				</div>
+			</div>
+
+			<div v-if="current != 1" class="user-password-tips" @click="enableUserPwdBox = !enableUserPwdBox">
+				{{ !enableUserPwdBox ? "帐号密码" : "手机号" }}登录
+			</div>
 
 			<!-- 循环出当前可使用的第三方登录模式 -->
 			<div class="flex login-list">
-        <div
+				<div v-if="item.code" :style="{ background: item.color }" class="login-item"
-          v-if="item.code"
+					v-for="(item, index) in loginList" :key="index">
-          :style="{ background: item.color }"
+					<u-icon v-if="item.title != 'APPLE'" color="#fff" size="42" :name="item.icon"
-          class="login-item"
+						@click="navigateLogin(item)">
-          v-for="(item, index) in loginList"
-          :key="index"
-        >
-          <u-icon
-            v-if="item.title != 'APPLE'"
-            color="#fff"
-            size="42"
-            :name="item.icon"
-            @click="navigateLogin(item)"
-          >
 					</u-icon>
-          <u-image
+					<u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" @click="navigateLogin(item)"
-            v-else
+						width="80" height="80" />
-            src="/static/appleidButton@2x.png"
-            :lazy-load="false"
-            @click="navigateLogin(item)"
-            width="80"
-            height="80"
-          />
 				</div>
 			</div>
-      <myVerification
+			<myVerification v-if="codeFlag" @send="verification" class="verification" ref="verification"
-        v-if="codeFlag"
+				business="LOGIN" />
-        @send="verification"
-        class="verification"
-        ref="verification"
-        business="LOGIN"
-      />
 		</div>
 		<view v-else>
 			<wechatH5Login />
@@ -113,19 +82,40 @@
 </template>
 
 <script>
-import { openIdLogin, loginCallback } from "@/api/connect.js";
+	import {
+		openIdLogin,
+		loginCallback
+	} from "@/api/connect.js";
 	import api from "@/config/api.js";
-import { sendMobile, smsLogin } from "@/api/login";
+	import {
+		sendMobile,
+		smsLogin,
+		userLogin
+	} from "@/api/login";
 	import myVerification from "@/components/verification/verification.vue"; //验证码模块
 	import uuid from "@/utils/uuid.modified.js"; // uuid
 	import verifyCode from "@/components/verify-code/verify-code";
-import { getUserInfo } from "@/api/members";
+	import {
-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
+		getUserInfo
+	} from "@/api/members";
+	import {
+		whetherNavigate
+	} from "@/utils/Foundation"; //登录跳转
 	import storage from "@/utils/storage.js"; //缓存
 	import wechatH5Login from "./wechatH5Login.vue";
-import { webConnect } from "@/api/connect.js";
+	import {
+		webConnect
+	} from "@/api/connect.js";
+	import {
+		md5
+	} from "@/utils/md5.js";
+
 	export default {
-  components: { myVerification, verifyCode, wechatH5Login },
+		components: {
+			myVerification,
+			verifyCode,
+			wechatH5Login
+		},
 
 		data() {
 			return {
@@ -134,12 +124,12 @@ export default {
 				flage: false, //是否验证码验证
 				codeFlag: true, //验证开关，用于是否展示验证码
 				tips: "",
+				enableUserPwdBox: false, //帐号密码登录
 				current: 0,
 				codeColor: "#999", //按钮验证码颜色
 				lightColor: this.$lightColor,
 				seconds: 60, //默认验证码等待时间
-      loginTitleWay: [
+				loginTitleWay: [{
-        {
 						title: "欢迎登录",
 						desc: "登录后更精彩，美好生活即将开始",
 					},
@@ -148,9 +138,14 @@ export default {
 						desc: "已经发送验证码至",
 					},
 				],
+				userData: {
+					username: "",
+					password: "",
+				},
 				showBack: false,
-      enabuleFetchCode: false,
+				enableFetchCode: false,
-      enabulePrivacy: false, //隐私政策
+				enableUserBtnColor: false,
+				enablePrivacy: false, //隐私政策
 				mobile: "", //手机号
 				code: "", //验证码
 				inputStyle: {
@@ -186,6 +181,15 @@ export default {
 			};
 		},
 		onShow() {
+
+			// 只要是app登录的全部清除内容
+			// #ifdef APP-PLUS 
+			storage.setAccessToken("");
+			storage.setRefreshToken("");
+			storage.setUserInfo({});
+			// #endif
+
+
 			//#ifdef H5
 			let isWXBrowser = /micromessenger/i.test(navigator.userAgent);
 			if (isWXBrowser) {
@@ -286,10 +290,21 @@ export default {
 			current(val) {
 				val ? (this.showBack = true) : (this.showBack = false);
 			},
+			userData: {
+				handler(val) {
+					if (this.userData.username && this.userData.password) {
+						this.enableUserBtnColor = true;
+					} else {
+						this.enableUserBtnColor = false;
+					}
+				},
+				deep: true,
+
+			},
 			mobile: {
 				handler(val) {
 					if (val.length == 11) {
-          this.enabuleFetchCode = true;
+						this.enableFetchCode = true;
 					}
 				},
 			},
@@ -297,6 +312,11 @@ export default {
 			async flage(val) {
 				if (val) {
 					if (this.$refs.uCode.canGetCode) {
+						if (this.enableUserPwdBox) {
+							this.submitUserLogin();
+							return;
+							// 执行登录
+						} else {
 							// 向后端请求验证码
 							uni.showLoading({});
 							let res = await sendMobile(this.mobile);
@@ -312,9 +332,11 @@ export default {
 									icon: "none",
 								});
 								this.flage = false;
+								this.$refs.verification.getCode();
+							}
 						}
 					} else {
-          this.$u.toast("请倒计时结束后再发送");
+						!this.enableUserPwdBox ? this.$u.toast("请倒计时结束后再发送") : "";
 					}
 				} else {
 					this.$refs.verification.hide();
@@ -343,11 +365,11 @@ export default {
 							storage.setUserInfo(user.data.result);
 							storage.setHasLogin(true);
 						});
-          getCurrentPages().length > 1
+						getCurrentPages().length > 1 ?
-            ? uni.navigateBack({
+							uni.navigateBack({
 								delta: getCurrentPages().length - 2,
-              })
+							}) :
-            : uni.switchTab({
+							uni.switchTab({
 								url: "/pages/tabbar/home/index",
 							});
 					}
@@ -457,13 +479,21 @@ export default {
 								 */
 								storage.setUserInfo(user.data.result);
 								storage.setHasLogin(true);
-
+								uni.switchTab({
+									url: "/pages/tabbar/home/index",
+								});
 								/**
 								 * 计算出当前router路径
 								 * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
 								 * 2.都不满足返回跳转页面
 								 */
+								if (user.data.result.mobile) {
 									whetherNavigate();
+								} else {
+									uni.navigateTo({
+										url: "/pages/passport/bindUserPhone",
+									});
+								}
 							} else {
 								uni.switchTab({
 									url: "/pages/tabbar/home/index",
@@ -484,7 +514,10 @@ export default {
 				// #ifdef H5
 				let code = connectLogin.code;
 				let buyer = api.buyer;
-      window.open(buyer + `/passport/connect/connect/login/web/` + code, "_self");
+				window.open(
+					buyer + `/passport/connect/connect/login/web/` + code,
+					"_self"
+				);
 				// #endif
 				// #ifdef APP-PLUS
 				this.nonH5OpenId(connectLogin);
@@ -503,7 +536,19 @@ export default {
 				/**
 				 * 执行登录
 				 */
-      smsLogin({ mobile: this.mobile, code: this.code }, this.clientType).then((res) => {
+				smsLogin({
+					mobile: this.mobile,
+					code: this.code
+				}, this.clientType).then(
+					(res) => {
+						this.getUserInfoMethods(res);
+					}
+				);
+			},
+
+			// 登录成功之后获取用户信息
+			getUserInfoMethods(res) {
+				console.log(res);
 				if (res.data.success) {
 					storage.setAccessToken(res.data.result.accessToken);
 					storage.setRefreshToken(res.data.result.refreshToken);
@@ -524,12 +569,9 @@ export default {
 								icon: "none",
 							});
 
-              /**
+
-               * 计算出当前router路径
-               * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
-               * 2.都不满足返回跳转页面
-               */
 							whetherNavigate();
+
 						} else {
 							uni.switchTab({
 								url: "/pages/tabbar/home/index",
@@ -537,8 +579,8 @@ export default {
 						}
 					});
 				}
-      });
 			},
+
 			// 验证码验证
 			verification(val) {
 				this.flage = val == this.$store.state.verificationKey ? true : false;
@@ -548,6 +590,12 @@ export default {
 				uni.navigateTo({
 					url: "/pages/mine/help/tips?type=" + val,
 				});
+				console.log(val)
+			},
+			navigateToPrivacys(val) {
+				uni.navigateTo({
+					url: "/pages/mine/help/tips?type=" + val,
+				})
 			},
 			// 点击获取验证码
 			start() {
@@ -568,9 +616,63 @@ export default {
 				this.codeFlag = true;
 				console.log(this.codeColor);
 			},
+
+			passwordLogin() {
+				if (!this.enablePrivacy) {
+					uni.showToast({
+						title: "请同意用户隐私",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.userData.username) {
+					uni.showToast({
+						title: "请填写用户名",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.userData.password) {
+					uni.showToast({
+						title: "请填写密码",
+						duration: 2000,
+						icon: "none",
+					});
+					return false;
+				}
+
+				if (!this.flage) {
+					this.$refs.verification.error(); //发送
+
+					return false;
+				}
+			},
+
+			// 提交用户登录
+			async submitUserLogin() {
+				const params = JSON.parse(JSON.stringify(this.userData));
+				params.password = md5(params.password);
+				try {
+					let res = await userLogin(params);
+					if (res.data.success) {
+						console.log("zhixing ")
+						this.getUserInfoMethods(res);
+					} else {
+						this.$refs.verification.getCode();
+						this.flage = false;
+					}
+				} catch (error) {
+					this.$refs.verification.getCode();
+				}
+			},
+
 			// 发送验证码
 			fetchCode() {
-      if (!this.enabulePrivacy) {
+				if (!this.enablePrivacy) {
 					uni.showToast({
 						title: "请同意用户隐私",
 						duration: 2000,
@@ -619,6 +721,7 @@ page {
 	.wrapper {
 		padding: 0 80rpx;
 	}
+
 	.title {
 		padding-top: calc(104rpx);
 		font-style: normal;
@@ -627,9 +730,11 @@ page {
 		font-size: 56rpx;
 		color: #333;
 	}
+
 	.box-code {
 		margin-top: 78rpx;
 	}
+
 	.desc,
 	.desc-light {
 		font-size: 32rpx;
@@ -637,25 +742,32 @@ page {
 		color: #333333;
 		margin-top: 40rpx;
 	}
+
 	.desc {
 		color: #333;
 	}
+
 	.desc-light {
 		color: #999999;
+
 		>span {
 			color: #333;
 			margin-left: 8rpx;
 		}
 	}
+
 	.mobile {
 		margin-top: 80rpx;
 	}
+
 	.disable {
 		background: linear-gradient(90deg, #ffdcba 2.21%, #ffcfb2 99.86%);
 	}
+
 	.fetch {
 		background: linear-gradient(57.72deg, #ff8a19 18.14%, #ff5e00 98.44%);
 	}
+
 	.btn {
 		border-radius: 100px;
 		width: 590rpx;
@@ -666,15 +778,18 @@ page {
 		text-align: center;
 		color: #ffffff;
 	}
+
 	.tips {
 		font-size: 12px;
 		line-height: 20px;
 		margin-top: 32rpx;
 		width: 546rpx;
+
 		>span {
 			color: $light-color;
 		}
 	}
+
 	.fetch-btn {
 		width: 370rpx;
 		height: 80rpx;
@@ -692,14 +807,13 @@ page {
 		display: flex;
 		width: 590rpx;
 		position: absolute;
-  bottom: 20px;
+		top: 1200rpx;
 		align-items: center;
 		justify-content: center;
 	}
 
 	.login-item {
 		width: 80rpx;
-
 		border-radius: 10rpx;
 		height: 80rpx;
 		display: flex;
@@ -708,4 +822,10 @@ page {
 
 		margin: 0 20rpx;
 	}
+
+	.user-password-tips {
+		text-align: center;
+		color: $main-color;
+		margin: 20px 0;
+	}
 </style>

pages/passport/scannerCodeLoginConfirm.vue

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

pages/product/goods.vue

@@ -7,7 +7,7 @@
 
     <!-- 分享 -->
     <shares
-      v-if="shareFlage && goodsDetail.id"
+      v-if="enableShare && goodsDetail.id"
       :skuId="this.routerVal.id"
       :goodsId="this.routerVal.goodsId"
       :link="
@@ -19,7 +19,7 @@
       :thumbnail="goodsDetail.thumbnail"
       :goodsName="goodsDetail.goodsName"
       type="goods"
-      @close="shareFlage = false"
+      @close="enableShare = false"
     />
     <popups
       v-model="popupsSwitch"
@@ -116,7 +116,7 @@
 
           <view class="card-box top-radius-0" id="main2">
             <!-- 活动不显示价钱 -->
-            <view v-if="!promotionFlag" class="desc-bold -goods-msg">
+            <view v-if="isSeckill || isGroup" class="desc-bold -goods-msg">
               <view class="-goods-flex">
                 <view class="desc-bold">
                   {{ goodsDetail.goodsName || "" }}
@@ -150,9 +150,14 @@
                     </span>
 
                     <span v-else>
-                      <span>¥</span
+													<span v-if="wholesaleList.length">
-                      ><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span
+														<span>¥</span><span class="price">{{ $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}</span>.{{ $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length-1].price)[1] }}
-                      >.{{ formatPrice(goodsDetail.price)[1] }}
+														~
+														<span>¥</span><span class="price">{{ $options.filters.goodsFormatPrice(wholesaleList[0].price)[0] }}</span>.{{ $options.filters.goodsFormatPrice(wholesaleList[0].price)[1] }}
+													</span>
+													<span v-else>
+														<span>¥</span><span class="price">{{ $options.filters.goodsFormatPrice(goodsDetail.price)[0] }}</span>.{{ $options.filters.goodsFormatPrice(goodsDetail.price)[1] }}
+													</span>
                     </span>
                   </view>
                   <view class="-goods-price" v-else>
@@ -348,6 +353,7 @@
           :id="productId"
           v-if="goodsDetail.id"
           :pointDetail="pointDetail"
+					:wholesaleList="wholesaleList"
           @handleClickSku="selectSku"
           :buyMask="buyMask"
         />
@@ -382,7 +388,6 @@ import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 import popupAddress from "./product/popup/address"; //地址选择模块
 import shares from "@/components/m-share/index"; //分享
 import popups from "@/components/popups/popups"; //气泡框
-
 import setup from "./product/popup/popup";
 export default {
   components: {
@@ -405,7 +410,6 @@ export default {
     return {
       setup,
       promotionShow: false, //弹窗开关
-      promotionFlag: true, //活动开关
       // #ifdef H5
       navbarListX: 110, //导航栏列表栏x轴
       navbarListY: 80, //导航栏列表栏y轴
@@ -442,9 +446,10 @@ export default {
         },
       ],
       popupsSwitch: false, //导航栏列表栏开关
-      shareFlage: false,
+      enableShare: false,
       selectedGoods: "", //选择的商品规格昵称
       isGroup: false, // 是否是拼团活动
+      isSeckill:false, // 是否秒杀活动
       pointDetail: "", // 是否是积分商品
       assemble: "", //拼团的sku
       navbarOnlyBack: {
@@ -480,7 +485,6 @@ export default {
           id: "4",
         },
       ],
-      oldtabScrollTop: 0,
       tabScrollTop: null,
       scrollArr: [],
       scrollId: "1",
@@ -524,10 +528,12 @@ export default {
 
       routerVal: "",
       IMLink: "", // IM地址
+			wholesaleList:[]
     };
   },
 
   computed: {
+	// udesk IM 
     IM() {
       return this.IMLink + this.storeDetail.merchantEuid;
     },
@@ -540,10 +546,7 @@ export default {
           this.$refs.popupGoods.buyType = "PINTUAN";
           clearInterval(timer);
         }, 100);
-
-        this.promotionFlag = false;
       } else {
-        this.promotionFlag = true;
         this.$refs.popupGoods.buyType = "";
       }
     },
@@ -602,15 +605,7 @@ export default {
       this.init(this.routerVal.id, this.routerVal.goodsId, this.routerVal.distributionId);
     }
   },
-  // #ifdef MP-WEIXIN
+ 
-  onShareAppMessage(res) {
-    return {
-      path: this.share(),
-      title: `[好友推荐]${this.goodsDetail.goodsName}`,
-      imageUrl: this.goodsDetail.goodsGalleryList[0],
-    };
-  },
-  // #endif
   methods: {
     share() {
       return `/pages/product/goods?id=${this.routerVal.id}&goodsId=${this.routerVal.goodsId}`;
@@ -661,6 +656,7 @@ export default {
       }
       /**商品信息以及规格信息存储 */
       this.goodsDetail = response.data.result.data;
+      this.wholesaleList = response.data.result.wholesaleList;
       this.goodsSpec = response.data.result.specs;
       this.PromotionList = response.data.result.promotionMap;
       this.goodsParams = response.data.result.goodsParamsDTOList || [];
@@ -676,6 +672,10 @@ export default {
           if (item.indexOf("POINTS_GOODS") == 0) {
             this.pointDetail = this.PromotionList[item];
           }
+          // 秒杀
+          if (item.indexOf("SECKILL") == 0) {
+            this.isSeckill = true
+          }
         });
       // 轮播图
       this.imgList = this.goodsDetail.goodsGalleryList;
@@ -708,49 +708,50 @@ export default {
     },
 
     linkMsgDetail() {
-      if (this.storeDetail.merchantEuid) {
+      // lili 基础客服
-        uni.navigateTo({
-          url: `/pages/tabbar/home/web-view?src=${this.IM}`,
-        });
-      } else {
-        // 客服
-        // #ifdef MP-WEIXIN
-        const params = {
-          storeName: this.storeDetail.storeName,
-          goodsName: this.goodsDetail.goodsName,
-          goodsId: this.goodsDetail.goodsId,
-          goodsImg: this.goodsDetail.thumbnail,
-          price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
-          // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
-          uuid: storage.getUuid(),
-          token: storage.getAccessToken(),
-          sign: this.storeDetail.yzfSign,
-          mpSign: this.storeDetail.yzfMpSign,
-        };
-        uni.navigateTo({
-          url:
-            "/pages/product/customerservice/index?params=" +
-            encodeURIComponent(JSON.stringify(params)),
-        });
-        // #endif
-        // #ifndef MP-WEIXIN
-        const sign = this.storeDetail.yzfSign;
-        uni.navigateTo({
-          url:
-            "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
-            sign,
-        });
-        // #endif
-      }
-    },
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
 	
+	  uni.navigateTo({
+		url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`,
+	  });
+		
+		// udesk 代码  
+		// if (this.storeDetail.merchantEuid) {
+		//   uni.navigateTo({
+		//     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
+		//   });
+		// }
+		  
+		  
+        // 客服 云智服代码 
+        // // #ifdef MP-WEIXIN
+        // const params = {
+        //   storeName: this.storeDetail.storeName,
+        //   goodsName: this.goodsDetail.goodsName,
+        //   goodsId: this.goodsDetail.goodsId,
+        //   goodsImg: this.goodsDetail.thumbnail,
+        //   price: this.goodsDetail.promotionPrice || this.goodsDetail.price,
+        //   // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+        //   uuid: storage.getUuid(),
+        //   token: storage.getAccessToken(),
+        //   sign: this.storeDetail.yzfSign,
+        //   mpSign: this.storeDetail.yzfMpSign,
+        // };
+        // uni.navigateTo({
+        //   url:
+        //     "/pages/product/customerservice/index?params=" +
+        //     encodeURIComponent(JSON.stringify(params)),
+        // });
+        // // #endif
+        // // #ifndef MP-WEIXIN
+        // const sign = this.storeDetail.yzfSign;
+        // uni.navigateTo({
+        //   url:
+        //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
+        //     sign,
+        // });
+        // // #endif
+    
+    },
     /**选择商品 */
     changedGoods(val) {
       this.selectedGoods = val;
@@ -1057,7 +1058,7 @@ export default {
      * 点击分享
      */
     async shareChange() {
-      this.shareFlage = true;
+      this.enableShare = true;
     },
   },
 };

pages/product/product/goods/-goods-recommend.vue

@@ -1,169 +1,20 @@
 <template>
   <view class="recommend-box" >
     <h4 class="goods-recommend-title">宝贝推荐</h4>
-    <view class="like-goods-list">
+		<goodsList :res='res' v-if="res" :storeName="false" />
-      <view class="like-goods-list">
-        <view
-          class="like-goods-item"
-          @click="clickGoods(item)"
-          v-for="(item, index) in res"
-          :key="index"
-        >
-          <u-image
-            :fade="true"
-            duration="450"
-            :lazy-load="true"
-            :src="item.content.thumbnail"
-            width="330rpx"
-            height="330rpx"
-            class="like-goods-uimage"
-          >
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-          <view style="background-color: #ffffff; width: 100%">
-            <view class="name">{{ item.content.goodsName }}</view>
-            <view class="price-sales">
-              <div class="item-price" v-if="item.content.price != undefined">
-                ￥
-                <span>{{ formatPrice(item.content.price)[0] }}</span>
-                .{{formatPrice(item.content.price)[1]}}
-                <!-- <text v-if="item.point != undefined">+{{ item.point }}积分</text> -->
-              </div>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
 	 </view>
 </template>
 
 <script>
+import goodsList from '@/components/m-goods-list/list.vue'
 export default {
   props: ["res"],
+	components:{goodsList},
   methods: {
-    // 点击店铺推荐
-    clickGoods(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`
-      });
-    },
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-  
-      return val.toFixed(2).split(".");
-    }
     }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../mp-goods.scss";
 @import "../product.scss";
-
-.goods_recomm {
-  padding: 12px 0 20rpx 20rpx;
-  color: #000;
-  font-size: 30rpx;
-  font-weight: 400;
-  margin-bottom: 28rpx;
-}
-
-.like-goods-uimage {
-  /deep/ .u-image {
-    height: 350rpx !important;
-  }
-
-  width: 100%;
-}
-
-.recommend-box {
-  background-color: #ffffff;
- 
-  width: 100%;
-
-  padding-bottom: 120rpx;
-
-  .title {
-    width: 120rpx;
-    height: 42rpx;
-    font-size: 30rpx;
-    font-weight: 700;
-    text-align: left;
-    color: #333333;
-    margin-left: 20rpx;
-  }
-}
-.like-goods-list {
-  display: flex;
-  width: 100%;
-  flex-wrap: wrap;
-}
-.like-goods-item {
-  padding: 0 !important;
-  width: 48%;
-  margin: 0 1% 10rpx 1%;
-  background: #f7f7f7;
-  border-radius: 12rpx;
-
-  overflow: hidden;
-
-  /deep/ .u-image {
-    width: 100%;
-  }
-}
-
-.like-goods-list {
-  // background-color: #f8f8f8;
-  width: 100%;
-  margin-bottom: 100rpx;
-
-  .name {
-    padding: 14rpx 8rpx 0 8rpx;
-
-    color: #333;
-    font-size: 24rpx;
-    display: -webkit-box;
-    overflow: hidden;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    background: #f7f7f7;
-    height: 80rpx;
-  }
-
-  .price-sales {
-    padding: 8rpx;
-    background: #f7f7f7;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .item-price {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      font-size: 26rpx;
-      text-align: left;
-      color: $price-color;
-      line-height: 23px;
-      font-weight: bold;
-      > span {
-        font-size: 32rpx;
-      }
-    }
-
-    .sales {
-      line-height: 23px;
-      font-size: 22rpx;
-      text-align: left;
-      letter-spacing: 0;
-      color: #cccccc;
-      // padding-right: 10rpx;
-    }
-  }
-}
 </style>

pages/product/product/promotion/-promotion-assemble-promotions.vue

@@ -21,15 +21,15 @@
                   >
                     ￥
                     <span class="flex-price">
-                      {{ formatPrice(detail.promotionPrice)[0] }}.{{
+                      {{ $options.filters.goodsFormatPrice(detail.promotionPrice)[0] }}.{{
-                        formatPrice(detail.promotionPrice)[1]
+                        $options.filters.goodsFormatPrice(detail.promotionPrice)[1]
                       }}</span
                     >
                   </span>
                   <view class="u-group-flex" v-if="detail.price != undefined">
                     <span class="old-price"
-                      >￥{{ formatPrice(detail.price)[0] }}.{{
+                      >￥{{ $options.filters.goodsFormatPrice(detail.price)[0] }}.{{
-                        formatPrice(detail.price)[1]
+                        $options.filters.goodsFormatPrice(detail.price)[1]
                       }}</span
                     >
                     <view class="promotion">限时抢购</view>
@@ -42,8 +42,8 @@
                     <span
                       class="flex-price"
                       v-if="promotion.groupbuy_goods_vo.price != undefined"
-                      >￥{{ formatPrice(promotion.groupbuy_goods_vo.price)[0] }}.{{
+                      >￥{{ $options.filters.goodsFormatPrice(promotion.groupbuy_goods_vo.price)[0] }}.{{
-                        formatPrice(promotion.groupbuy_goods_vo.price)[1]
+                        $options.filters.goodsFormatPrice(promotion.groupbuy_goods_vo.price)[1]
                       }}</span
                     >
                     <!-- <span v-if="promotion.point">+{{promotion.point}}积分</span> -->
@@ -53,9 +53,9 @@
                       class="old-price"
                       v-if="promotion.groupbuy_goods_vo.original_price != undefined"
                       >￥{{
-                        formatPrice(promotion.groupbuy_goods_vo.original_price)[0]
+                        $options.filters.goodsFormatPrice(promotion.groupbuy_goods_vo.original_price)[0]
                       }}.{{
-                        formatPrice(promotion.groupbuy_goods_vo.original_price)[1]
+                        $options.filters.goodsFormatPrice(promotion.groupbuy_goods_vo.original_price)[1]
                       }}</span
                     >
                     <view class="promotion">团购活动</view>
@@ -68,13 +68,13 @@
                     v-if="detail.promotionPrice != undefined"
                   >
                     ￥<span class="flex-price">
-                      {{ formatPrice(detail.promotionPrice)[0] }}.</span
+                      {{ $options.filters.goodsFormatPrice(detail.promotionPrice)[0] }}.</span
-                    >{{ formatPrice(detail.promotionPrice)[1] }}
+                    >{{ $options.filters.goodsFormatPrice(detail.promotionPrice)[1] }}
                   </span>
                   <view class="u-group-flex" v-if="detail.price != undefined">
                     <span class="old-price"
-                      >￥{{ formatPrice(detail.price)[0] }}.{{
+                      >￥{{ $options.filters.goodsFormatPrice(detail.price)[0] }}.{{
-                        formatPrice(detail.price)[1]
+                        $options.filters.goodsFormatPrice(detail.price)[1]
                       }}</span
                     >
                     <view class="promotion">拼团活动</view>
@@ -141,13 +141,6 @@ export default {
   },
   mounted() {},
   methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
     getCountDownTime(val) {
       let date = new Date(val);
       let timeSimple = new Date(date).getTime() / 1000;

pages/product/product/promotion/-promotion-coupon.vue

@@ -11,15 +11,11 @@
 					<view class="text">
 						<div class="coupon-List-title">
 							<view v-if="item.scopeType">
-                <span v-if="item.scopeType == 'ALL' && item.id == 'platform'"
+								<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
-                  >全平台</span
-                >
 								<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-                <view v-else
+								<view v-else>{{
-                  >{{
                          item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
-                  }}使用</view
+                       }}使用</view>
-                >
 							</view>
 						</div>
 						<div>满{{ item.consumeThreshold | unitPrice }}可用</div>
@@ -31,7 +27,7 @@
 					</view>
 				</view>
 				<view class="line"></view>
-        <view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
+				<view class="time">{{ item.startTime / 1000 | unixToDate }} - {{ item.endTime / 1000 | unixToDate }}</view>
 			</view>
 		</view>
 	</view>
@@ -42,7 +38,7 @@ export default {
 		data() {
 			return {
 				yhqFlag: [], //获取优惠券判断是否点击
-      couponRes: {},
+				couponRes: [],
 			};
 		},
 		props: {
@@ -58,7 +54,8 @@ export default {
 						Object.keys(this.res).forEach((item) => {
 							let key = item.split("-")[0];
 							if (key === "COUPON") {
-              this.couponRes[item] = this?.res[item];
+								this.couponRes.push(this?.res[item]);
+
 							}
 						});
 					}
@@ -84,6 +81,7 @@ export default {
 		flex-direction: column;
 		justify-content: space-between;
 	}
+
 	.coupon-List {
 		display: flex;
 		flex-direction: column;
@@ -140,6 +138,7 @@ export default {
 
 			height: 100%;
 			align-items: center;
+
 			span {
 				font-size: 50rpx;
 			}
@@ -164,6 +163,7 @@ export default {
 			display: flex;
 			align-items: center;
 			margin-left: 40rpx;
+
 			text {
 				width: 140rpx;
 				height: 40rpx;

pages/product/product/promotion/-promotion-details.vue

@@ -15,7 +15,7 @@
               <span v-if="res[prom].freeFreightFlag">赠送包邮服务</span>
             </span>
           </div>
-          <div class="res_prom_item" v-if="res[prom].fullRate">
+          <div class="res_prom_item" v-if="res[prom].fullRate && res[prom].fullRateFlag">
             <u-tag text="打折" type="error"></u-tag>
             <span class="pro-text"
               >满{{ res[prom].fullMoney }}元，立享<span class="price"

pages/product/product/shop/-shop.vue

@@ -32,7 +32,7 @@
             {{ item.content.goodsName }}
           </view>
           <view class="item-price" v-if="item.price != undefined">
-            ￥<span class="item-price-blod">{{ formatPrice(item.content.price)[0] }}</span>.{{ formatPrice(item.content.price)[1] }}
+            ￥<span class="item-price-blod">{{ $options.filters.goodsFormatPrice(item.content.price)[0] }}</span>.{{ $options.filters.goodsFormatPrice(item.content.price)[1] }}
           </view>
         </view>
       </view>
@@ -48,13 +48,6 @@ export default {
   props: ["res", "goodsDetail", "storeDetail"],
   mounted() {},
   methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
     // 点击商品
     clickGoods(val) {
       uni.navigateTo({

pages/product/shopList.vue

@@ -82,13 +82,7 @@ export default {
       this.storeList = [];
       this.init();
     },
-    // 格式化金钱  1999 --> [1999,00]
+   
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
     async init() {
       let res = await getStoreList(this.params);
       if (res.data.success) {

pages/product/shopPage.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <u-navbar :border-bottom="false">
-      <u-search v-model="keyword" @search="search" @click="search" placeholder="请输入搜索"></u-search>
+			<u-search v-model="keyword" @custom='search' :show-action="true" action-text="搜索" :animation="true" @search="search" @click="search" placeholder="请输入搜索"></u-search>
     </u-navbar>
     <div class="wrapper">
       <!-- 店铺信息模块 -->
@@ -58,20 +58,10 @@
     <!-- menu -->
 
     <!-- 商品 -->
-    <div class="contant" v-if="current == 0">
+    <div class="content" v-if="current == 0">
-      <view v-if="!goodsList.length" class="empty">暂无商品信息</view>
+		
-      <view v-else class="item" v-for="(item,index) in goodsList" :key="index" @click="navigateToGoodsDetail(item)">
+      <u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='暂无商品信息'></u-empty>
-        <u-image width="100%" height="330rpx" mode="aspectFit" :src="item.content.thumbnail">
+			<goodsTemplate v-else :res="goodsList" :storeName="false" />
-          <u-loading slot="loading"></u-loading>
-        </u-image>
-        <div class="name wes-2">{{ item.content.goodsName }}</div>
-        <div class="price">
-          <div>￥{{ item.content.price | unitPrice }}</div>
-        </div>
-        <view class="buyCount">
-          <div>已售 {{ item.content.buyCount || "0" }}</div>
-        </view>
-      </view>
     </div>
     <!-- 全部分类 -->
     <div class="category" v-if="current == 1">
@@ -84,7 +74,7 @@
         </div>
         <!-- 分类子级 -->
         <div class="child-list" v-if="item.children && item.children.length!=0">
-          <div class="child" @click="getCategoryGoodsList(child)" v-for="(child,i) in item.children">{{child.labelName}}
+          <div class="child" @click="getCategoryGoodsList(child)" :key='i' v-for="(child,i) in item.children">{{child.labelName}}
           </div>
         </div>
       </div>
@@ -95,6 +85,7 @@
 
 <script>
 import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
+import goodsTemplate from '@/components/m-goods-list/list'
 import {
   receiveCoupons,
   deleteStoreCollection,
@@ -121,7 +112,7 @@ export default {
       couponList: [], //优惠券列表
       categoryList: [],
       couponParams: { pageNumber: 1, pageSize: 50, storeId: "" },
-      goodsParams: { pageNumber: 1, pageSize: 50, storeId: "" },
+      goodsParams: { pageNumber: 1, pageSize: 10, storeId: "" },
     };
   },
   watch: {
@@ -129,6 +120,7 @@ export default {
       val == 0 ? ()=>{ this.goodsList = []; this.getGoodsData()} : this.getCategoryData();
     },
   },
+	components:{goodsTemplate},
 
   /**
    * 加载
@@ -188,30 +180,34 @@ export default {
      * 联系客服
      */
     linkKefuDetail() {
-      // 客服
+      // // 客服
-      // #ifdef MP-WEIXIN
+      // // #ifdef MP-WEIXIN
+
+      // const params = {
+      //   // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
+      //   uuid: storage.getUuid(),
+      //   token: storage.getAccessToken(),
+      //   sign: this.storeInfo.yzfSign,
+      //   mpSign: this.storeInfo.yzfMpSign,
+      // };
+      // uni.navigateTo({
+      //   url:
+      //     "/pages/product/customerservice/index?params=" +
+      //     encodeURIComponent(JSON.stringify(params)),
+      // });
+      // // #endif
+      // // #ifndef MP-WEIXIN
+      // const sign = this.storeInfo.yzfSign;
+      // uni.navigateTo({
+      //   url:
+      //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
+      //     sign,
+      // });
+      // // #endif
 			
-      const params = {
-        // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
-        uuid: storage.getUuid(),
-        token: storage.getAccessToken(),
-        sign: this.storeInfo.yzfSign,
-        mpSign: this.storeInfo.yzfMpSign,
-      };
 			uni.navigateTo({
-        url:
+			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
-          "/pages/product/customerservice/index?params=" +
-          encodeURIComponent(JSON.stringify(params)),
 			 });
-      // #endif
-      // #ifndef MP-WEIXIN
-      const sign = this.storeInfo.yzfSign;
-      uni.navigateTo({
-        url:
-          "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
-          sign,
-      });
-      // #endif
     },
 
     /** 获取店铺分类 */
@@ -240,6 +236,7 @@ export default {
      * 搜索
      */
     search() {
+			console.log("点击")
       uni.navigateTo({
         url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
       });
@@ -265,6 +262,7 @@ export default {
       let res = await getGoodsList(this.goodsParams);
       if (res.data.success) {
         this.goodsList.push(...res.data.result.content);
+				console.log(this.goodsList)
       }
     },
 
@@ -277,15 +275,6 @@ export default {
       }
     },
 
-    /**
-     * 跳转到商品详情
-     */
-    navigateToGoodsDetail(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
-      });
-    },
-
     /**
      *  是否收藏
      */
@@ -393,53 +382,17 @@ export default {
   color: #999;
 }
 
-.contant {
+.content {
   margin-top: 20rpx;
-  display: flex;
+  // display: flex;
-  flex-wrap: wrap;
+  // flex-wrap: wrap;
-  justify-content: space-between;
+  // justify-content: space-between;
   > .empty {
     width: 100%;
     display: flex;
     justify-content: center;
     margin-top: 40rpx;
   }
-  .item {
-    overflow: hidden;
-
-    background: #fff;
-    width: 49%;
-    height: 484rpx;
-    font-size: 26rpx;
-    display: flex;
-    flex-direction: column;
-    border: 1px solid #f8f8f8;
-    margin-bottom: 20rpx;
-
-    .name {
-      text-align: left !important;
-      color: #333;
-      padding: 0 20rpx;
-      margin-top: 20rpx;
-      height: 80rpx;
-      overflow: hidden;
-    }
-    .price {
-      font-weight: 500;
-      color: $main-color;
-      font-size: 30rpx;
-      padding: 0 20rpx;
-      margin-top: 20rpx;
-      white-space: nowrap;
-    }
-    .buyCount {
-      display: flex;
-      padding: 0 20rpx;
-      font-size: 24upx;
-      justify-content: space-between;
-      color: #999;
-    }
-  }
 }
 .discount {
   height: 154rpx;

pages/product/shopPageGoods.vue

@@ -4,25 +4,17 @@
 		<!-- 商品 -->
 		<div class="contant">
 			<view v-if="!goodsList.length" class="empty">暂无商品信息</view>
-      <view v-else class="item" v-for="(item,index) in goodsList" :key="index" @click="navigateToGoodsDetail(item)">
+			<goodsTemplate :res='goodsList' :storeName='false' />
-        <u-image width="100%" mode="aspectFit" height="324rpx" :src="item.content.thumbnail">
-          <u-loading slot="loading"></u-loading>
-        </u-image>
-        <div class="name">{{ item.content.goodsName }}</div>
-        <div class="price">
-          <div>￥{{ item.content.price | unitPrice }}</div>
-        </div>
-        <view class="buyCount">
-          <div>已售 {{ item.content.buyCount || "0" }}</div>
-        </view>
-      </view>
 		</div>
 	</div>
 
 </template>
 
 <script>
-import { getGoodsList } from "@/api/goods.js";
+	import {
+		getGoodsList
+	} from "@/api/goods.js";
+	import goodsTemplate from '@/components/m-goods-list/list'
 	export default {
 		data() {
 			return {
@@ -38,6 +30,9 @@ export default {
 				},
 			};
 		},
+		components: {
+			goodsTemplate
+		},
 		onLoad(options) {
 			this.routerVal = options;
 			this.params.storeId = options.storeId;
@@ -54,15 +49,6 @@ export default {
 			this.getGoodsData();
 		},
 		methods: {
-    /**
-     * 跳转到商品详情
-     */
-    navigateToGoodsDetail(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
-      });
-    },
-
 			async getGoodsData() {
 				// #TODO
 				let goodsList = await getGoodsList(this.params);
@@ -80,48 +66,12 @@ export default {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
+
 		>.empty {
 			width: 100%;
 			display: flex;
 			justify-content: center;
 			margin-top: 40rpx;
 		}
-  .item {
-    overflow: hidden;
-
-    background: #fff;
-    width: 49%;
-    height: 484rpx;
-    font-size: 26rpx;
-    display: flex;
-    flex-direction: column;
-    border: 1px solid #f8f8f8;
-    margin-bottom: 20rpx;
-
-    .name {
-      text-align: left !important;
-      color: #333;
-      padding: 0 20rpx;
-      margin-top: 20rpx;
-      line-height: 1.4em;
-      max-height: 2.8em; //height是line-height的整数倍，防止文字显示不全
-      overflow: hidden;
-    }
-    .price {
-      font-weight: 500;
-      color: $main-color;
-      font-size: 30rpx;
-      padding: 0 20rpx;
-      margin-top: 20rpx;
-      white-space: nowrap;
-    }
-    .buyCount {
-      display: flex;
-      padding: 0 20rpx;
-      font-size: 24upx;
-      justify-content: space-between;
-      color: #999;
-    }
-  }
 }
 </style>

pages/promotion/bargain/detail.vue

@@ -3,7 +3,7 @@
     <u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false">
     </u-navbar>
 
-    <div class="wrapper">
+    <div class="wrapper-box">
       <!-- 砍价列表 -->
       <div class="box box1">
         <div class="bargain">
@@ -106,10 +106,6 @@
       <popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
         :goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />
 
-      <!-- 产品详情 -->
-      <div class=" box4">
-
-      </div>
     </div>
   </div>
 </template>
@@ -352,11 +348,11 @@ page {
   align-items: center;
   padding: 10rpx 0;
 }
-.wrapper {
+.wrapper-box {
-  background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+  background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  height: 700rpx;
+  height: 506rpx;
   width: 100%;
 }
 
@@ -371,16 +367,16 @@ page {
   }
 }
 .box1 {
-  top: 750rpx;
+  top: 560rpx;
 }
 .box2 {
-  top: 770rpx;
+  top: 580rpx;
 }
 .box3 {
-  top: 790rpx;
+  top: 600rpx;
 }
 .box4 {
-  top: 810rpx;
+  top: 620  rpx;
   height: 200rpx;
 }
 .bargain-item {

pages/promotion/bargain/list.vue

@@ -6,22 +6,7 @@
       <!-- 砍价列表 -->
       <div class="box">
         <!-- 已砍的商品 -->
-        <div class="bargain" v-if="bargainList.length!=0">
+        <goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
-          <div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
-            <div class="goods-img">
-              <u-image width="150" height="150" :src="item.thumbnail"></u-image>
-            </div>
-            <div class="goods-config">
-              <div class="goods-title wes-2">
-                {{item.goodsName}}
-              </div>
-              <div class="flex goods-buy">
-                <div class="max-price">最低：<span>￥{{item.purchasePrice | unitPrice}}</span></div>
-                <div class="bargaining" @click="navigateToBargainDetail(item)">参与砍价</div>
-              </div>
-            </div>
-          </div>
-        </div>
         <div class="bargain empty" v-else>
           <u-empty text="暂无活动" mode="list"></u-empty>
         </div>
@@ -32,7 +17,9 @@
 
 <script>
 import { getBargainList } from "@/api/promotions";
+import goodsTemplate from '@/components/m-goods-list/promotion'
 export default {
+  components:{goodsTemplate},
   data() {
     return {
       background: {
@@ -88,10 +75,10 @@ page {
 </style>
 <style lang="scss" scoped>
 .wrapper {
-  background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+  background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  height: 700rpx;
+  height: 506rpx;
   width: 100%;
 }
 
@@ -99,7 +86,7 @@ page {
   background: #fff;
   border-radius: 20rpx;
   position: relative;
-  top: 750rpx;
+  top: 560rpx;
   width: 94%;
   margin: 0 auto;
   > .bargain {

pages/promotion/joinGroup.vue

@@ -1,14 +1,11 @@
 <template>
 	<view class="wrapper">
-
+		<u-navbar :border-bottom="false"  :title="title">
-    <u-navbar :border-bottom="false" :background="background" class="unavbar" :title="title">
 			<!-- 中间 -->
 			<view class="slot-wrap container-wrap">
-
 				<view v-if="search">
 					<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
 				</view>
-
 			</view>
 			<!-- 右侧 -->
 			<view slot="right">
@@ -19,44 +16,14 @@
 			</view>
 		</u-navbar>
 		<!-- 顶部栏 -->
-
+		<div class='header-wraper'>
+			<image  src="/static/join-buy.png"></image>
+		</div>
 		<!-- 商品栏 -->
 		<div class="swiper">
+			<goodsTemplate v-if="goodsList.length" :res="goodsList" />
 			
-      <div v-if="groupBuy.length !=0">
-        <view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
-          <view class="view-left">
-            <u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
-
-              <view slot="error" style="font-size: 24rpx;">加载失败</view>
-            </u-image>
-          </view>
-          <view class="view-content">
-            <view class="view-content-name">
-              {{ groupItem.goodsName }}
-            </view>
-            <view class="view-content-bottom">
-              <view>
-                <view class="view-content-price">
-                  <!-- ￥{{groupItem.sales_price | unitPrice }} <span v-if="groupItem.point">+{{groupItem.point}}积分</span> -->
-                  ￥{{groupItem.price | unitPrice }}
-                </view>
-                <view class="view-content-original_price">
-                  ￥{{ groupItem.originalPrice | unitPrice }}
-                </view>
-              </view>
-
-              <view>
-                <view class="btn-group" @click="toHref(groupItem)"> 去拼团 </view>
-                <view class="buy-content">已售{{groupItem.num || 0}}件</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <u-loadmore bg-color='#f8f8f8' :status="status" />
-      </div>
 			<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
-
 		</div>
 
 	</view>
@@ -65,17 +32,17 @@
 <script>
 	import * as API_Promotions from "@/api/promotions";
 	import * as API_Goods from "@/api/goods";
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
-  components: {},
+		components: {
+			goodsTemplate
+		},
 		data() {
 			return {
-      status: "loadmore",
 				is_empty: false,
 				search: false,
 				title: "拼团活动",
-      background: {
+
-        backgroundColor: "#fff",
-      },
 				empty: false,
 				params: {
 					pageNumber: 1,
@@ -83,7 +50,7 @@ export default {
 					categoryPath: "",
 					goodsName: "",
 				},
-      groupBuy: [],
+				goodsList: [],
 			};
 		},
 		mounted() {},
@@ -118,12 +85,12 @@ export default {
 				});
 			},
 			searchFun() {
-      this.groupBuy = [];
+				this.goodsList = [];
 				this.GET_AssembleGoods();
 			},
 			// 请求拼团数据
 			GET_AssembleGoods() {
-      this.status = "loading";
+
 				const params = JSON.parse(JSON.stringify(this.params));
 				if (params.category_id === 0) delete params.category_id;
 
@@ -133,15 +100,15 @@ export default {
 
 						if (!data || !data.length) {
 							this.is_empty = true;
-            this.status = "nomore";
+
 						} else {
 							if (data.length <= this.params.pageSize) {
-              this.status = "nomore";
+
 							} else {
-              this.status = "loadmore";
+
 							}
 							this.is_empty = false;
-            this.groupBuy.push(...(data || []));
+							this.goodsList.push(...(data || []));
 						}
 					})
 					.catch(() => {});
@@ -151,5 +118,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "./style.scss";
+	.header-wraper {
+		background: url('/static/bg.png');
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 188rpx;
+			height: 60rpx;
+		}
+	}
+	
 </style>

pages/promotion/lives.vue

@@ -159,7 +159,7 @@ export default {
       let recommendLives = await getLiveList(this.recommendParams);
       if (recommendLives.data.success) {
         // 推荐直播间
-        if (recommendLives.data.result.records.length != 0) {
+        if (recommendLives.data.result.records.length ) {
           this.status = "loadmore";
           this.recommendLives = recommendLives.data.result.records;
         } else {
@@ -172,7 +172,7 @@ export default {
          * 2.如果没有直播间设置一个默认图片
          */
 
-        if (this.recommendLives.length == 0) {
+        if (!this.recommendLives.length) {
           if (this.liveList[0].shareImg) {
             this.$set(this, "swiperImg", [
               {
@@ -199,7 +199,7 @@ export default {
       let res = await getLiveList(this.params[this.current]);
       // 直播间
       if (res.data.success) {
-        if (res.data.result.records.length != 0) {
+        if (res.data.result.records.length ) {
           this.status = "loadmore";
           this.liveList.push(...res.data.result.records);
         } else {
@@ -211,7 +211,7 @@ export default {
           ? (this.status = "loadmore")
           : (this.status = "noMore");
 
-        console.log(this.status);
+      
         this.liveList.forEach((item) => {
           if (item.roomGoodsList) {
             item.roomGoodsList = JSON.parse(item.roomGoodsList);

pages/promotion/point/pointList.vue

@@ -23,8 +23,8 @@
                   <u-loading slot="loading"></u-loading>
                 </u-image>
                 <view class="index-item-title">{{ item.goodsName }}</view>
-                <view class="index-item-price">
+                <view class="index-item-price flex flex-a-c flex-j-sb">
-                  {{ item.points }}积分
+                  <div class="point"><span>{{ item.points }}</span>积分</div> 
                   <span class="tipsMkt">¥{{ item.originalPrice | unitPrice }}</span>
                 </view>
               </view>
@@ -194,46 +194,12 @@ page {
   height: 100%;
 }
 .tipsMkt {
-  float: right;
   color: #c0c4cc;
-  font-size: 24rpx;
+  font-size: 24rpx !important;
   text-decoration: line-through;
-  margin-right: 20rpx;
+  margin-right: 20rpx !important;
 }
 
-.header {
-  background: $light-color;
-  position: relative;
-  color: #fff;
-  display: flex;
-  height: 80rpx;
-  align-items: center;
-  justify-content: center;
-  font-size: 26rpx;
-  font-size: 34rpx;
-
-  .left,
-  .right {
-    position: absolute;
-    width: max-content;
-    height: max-content;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-  }
-
-  .left {
-    float: left;
-    top: 0;
-    bottom: 0;
-    left: 20rpx;
-  }
-
-  .right {
-    float: right;
-    right: 20rpx;
-  }
-}
 
 .index {
   height: 100vh;
@@ -341,15 +307,19 @@ page {
   overflow: hidden;
 }
 
-.index-item-title-desc {
+
-  font-size: 25rpx;
-  color: #999999;
-  margin-top: 10rpx;
-}
 
 .index-item-price {
   font-size: 28rpx;
-  color: #ff5a10;
+  overflow: hidden;
+  color: $main-color;
   padding: 20rpx 0 0 20rpx;
+  >.point{
+    >span{
+      font-size: 42rpx;
+      font-weight: bold;
+      margin-right:10rpx;
+    }
+  }
 }
 </style>

pages/promotion/seckill.vue

@@ -1,49 +1,25 @@
 <template>
 	<view class="sale">
-    <view class="sale-head">
+		<u-navbar title='限时抢购'></u-navbar>
-      <image src="@/pages/promotion/static/head-sample.png"></image>
+		<view class="header-wraper">
+				<image mode="widthFix" src="/static/seckill.png"></image>
 		</view>
 		<scroll-view scroll-x>
 			<view class="index-navs">
 				<view class="index-nav-v">
-          <view class="index-nav" :class="{ 'index-nav-active': nav == index }" @click="clickNavigateTime(index)"
+					<view class="index-nav" :class="{ 'index-nav-active': nav == index }"
-            v-for="(item, index) in timeLine" :key="index">
+						@click="clickNavigateTime(index)" v-for="(item, index) in timeLine" :key="index">
 						{{ item.timeLine }}:00
 						<view class="index-nav-desc">{{ index === 0 && item.distanceStartTime === 0 ? '抢购中' : '即将开始' }}
 						</view>
 					</view>
 				</view>
 			</view>
-      <view class="trailer" v-if="timeLine[nav] && times">
+			
-        {{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
-        {{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
-      </view>
 		</scroll-view>
 		<view class="sale-items" v-if="goodsList.length > 0">
-      <view class="sale-item" v-for="(item,index) in goodsList" :key="index">
+			<goodsTemplate :res="goodsList" />
-        <view class="sale-item-img">
+
-          <image :src="item.goodsImage" mode="aspectFill"></image>
-        </view>
-        <view class="sale-item-content">
-          <view class="sale-item-title">
-            {{ item.goodsName }}
-            <view class="sale-item-title-desc"></view>
-          </view>
-          <view class="sale-item-price">
-            <text class="sale-item-price-now">¥{{ item.price | unitPrice}}</text>
-            <text class="sale-item-price-origin"> ¥{{ item.originalPrice | unitPrice }}</text>
-          </view>
-          <view class="sale-item-surplus">
-            仅剩{{ item.quantity - item.salesNum }}件
-            <view class="sale-item-surplus-text"
-              :style="{ width: (item.quantity / (item.quantity - item.salesNum)) * 100 + '%' }">
-            </view>
-          </view>
-          <view class="sale-item-btn" @click="navigateToGoodsDetail(item)">
-            {{ timeLine[nav].distanceStartTime === 0 ? (item.salesNum === item.quantity ? '已售空' : '购买') : '即将开始' }}
-          </view>
-        </view>
-      </view>
 		</view>
 		<view v-else>
 			<view class="nodata">
@@ -56,9 +32,16 @@
 </template>
 
 <script>
-import { getSeckillTimeLine, getSeckillTimeGoods } from "@/api/promotions.js";
+	import {
+		getSeckillTimeLine,
+		getSeckillTimeGoods
+	} from "@/api/promotions.js";
 	import Foundation from "@/utils/Foundation.js";
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
+		components: {
+			goodsTemplate
+		},
 		data() {
 			return {
 				nav: 0, //默认选择第一个时间
@@ -199,141 +182,24 @@ export default {
 		}
 	}
 
-.sale-head {
+	.header-wraper {
-  image {
+		background: url('/static/bg.png');
-    width: 100%;
+		height: 200rpx;
-    height: 280rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 300rpx;
+			height: 100rpx;
 		}
 	}
 
 	.sale-items {
 		padding-top: 20rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-}
-
-.sale-item {
-  width: 710rpx;
-  height: 226rpx;
-  padding-left: 20rpx;
-  margin-bottom: 10rpx;
-  border-radius: 12rpx;
-  background-color: #fff;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.sale-item-img {
-  margin-right: 20rpx;
-  image {
-    width: 186rpx;
-    height: 186rpx;
-    border-radius: 8rpx;
-  }
-}
-
-.sale-item-content {
-  line-height: 2em;
-}
-
-.sale-item-title {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-  line-height: 1.5;
-  font-size: 28rpx;
-  color: #333;
-}
-
-.sale-item-title-desc {
-  font-size: 22rpx;
-  color: #999;
-}
-
-.sale-item-price {
-  font-size: 22rpx;
-  color: 999;
-}
-
-.sale-item-price-now {
-  font-size: 40rpx;
-  color: #ff5a10;
-  margin: 0 10rpx;
-}
-
-.sale-item-price-origin {
-  font-size: 20rpx;
-  color: #999;
-
-  -webkit-text-decoration-line: line-through;
-  text-decoration-line: line-through;
-  text-decoration: line-through;
-}
-
-.sale-item-surplus {
-  border: 2rpx solid rgb(34, 178, 140);
-  border-radius: 12px;
-  width: 166rpx;
-  color: rgb(31, 177, 138);
-  font-size: 20rpx;
-  position: relative;
-  text-align: center;
-  z-index: 2;
-  height: 32rpx;
-  line-height: 28rpx;
-  overflow: hidden;
-}
-
-.sale-item-surplus-text {
-  width: 166rpx;
-  background: rgb(234, 247, 245);
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: -1;
-  height: 100%;
-}
-
-.sale-item-btn {
-  position: absolute;
-  right: 20rpx;
-  bottom: 20rpx;
-  padding: 0 20rpx;
-  height: 60rpx;
-  background-color: #1abc9c;
-  border-radius: 10rpx;
-  font-size: 25rpx;
-  color: #fff;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.trailer {
-  height: 100rpx;
-  background: #ffffff;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 22rpx;
-  color: #666666;
-  box-sizing: border-box;
-  position: relative;
-  z-index: 0;
 	}
 
 	.index-navs {
+		background: #fff;
 		background-color: #f7f7f7;
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -364,17 +230,19 @@ export default {
 		height: 115rpx;
 		line-height: 1em;
 		position: relative;
+		font-size: 32rpx;
+		font-weight: bold;
 
 		&-active {
-    background-image: url(/static/seckill/active.png);
+			color: $main-color;
-    background-size: 100% 115rpx;
-    background-repeat: no-repeat;
-    color: #ffffff;
 			position: relative;
 			z-index: 30;
-
 			.index-nav-desc {
-      color: #ffffff;
+				color: #fff;
+				font-weight: bold;
+				background: $main-color;
+				padding: 6rpx 16rpx;
+				border-radius: 50px;
 			}
 		}
 	}

pages/tabbar/cart/cartList.vue

@@ -51,7 +51,7 @@
           <view class="goods-row" :class="{ invalid: isInvalid(skuItem) }">
             <view class="goods-config">
               <view>
-                <u-checkbox-group v-if="skuItem.invalid == 0">
+                <u-checkbox-group v-if="skuItem.invalid == 0 && !skuItem.errorMessage">
                   <!-- #ifndef MP-WEIXIN -->
                   <u-checkbox shape="circle" :active-color="lightColor" class="c-left" v-model="skuItem.checked"
                     @change="checkboxChange(skuItem)"></u-checkbox>
@@ -74,12 +74,13 @@
               </p>
               <!-- 规格 -->
               <p class="sp-type">{{skuItem.goodsSku.simpleSpecs}}</p>
+              <p class="sp-type" v-if="skuItem.goodsSku.salesModel == 'WHOLESALE'">批发商品</p>
               <p class="sp-number">
                 <view class="sp-price">
                   <div class="default-color" :class="{'main-color':Object.keys(skuItem.promotionMap).length ==0  }">
                     
-                    ￥<span>{{ formatPrice(skuItem.goodsSku.price)[0] }}</span>
+                    ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.goodsSku.price)[0] }}</span>
-                    <span>.{{ formatPrice(skuItem.goodsSku.price)[1] }}</span>
+                    <span>.{{ $options.filters.goodsFormatPrice(skuItem.goodsSku.price)[1] }}</span>
                   </div>
                 </view>
                 <view>
@@ -99,7 +100,7 @@
               >
                 <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
                   距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
-                    font-size="24" :timestamp="getCountDownTime(seckill.endTime)">
+                    font-size="24" :timestamp="getCountDownTime(skuItem)">
                   </u-count-down>
                 </div>
               </div>
@@ -107,10 +108,12 @@
               <!-- 如果有活动 并且是选中的状态,显示预估到手价格 -->
               <div class="priceDetail-flowPrice" :class="{'main-color':skuItem.priceDetailDTO}"
                 v-if="skuItem.priceDetailDTO && skuItem.invalid == 0  && Object.keys(skuItem.promotionMap).length != 0 && skuItem.checked && skuItem.checked">
-                预估到手价 ￥<span>{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
+                预估到手价 ￥<span>{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
-                <span>.{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
+                <span>.{{ $options.filters.goodsFormatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
+              </div>
+							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
+								{{skuItem.errorMessage}}
 							</div>
-
             </view>
           </view>
         </u-swipe-action>
@@ -128,7 +131,7 @@
             <div class="fullPrice">
               <span class="number" v-if="cartDetail && cartDetail.priceDetailDTO">
                 总计:
-                <span>¥{{ formatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</span>.<span>{{ formatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</span>
+                <span>¥{{ $options.filters.goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</span>.<span>{{ $options.filters.goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</span>
               </span>
               <span class="number" v-else>总计:0.00</span>
             </div>
@@ -192,8 +195,8 @@ export default {
         },
       ],
       isInvalid(val) {
-        //是否无效商品
+        //是否无效商品/没库存商品
-        if (val.invalid == 1) {
+        if (val.invalid == 1 || (!val.checked && val.errorMessage)) {
           return true;
         } else {
           return false;
@@ -239,9 +242,12 @@ export default {
 			 * 倒数计时
 			 */
     getCountDownTime(val) {
-      let date = new Date(val.replace(/-/g, "/"));
+      if (val.promotionMap) {
-      let timeSimple = new Date(date).getTime() / 1000;
+        let key = Object.keys(val.promotionMap).find((child, index) => {
-      return timeSimple - new Date().getTime() / 1000;
+          return child.split("-")[0] == 'SECKILL'
+        });
+        return val.promotionMap[key].endTime / 1000 - (new Date().getTime() / 1000)
+      }
     },
 
     /**
@@ -250,17 +256,6 @@ export default {
     discountDetails() {
       this.discountDetailsFlag = true;
     },
-
-    /**
-     *  格式化金钱  1999 --> [1999,00]
-     */
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
     /**
      * 左滑打开删除
      */

pages/tabbar/home/index.vue

@@ -15,6 +15,11 @@ export default {
       },
     };
   },
+  onReachBottom(){
+    // 给子级监听触底加载
+    uni.$emit('onReachBottom',true)
+  },
+  
   onPullDownRefresh() {
     this.$refs.tpl.init();
 

pages/tabbar/home/template/tpl.js

@@ -1,8 +1,14 @@
 /** 配置楼层模块的跳转 */
 export function modelNavigateTo(item) {
-  let val = item.url;
+	let val = item.url || item;
+	//链接跳转到专题
 
-  switch (val.___type) {
+	if (val && val.id && val.pageType == "special") {
+		uni.navigateTo({
+			url: `/pages/tabbar/special/special?id=${val.id}`,
+		});
+	}
+	switch (val.___type || val.type) {
 		case "goods":
 			uni.navigateTo({
 				url: "/pages/product/goods?id=" + val.id + "&goodsId=" + val.goodsId,
@@ -27,7 +33,7 @@ export function modelNavigateTo(item) {
 			// 活动
 		case "marketing":
 			uni.navigateTo({
-        url: "/pages/product/goods?id=" + val.skuId + "goodsId=" + val.goodsId,
+				url: "/pages/product/goods?id=" + val.id + "goodsId=" + val.goodsId,
 			});
 			break;
 		case "pages":
@@ -36,7 +42,7 @@ export function modelNavigateTo(item) {
 			});
 			break;
 		case "other":
-      switch (val.title) {
+			switch (val.title || item.title) {
 				case "首页":
 					uni.switchTab({
 						url: `/pages/tabbar/home/index`,
@@ -102,8 +108,101 @@ export function modelNavigateTo(item) {
 						url: `/pages/product/shopList`,
 					});
 					break;
+				default:
+					// #ifdef H5
+					window.location.href = val.url || item.link;
+					// #endif
+					// #ifdef APP-PLUS
+					plus.runtime.openURL(val.url || item.link) //不需要拼接\
+					// #endif
+					break;
 			}
 
 			break;
 	}
 }
+
+
+	
+
+import config from "@/config/config";
+
+async function scan() {
+  // #ifdef APP-PLUS
+  let isIos = plus.os.name == "iOS";
+  // 判断是否是Ios
+  if (isIos) {
+    const iosFirstCamera = uni.getStorageSync("iosFirstCamera"); //是不是第一次开启相机
+    if (iosFirstCamera !== "false") {
+      uni.setStorageSync("iosFirstCamera", "false"); //设为false就代表不是第一次开启相机
+      seacnCode();
+    } else {
+      if (permision.judgeIosPermission("camera")) {
+        seacnCode();
+      } else {
+        // 没有权限提醒是否去申请权限
+        tipsGetSettings();
+      }
+    }
+  } else {
+    /**
+     * TODO 安卓 权限已经授权了，调用api总是显示用户已永久拒绝申请。人傻了
+     * TODO 如果xdm有更好的办法请在 https://gitee.com/beijing_hongye_huicheng/lilishop/issues 提下谢谢
+     */
+    seacnCode();
+  }
+
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  seacnCode();
+  // #endif
+}
+/**
+ * 提示获取权限
+ */
+function tipsGetSettings() {
+  uni.showModal({
+    title: "提示",
+    content: "您已经关闭相机权限,去设置",
+    success: function (res) {
+      if (res.confirm) {
+        if (isIos) {
+          plus.runtime.openURL("app-settings:");
+        } else {
+          permision.gotoAppPermissionSetting();
+        }
+      }
+    },
+  });
+}
+
+function seacnCode() {
+  uni.scanCode({
+    success: function (res) {
+      let path = encodeURIComponent(res.result);
+
+      // WX_CODE 为小程序码
+      if (res.scanType == "WX_CODE") {
+        console.log(res);
+        uni.navigateTo({
+          url: `/${res.path}`,
+        });
+      } else {
+        config.scanAuthNavigation.forEach((src) => {
+          if (res.result.indexOf(src) != -1) {
+            uni.navigateTo({
+              url: `/${res.result.substring(src.length)}`,
+            });
+          } else {
+            setTimeout(() => {
+              uni.navigateTo({
+                url: "/pages/tabbar/home/web-view?src=" + path,
+              });
+            }, 100);
+          }
+        });
+      }
+    },
+  });
+	}

pages/tabbar/home/template/tpl_banner.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
     <div class="box">
-      <u-swiper @click="clickSwiper" interval="5000" duration="500" height="300" v-if="res" name="img" :list="res.list">
+      <u-swiper @click="clickSwiper" interval="5000" duration="500" height="350" v-if="res" name="img" :list="res.list">
         <u-loading slot="loading"></u-loading>
       </u-swiper>
     </div>

pages/tabbar/home/template/tpl_flex_one.vue

@@ -1,15 +1,20 @@
 <template>
   <div class="layout">
-    <div class="flex-one" @click="modelNavigateTo(res.list[0])">
+    <div class="flex-one">
-      <u-image width="100%" mode="aspectFit" height="280rpx" :src="res.list[0].img" alt=""></u-image>
+      <!-- <u-image width="100%" mode="aspectFit" height="280rpx" :src="res.list[0].img" alt=""></u-image> -->
+      <hotzone :res="res"></hotzone>
     </div>
   </div>
 </template>
 <script>
 import { modelNavigateTo } from "./tpl";
+import hotzone from "@/pages/tabbar/home/template/tpl_hot_zone.vue";
 
 export default {
   title: "单行图片模块",
+  components: {
+    hotzone,
+  },
   data() {
     return {
       modelNavigateTo,

pages/tabbar/home/template/tpl_goods.vue

@@ -1,21 +1,38 @@
-
 <template>
   <div class="layout">
     <u-sticky>
       <div class="goods-cell-title">
-        <div class="goods-item-title" :class="{ 'selected-title': selected.index == index }"
+        <div
-          @click="handleClickTitle(title, index)" v-for="(title, index) in res.list[0].titleWay" :key="index">
+          class="goods-item-title"
+          :class="{ 'selected-title': selected.index == index }"
+          @click="handleClickTitle(title, index)"
+          v-for="(title, index) in res.list[0].titleWay"
+          :key="index"
+        >
           <h4 class="h4">{{ title.title }}</h4>
           <div>{{ title.desc }}</div>
         </div>
       </div>
     </u-sticky>
     <div class="goods-list">
-      <div v-if="item.___index != undefined  ?   (selected.index == item.___index) : ( selected.val == item.type)"
+      <div
-        @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in res.list[0].listWay"
+        v-if="
-        :key="item_index">
+          item.___index != undefined
+            ? selected.index == item.___index
+            : selected.val == item.type
+        "
+        @click="handleClick(item)"
+        class="goods-item"
+        v-for="(item, item_index) in res.list[0].listWay"
+        :key="item_index"
+      >
         <div class="goods-img">
-          <u-image :src="item.img" height="350rpx" mode="aspectFit" width="100%">
+          <u-image
+            :src="item.img"
+            height="350rpx"
+            mode="aspectFit"
+            width="100%"
+          >
             <u-loading slot="loading"></u-loading>
           </u-image>
         </div>
@@ -24,7 +41,42 @@
             {{ item.title }}
           </div>
           <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
+            <div class="goods-price">
+              ¥<span
+                >{{ $options.filters.goodsFormatPrice(item.price)[0] }} </span
+              >.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-if="res.list[0].titleWay[selected.index].bindCategory && goodsData.length"
+        v-for="(item, index) in goodsData"
+        :key="index"
+        class="goods-item"
+        @click="handleClick(item)"
+      >
+        <div class="goods-img">
+          <u-image
+            :src="item.thumbnail"
+            height="350rpx"
+            mode="aspectFit"
+            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">
+              ¥<span
+                >{{ $options.filters.goodsFormatPrice(item.price)[0] }} </span
+              >.{{ $options.filters.goodsFormatPrice(item.price)[1] }}
+            </div>
           </div>
         </div>
       </div>
@@ -32,6 +84,7 @@
   </div>
 </template>
 <script>
+import { getGoodsList } from "@/api/goods.js";
 export default {
   title: "商品分类以及商品",
   data() {
@@ -40,21 +93,43 @@ export default {
         index: 0,
         val: "",
       },
+      params: {
+        pageNumber: 1,
+        pageSize: 100,
+        categoryId: "",
+      },
+      goodsData: [], //商品循环内容
+      goodsResult:"", //es总返回内容
     };
   },
-  props: ["res"],
+  props: ["res","enableBottomLoad"],
   watch: {
     res: {
       handler(val) {
         // 监听父级的值 如果有值将值赋给selected
         if (val) {
-          this.selected.val = this.res.list[0].listWay[0].type;
+          console.log(val)
+          // 如果第一个标签页绑定为商品
+          this.selected.val = this.res.list[0].listWay[0] ? this.res.list[0].listWay[0].type: '';
+          // 如果第一个标签为绑定为分类
+          this.res.list[0].titleWay[0].bindCategory ? this.initGoods(this.res.list[0].titleWay[0]) : ''
         }
       },
       immediate: true,
     },
   },
-  mounted() {},
+  mounted() {
+    uni.$on('onReachBottom',()=>{
+      if(this.enableBottomLoad && this.goodsResult.totalElements >= this.params.pageNumber * this.params.pageSize){
+        this.params.pageNumber++
+        this.initGoods(this.res.list[0].titleWay[this.selected.index])
+      }
+      
+    })
+  },
+  destroyed(){
+    uni.$off('onReachBottom')
+  },
   methods: {
     handleClick(item) {
       uni.navigateTo({
@@ -64,9 +139,25 @@ export default {
     closeGoods(val, index) {
       this.res.list[0].listWay.splice(index, 1);
     },
+    async initGoods(val) {
+      if(this.enableBottomLoad) this.params.pageSize = 20
+      val ? this.params.categoryId = val.bindCategory.id : '';
+      const res = await getGoodsList(this.params);
+      if (res.data.success) {
+        this.goodsResult = res.data.result
+        const result = res.data.result.content.map(item=>item.content)
+        this.goodsData.push(...result);
+        console.log(this.goodsData)
+      }
+    },
     handleClickTitle(val, index) {
       this.selected.index = index;
       this.selected.val = val.title;
+      if (val.bindCategory) {
+        this.params.pageNumber = 1
+        this.goodsData = []
+        this.initGoods(val);
+      }
     },
   },
 };
@@ -149,7 +240,7 @@ $w_94: 94%;
   margin: 0 auto;
   > .goods-title {
     font-size: 24rpx;
-    height: 70rpx;
+    height: 67rpx;
     display: -webkit-box;
     font-weight: 500;
     -webkit-box-orient: vertical;
@@ -163,13 +254,10 @@ $w_94: 94%;
     > .goods-price {
       line-height: 2;
       color: $main-color;
+      > span {
+        font-size: 42rpx;
       }
     }
   }
-
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
 }
 </style>

pages/tabbar/home/template/tpl_hot_zone.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="layout">
+    <div class="flex-one hot-image">
+      <image mode="widthFix" :src="res.list[0].img" alt=""></image>
+
+      <image
+        v-for="(area, index) in res.list[0].zoneInfo"
+				:key="index"
+        @click="modelNavigateTo(area)"
+        mode="widthFix"
+        class="hot-area"
+        :style="{
+          left: area.leftPer * 100 + '%',
+          top: area.topPer * 100 + '%',
+          width: area.widthPer * 100 + '%',
+          height: area.heightPer * 100 + '%',
+        }"
+        :src="area.img"
+        alt=""
+      ></image>
+    </div>
+  </div>
+</template>
+<script>
+import { modelNavigateTo } from "./tpl";
+
+export default {
+  title: "热区模块",
+  data() {
+    return {
+      modelNavigateTo,
+    };
+  },
+  props: ["res"],
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.hot-image {
+  position: relative;
+}
+.hot-area {
+  position: absolute;
+  z-index: 99;
+}
+.flex-one {
+  width: 100%;
+  display: block;
+  overflow: hidden;
+  image {
+    width: 100%;
+   
+    min-height: 200rpx;
+    // height: 100%;
+  }
+}
+</style>

pages/tabbar/home/template/tpl_menu.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="layout">
     <div class="menu-list">
-      <div class="menu-item" @click="modelNavigateTo(item)" v-for="(item, index) in res.list" :key="index">
+      <div
+        class="menu-item"
+        @click="modelNavigateTo(item)"
+        v-for="(item, index) in res.list"
+        :key="index"
+      >
         <div>
           <u-image
             width="88rpx"
@@ -18,15 +23,15 @@
   </div>
 </template>
 <script>
-import {modelNavigateTo} from './tpl'
+import { modelNavigateTo } from "./tpl";
 export default {
   title: "五列菜单",
   props: ["res"],
   data() {
     return {
       modelNavigateTo,
-    }
+    };
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -34,6 +39,7 @@ export default {
 .menu-list {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   > .menu-item {

pages/tabbar/home/template/tpl_notice.vue

@@ -0,0 +1,49 @@
+<template>
+  <div class="layout">
+    <div class="background">
+      <u-notice-bar mode="vertical" :bg-color="res.list[0].bk_color" :color="res.list[0].color" :list="list"></u-notice-bar>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: "公告",
+    props: ["res"],
+    data() {
+      return {
+        list: []
+      }
+    },
+    mounted() {
+      this.list = this.res.list[0].title.map(i => i.context);
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  @import "./tpl.scss";
+  .background {
+    position: absolute;
+    z-index: 2;
+    width: 100%;
+    height: 84rpx;
+    text-align: left;
+    font-size: 20rpx;
+    background-size: cover;
+  }
+  .layout {
+    text-align: center;
+    position: relative;
+    height: 84rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    background: #ffffff;
+  }
+  .title {
+    line-height: 84rpx;
+    font-size: 20px;
+    font-weight: bold;
+  }
+</style>

pages/tabbar/home/template/tpl_promotions_detail.vue

@@ -0,0 +1,273 @@
+<template>
+  <div class="layout">
+    <div class="join-list">
+      <div
+        v-for="(item, index) in res.list"
+        :key="index"
+        class="join-list-item"
+        @click="goToDetail(item.type)"
+      >
+        <div>
+          <div class="join-title">
+            <div>{{ item.title }}</div>
+            <div
+              class="sub"
+              v-if="item.type !== 'SECKILL'"
+              :style="{
+                backgroundColor: item.bk_color,
+                color: item.color1,
+                borderColor: item.bk_color,
+              }"
+            >
+              {{ item.title1 }}
+            </div>
+            <div class="sub-seckill" v-else>
+              <div class="sub-seckill-block flex">
+                <div class="sub-seckill-block-text">
+                  {{ timeLine[0] ? timeLine[0].timeLine : "x" }}点场
+                </div>
+                {{ times.hours == "00" ? "0" : times.hours }}:{{
+                  times.minutes
+                }}:{{ times.seconds }}
+              </div>
+            </div>
+          </div>
+          <div class="join-box">
+            <div
+              class="join-item"
+              v-for="(i, _index) in item.data"
+              :key="_index"
+            >
+              <div class="item-img-box">
+                <u-image
+                  class="item-img"
+                  width="156rpx"
+                  height="156rpx"
+                  :src="i.thumbnail ? i.thumbnail : i.goodsImage"
+                  alt
+                />
+              </div>
+              <div
+                class="ellipsis"
+                :class="{ 'max-width': res.list.length <= 1 }"
+              >
+                {{ i.goodsName ? i.goodsName : i.name }}
+              </div>
+              <div class="item-price">
+                <span>￥{{ i.price ? i.price : i.originalPrice }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import * as API_Promotions from "@/api/promotions";
+import Foundation from "@/utils/Foundation.js";
+export default {
+  props: ["res"],
+  data() {
+    return {
+      timeLine: "", //获取几个点活动
+      resTime: 0, //当前时间
+      time: 0, //距离下一个活动的时间值
+      times: {}, //时间集合
+      onlyOne: "", //是否最后一个商品
+    };
+  },
+  mounted() {
+    let params = {
+      pageNumber: 1,
+      pageSize: 2,
+      status: "START",
+      promotionStatus: "START",
+    };
+    this._setTimeInterval = setInterval(() => {
+      if (this.time <= 0) {
+        clearInterval(this._setTimeInterval);
+      } else {
+        this.times = Foundation.countTimeDown(this.time);
+        this.time--;
+      }
+    }, 1000);
+    this.res.list.forEach((ele) => {
+      switch (ele.type) {
+        case "PINTUAN":
+          API_Promotions.getAssembleList(params).then((response) => {
+            const data = response.data.result.records;
+            if (data) {
+              ele.data = data;
+            }
+          });
+          break;
+        case "SECKILL":
+          API_Promotions.getSeckillTimeLine().then((response) => {
+            if (response.data.success && response.data.result) {
+              ele.data = response.data.result[0].seckillGoodsList.slice(0, 2);
+              let timeLine = response.data.result.sort(
+                (x, y) => Number(x.timeLine) - Number(y.timeLine)
+              );
+              this.timeLine = timeLine.slice(0, 5);
+              this.resTime = parseInt(new Date().getTime() / 1000);
+              this.onlyOne = response.data.result.length === 1;
+              this.diffTime = parseInt(new Date().getTime() / 1000) - this.resTime;
+
+              this.time =
+                this.timeLine[0].distanceStartTime ||
+                (this.timeLine[1] && this.timeLine[1].distanceStartTime) ||
+                Foundation.theNextDayTime() - this.diffTime;
+              this.times = Foundation.countTimeDown(this.time);
+              console.log(this.timeLine);
+            }
+          });
+          break;
+        case "LIVE":
+          API_Promotions.getLiveList(params).then((response) => {
+            if (response.success && response.result.records) {
+              ele.data = response.result.records[0].commodityList.slice(0, 2);
+            }
+          });
+          break;
+        case "KANJIA":
+          API_Promotions.getBargainList(params).then((response) => {
+            if (response.success && response.result) {
+              ele.data = response.result.records(0, 2);
+            }
+          });
+          break;
+        default:
+          break;
+      }
+    });
+  },
+  methods: {
+    //跳转详情
+    goToDetail(type) {
+      switch(type) {
+        case "SECKILL":
+          uni.navigateTo({
+            url: `/pages/promotion/seckill`,
+          });
+          break;
+        case "PINTUAN":
+          uni.navigateTo({
+            url: `/pages/promotion/joinGroup`,
+          });
+          break;
+        case "LIVE":
+          uni.navigateTo({
+            url: `/pages/promotion/lives`,
+          });
+          break;
+        case "KANJIA":
+          uni.navigateTo({
+            url: `/pages/promotion/bargain/list`,
+          });
+          break;
+      };
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./tpl.scss";
+.join-box {
+  display: flex;
+}
+.join-list {
+  width: 100%;
+  display: flex;
+  overflow: hidden;
+}
+.join-list-item {
+  flex: 1;
+}
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 108rpx; // 大于1个活动
+  font-size: 22rpx;
+}
+.max-width {
+  width: 316rpx !important;
+}
+.item-price {
+  > span {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #e1212b;
+  }
+}
+.join-item {
+  flex: 1;
+}
+.item-img {
+  width: 150rpx;
+  height: 150rpx;
+  margin: 0 auto;
+  display: block;
+}
+.item-img-box {
+  position: relative;
+}
+.item-line-through {
+  > span {
+    font-size: 20rpx;
+    font-weight: 400;
+    text-decoration: line-through;
+    color: #999;
+  }
+}
+.item-position-tips {
+  position: absolute;
+  right: 0;
+  color: #fff;
+  font-size: 24rpx;
+  bottom: 0;
+}
+.join-title {
+  display: flex;
+
+  align-items: center;
+  background: #fff;
+  height: 100rpx;
+  > div:nth-of-type(1) {
+    font-size: 30rpx;
+    font-weight: bold;
+  }
+  > div:nth-of-type(2) {
+    font-size: 20rpx;
+    line-height: 1.75;
+    border-radius: 16rpx;
+    text-align: center;
+    padding: 0 16rpx;
+    margin-left: 20rpx;
+  }
+  .sub {
+    background-color: #e1212b;
+    margin-right: 80rpx;
+  }
+  .sub-seckill {
+    white-space: nowrap;
+    padding: 0 !important;
+  }
+  .sub-seckill-block {
+    background: rgba($main-color, 0.3);
+    border-radius: 100px !important;
+    color: rgba($main-color, 0.7);
+    overflow: hidden;
+    padding-right: 8rpx;
+  }
+  .sub-seckill-block-text {
+    background-color: $main-color;
+    color: #fff;
+    border-top-right-radius: 100px;
+    border-bottom-right-radius: 100px;
+    padding: 0 12rpx !important;
+    margin-right: 12rpx;
+  }
+}
+</style>

pages/tabbar/home/template/tpl_search.vue

@@ -4,6 +4,9 @@
       <u-icon name="search"></u-icon>
       {{ res.list[0].title }}
     </div>
+    <div slot="right" open-type="contact" class="navbar-right message" @click="linkMsgDetail" style="border-style:none;background:rgb(234,234,234);" >
+		  <image style="width:53rpx;height:53rpx;margin-top:6rpx;" src="@/static/img/title.png"></image>
+	  </div>
   </div>
 </template>
 <script>
@@ -11,6 +14,11 @@ export default {
   title:"搜索栏",
   props: ["res"],
   methods: {
+    linkMsgDetail(){
+      uni.navigateTo({
+        url:`/pages/tabbar/home/title`
+      })
+    },
     handleSearch() {
       uni.navigateTo({
         url: "/pages/navigation/search/searchPage",
@@ -34,5 +42,14 @@ export default {
 .layout {
   background: #fff;
   padding: 0 16rpx;
+  position: relative;
+}
+.navbar-right{
+	position: absolute;
+	top: 0;
+	// right: 0;
+}
+.message{
+	right:40rpx;
 }
 </style>

pages/tabbar/home/template/tpl_title.vue

@@ -1,24 +1,34 @@
 <template>
-  <div class="layout">
+  <div class="layout" :style="{textAlign: res.list[0].textAlign}"  @click="modelNavigateTo(res.list[0])" >
-    <div class="background">
+    <div class="background" :style="{ backgroundColor: res.list[0].bk_color}">
       <div class="title" :style="{ color: res.list[0].color }">
         {{ res.list[0].title }}
       </div>
+      <div style="position: absolute;right: 10px;top:2px;color: #fff;line-height: 42px;font-size: 10px">
+        <a  :style="{ color: res.list[0].color1 }" style="text-decoration: none">{{ res.list[0].title1 }}</a>
+      </div>
     </div>
   </div>
 </template>
 
+
 <script>
+import { modelNavigateTo } from "./tpl";
 export default {
   title: "标题栏",
   props: ["res"],
+  data() {
+    return {
+      modelNavigateTo,
+    };
+  },
   mounted() {},
 };
 </script>
 <style lang="scss" scoped>
 @import "./tpl.scss";
 .background {
-  background: url("/static/title.png") no-repeat;
+  // background: url("/static/title.png") no-repeat;
   position: absolute;
   z-index: 2;
   width: 100%;
@@ -43,5 +53,6 @@ export default {
   line-height: 84rpx;
   font-size: 30rpx;
   font-weight: bold;
+  margin-left: 8rpx;
 }
 </style>

pages/tabbar/home/title.vue

@@ -0,0 +1,182 @@
+<template>
+	<view>
+		<view>
+			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			<u-cell-group v-if="current == 0">
+				<view v-for="(item,index) in lists" :key="index">
+					<u-cell-item :arrow="false" v-if="item.status =='UN_READY'" style="position: relative;"
+						@click="linkMsgDetail(item)">
+						<template slot="label">
+							<view style="display: inline-block;
+                width: 100%;
+                height: auto;
+                font-family: Gibson;
+                font-size: 25rpx;
+                word-break: break-all;
+                text-overflow: ellipsis;
+                word-wrap: break-word;
+                
+                white-space: pre-wrap;">{{item.title}}
+								<view style="width:400rpx;padding: 10rpx 0;">{{item.createTime}}</view>
+							</view>
+						</template>
+						<!-- <button  style="width:100rpx;height:60rpx;float:right;font-size:20rpx;line-height:60rpx;background:#000000;color:white;">未读</button> -->
+					</u-cell-item>
+				</view>
+
+			</u-cell-group>
+			<u-cell-group v-if="current == 1">
+				<view v-for="(item,index) in lists" :key="index">
+					<u-cell-item :arrow="false" v-if="item.status == 'ALREADY_READY'" style="position: relative;"
+						@click="linkMsgDetail(item)">
+						<template slot="label">
+							<view style="display: inline-block;
+							  width: 100%;
+							  height: auto;
+							  font-family: Gibson;
+							  font-size: 25rpx;
+							  word-break: break-all;
+							  text-overflow: ellipsis;
+							  word-wrap: break-word;
+							  
+							  white-space: pre-wrap;">{{item.title}}
+								<view style="width:400rpx;padding: 10rpx 0;">{{item.createTime}}</view>
+							</view>
+						</template>
+						<!-- <button  style="width:100rpx;height:60rpx;float:right;font-size:20rpx;line-height:60rpx;background:#F3F3FA;color:black;">已读</button> -->
+					</u-cell-item>
+				</view>
+			</u-cell-group>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		messages,
+		editMessages
+	} from "@/api/message.js"
+	export default {
+		data() {
+			return {
+				params: {
+					pageSize: 20,
+					pageNumber: 1,
+					memberId: "",
+					messageId: "",
+					status:"UN_READY"
+				},
+				loadText: {
+					loadmore: '轻轻上拉',
+					loading: '努力加载中',
+					nomore: '实在没有了'
+				},
+				list: [{
+					name: "未读"
+				}, {
+					name: "已读"
+				}],
+				current: 0,
+				lists: [],
+				status: "loadmore"
+			}
+		},
+		onShow() {
+			this.getMessage()
+		},
+		onReachBottom() {
+			this.params.pageNumber++;
+			this.statuss = "loading";
+			this.getMessage()
+		},
+		methods: {
+			linkMsgDetail(v) {
+
+				if (v.status == 'UN_READY') {
+					let params = {}
+					params.messageId = v.memberId
+					editMessages(v.id, params).then(res => {
+						if (res.data.success) {
+                            console.log( this.lists)
+                            this.lists.forEach((item,index)=>{
+                                console.log(item)
+                                if(item.id == v.id){
+                                    this.lists.splice(index, 1)
+                                }
+                            })
+						}
+					})
+				}
+				
+				// uni.navigateTo({
+				// 	url:`/pages/tabbar/home/messageDetail?data=${encodeURIComponent(JSON.stringify(v))}`
+				// })
+				
+
+			},
+			/**
+			 * 返回
+			 */
+			back() {
+				if (getCurrentPages().length == 1) {
+					uni.switchTab({
+						url: "/pages/tabbar/home/index",
+					});
+				} else {
+					uni.navigateBack();
+				}
+			},
+			change(e) {
+				console.log(e)
+				this.current = e;
+				if (e == 0) {
+					this.params.status = "UN_READY"
+					this.params.pageNumber = 1;
+				} else if (e == 1) {
+					this.params.status = "ALREADY_READY"
+					this.params.pageNumber = 1;
+				}
+				this.lists = []
+				this.getMessage()
+			},
+			getMessage() {
+				this.params.memberId = this.$options.filters.isLogin().id;
+				
+				messages(this.params).then(res => {
+					console.log(res)
+					if (res.data.success) {
+						if (res.data.result.records == '') {
+							console.log(11111)
+							this.status = "nomore"
+						}
+						res.data.result.records.forEach(item => {
+							this.lists.push(item)
+							let obj = {};
+							this.lists = this.lists.reduce(
+								(cur, next) => {
+									//对象去重
+									if (next.id != undefined) {
+										obj[next.id] ?
+											"" :
+											(obj[next.id] = true && cur.push(next));
+									}
+									console.log(cur);
+									return cur;
+								},
+								[]
+							)
+						})
+
+					}
+				})
+			}
+		},
+	}
+</script>
+<style>
+	.foot {
+		position: fixed;
+		bottom: 0;
+	}
+</style>

pages/tabbar/home/views.vue

@@ -3,7 +3,12 @@
     <!-- uni 中不能使用 vue component 所以用if判断每个组件 -->
     <div v-for="(item, index) in pageData.list" :key="index">
       <!-- 搜索栏，如果在楼层装修顶部则会自动浮动，否则不浮动 -->
-      <u-navbar class="navbar" v-if="item.type == 'search'" :is-back="false" :is-fixed="index ===1 ? false : true">
+      <u-navbar
+        class="navbar"
+        v-if="item.type == 'search'"
+        :is-back="false"
+        :is-fixed="index === 1 ? false : true"
+      >
         <search style="width: 100%" :res="item.options" />
         <!-- #ifndef H5 -->
         <!-- 扫码功能 不兼容h5 详情文档: https://uniapp.dcloud.io/api/system/barcode?id=scancode -->
@@ -14,10 +19,22 @@
       </u-navbar>
       <carousel v-if="item.type == 'carousel'" :res="item.options" />
       <titleLayout v-if="item.type == 'title'" :res="item.options" />
-      <leftOneRightTwo v-if="item.type == 'leftOneRightTwo'" :res="item.options" />
+      <leftOneRightTwo
-      <leftTwoRightOne v-if="item.type == 'leftTwoRightOne'" :res="item.options" />
+        v-if="item.type == 'leftOneRightTwo'"
-      <topOneBottomTwo v-if="item.type == 'topOneBottomTwo'" :res="item.options" />
+        :res="item.options"
-      <topTwoBottomOne v-if="item.type == 'topTwoBottomOne'" :res="item.options" />
+      />
+      <leftTwoRightOne
+        v-if="item.type == 'leftTwoRightOne'"
+        :res="item.options"
+      />
+      <topOneBottomTwo
+        v-if="item.type == 'topOneBottomTwo'"
+        :res="item.options"
+      />
+      <topTwoBottomOne
+        v-if="item.type == 'topTwoBottomOne'"
+        :res="item.options"
+      />
       <flexThree v-if="item.type == 'flexThree'" :res="item.options" />
       <flexFive v-if="item.type == 'flexFive'" :res="item.options" />
       <flexFour v-if="item.type == 'flexFour'" :res="item.options" />
@@ -25,16 +42,15 @@
       <textPicture v-if="item.type == 'textPicture'" :res="item.options" />
       <menuLayout v-if="item.type == 'menu'" :res="item.options" />
       <flexOne v-if="item.type == 'flexOne'" :res="item.options" />
-
+      <goods :enableBottomLoad="enableLoad" v-if="item.type == 'goods'" :res="item.options" />
-      <goods v-if="item.type == 'goods'" :res="item.options" />
-
       <group v-if="item.type == 'group'" :res="item.options" />
+      <notice v-if="item.type == 'notice'" :res="item.options" />
+      <promotions v-if="item.type == 'promotionDetail'" :res="item.options" />
       <!-- <joinGroup v-if="item.type == 'joinGroup'" :res="item.options" /> -->
       <!-- <integral v-if="item.type == 'integral'" :res="item.options" /> -->
       <!-- <spike v-if="item.type == 'spike'" :res="item.options" /> -->
-
     </div>
-    <u-no-network></u-no-network>
+    <u-no-network @retry="init" @isConnected="isConnected"></u-no-network>
   </div>
 </template>
 
@@ -60,10 +76,8 @@ import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类
 import { getFloorData } from "@/api/home"; //获取楼层装修接口
 import permision from "@/js_sdk/wa-permission/permission.js"; //权限工具类
 import config from "@/config/config";
-// TODO 后续开发
+import tpl_notice from "@/pages/tabbar/home/template/tpl_notice"; //标题栏模块
-// import tpl_join_group from "@/pages/tabbar/home/template/tpl_join_group";
+import tpl_promotions from "@/pages/tabbar/home/template/tpl_promotions_detail"; //标题栏模块
-// import tpl_integral from "@/pages/tabbar/home/template/tpl_integral";
-// import tpl_spike from "@/pages/tabbar/home/template/tpl_spike";
 
 export default {
   data() {
@@ -71,6 +85,7 @@ export default {
       config,
       pageData: "", //楼层页面数据
       isIos: "",
+      enableLoad:false, //触底加载 针对于商品模块
     };
   },
   components: {
@@ -90,9 +105,8 @@ export default {
     flexOne: tpl_flex_one,
     goods: tpl_goods,
     group: tpl_group,
-    // spike: tpl_spike,
+    notice: tpl_notice,
-    // joinGroup: tpl_join_group,
+    promotions: tpl_promotions,
-    // integral: tpl_integral,
   },
 
   mounted() {
@@ -111,10 +125,19 @@ export default {
       this.pageData = "";
       getFloorData().then((res) => {
         if (res.data.success) {
-          this.pageData = JSON.parse(res.data.result.pageData);
+          const result = JSON.parse(res.data.result.pageData)
+          this.pageData = result;
+          if(result.list.length){
+            // 如果最后一个装修模块是商品模块的话 默认启用自动加载
+            result.list[result.list.length-1] ? result.list[result.list.length-1].model == 'goods' ? this.enableLoad = true : '' : ''
+         }
         }
       });
     },
+		// 是否有网络链接
+		isConnected(val){
+			val ? this.init() : ''
+		},
 
     /**
      * TODO 扫码功能后续还会后续增加
@@ -129,9 +152,21 @@ export default {
         success: function (res) {
           let path = encodeURIComponent(res.result);
           
+
+          
+          if(path!=undefined && path.indexOf("QR_CODE_LOGIN_SESSION")==0){
+            console.log(path)
+            //app扫码登录
+            uni.navigateTo({
+              url:"/pages/passport/scannerCodeLoginConfirm?token="+path
+            });
+            return;
+          }
+
+
           // WX_CODE 为小程序码
           if (res.scanType == "WX_CODE") {
-            console.log(res)
+            console.log(res);
             uni.navigateTo({
               url: `/${res.path}`,
             });

pages/tabbar/home/web-view.vue

@@ -5,9 +5,13 @@
 </template>
 
 <script>
+import configs from "@/config/config";
+import storage from "@/utils/storage";
 export default {
   data() {
     return {
+      configs,
+      storage,
       webviewStyles: {
         progress: {
           color: this.$lightColor,
@@ -17,7 +21,24 @@ export default {
     };
   },
   onLoad(params) {
+    // params.IM ? (this.src = `${configs.imWebSrc}?token=${storage.getAccessToken()}&id=${params.IM}`): (this.src = decodeURIComponent(params.src));
+	if(params.IM)
+	{
+		if(params.IM==0)
+		{
+			this.src = `${configs.imWebSrc}?token=${storage.getAccessToken()}`;
+		}
+		else
+		{
+			this.src = `${configs.imWebSrc}?token=${storage.getAccessToken()}&id=${params.IM}`;
+		}
+	}
+	else
+	{
 		this.src = decodeURIComponent(params.src);
+		console.log(this.src);
+	}
+    
   },
 };
 </script>

pages/tabbar/screen/fullScreen.vue

@@ -0,0 +1,95 @@
+<template>
+   <u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton="btnShow" title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
+    <view class="u-update-content">
+      请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款，
+      包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识,
+      操作日志等信息用于分析，优化应用性能。 您可阅读你可阅读
+      <a @click="gotoLink">《服务协议》</a>
+      和
+      <a @click="gotoB"> 《隐私政策》</a>了解详细信息。
+      如果您同意，请点击下面按钮开始接受我们的服务。
+    </view>
+  </u-modal>
+</template>
+
+<script>
+import storage from "@/utils/storage";
+export default {
+  created() {
+    //先进入 created
+    // if (storage.getShow()) {
+    //   //展示的话进入  true
+    //   console.log(this.show); //如果上面没读缓存  此时 this.show 为true
+    //   if (!this.show) {
+    //     //如果等于 false 了 就跳到主页
+    //     this.show = storage.getShow(); //这里就为false
+    //     setTimeout(() => {
+    //       //然后这里就跳转到  首页
+    //       uni.reLaunch({
+    //         //跳转到 首页
+    //         url: "/pages/tabbar/home/index",
+    //       });
+    //     }, 500);
+    //   }
+    // }
+  },
+  data() {
+    return {
+      show: true, //展示
+      btnShow:true,
+      a: "",
+    };
+  },
+  //   onReady() {
+  //     this.show = true;
+  //   },
+  methods: {
+    gotoLink() {
+      uni.navigateTo({
+        //点击跳转到浏览器
+        url:
+          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920",
+      });
+    },
+    gotoB() {
+      uni.navigateTo({
+        url:
+          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000",
+      });
+    },
+     //取消
+    cancel(){
+      // #ifdef APP-PLUS
+		 	 const threadClass = plus.ios.importClass("NSThread");
+		 	 const mainThread = plus.ios.invoke(threadClass, "mainThread");
+		 	 plus.ios.invoke(mainThread, "exit")
+		 // #endif
+    },
+    confirm() {
+      //点击
+      this.show = false; // 让这个框为false
+      storage.setShow(this.show); //存入缓存
+      if (!this.show) {
+        // 他如果 不展示  就跳转到主页
+        setTimeout(() => {
+          uni.reLaunch({
+            //跳转到 首页
+            url: "/pages/tabbar/home/index",
+          });
+        }, 500);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.u-update-content {
+  font-size: 26rpx;
+  padding: 30rpx;
+}
+a {
+  text-decoration: blue;
+  color: blue;
+}
+</style>

pages/tabbar/special/special.vue

@@ -0,0 +1,247 @@
+<template>
+  <div class="wrapper">
+    <!-- uni 中不能使用 vue component 所以用if判断每个组件 -->
+    <div v-for="(item, index) in pageData.list" :key="index">
+      <!-- 搜索栏，如果在楼层装修顶部则会自动浮动，否则不浮动 -->
+      <div class="navbar" v-if="item.type == 'search'">
+        <search style="width: 100%" :res="item.options" />
+        <!-- #ifndef H5 -->
+        <!-- 扫码功能 不兼容h5 详情文档: https://uniapp.dcloud.io/api/system/barcode?id=scancode -->
+        <div slot="right" class="navbar-right">
+          <u-icon name="scan" @click="scan()" color="#666" size="50"></u-icon>
+        </div>
+        <!-- #endif -->
+      </div>
+      <carousel v-if="item.type == 'carousel'" :res="item.options" />
+      <titleLayout v-if="item.type == 'title'" :res="item.options" />
+      <leftOneRightTwo
+        v-if="item.type == 'leftOneRightTwo'"
+        :res="item.options"
+      />
+      <leftTwoRightOne
+        v-if="item.type == 'leftTwoRightOne'"
+        :res="item.options"
+      />
+      <topOneBottomTwo
+        v-if="item.type == 'topOneBottomTwo'"
+        :res="item.options"
+      />
+      <topTwoBottomOne
+        v-if="item.type == 'topTwoBottomOne'"
+        :res="item.options"
+      />
+      <flexThree v-if="item.type == 'flexThree'" :res="item.options" />
+      <flexFive v-if="item.type == 'flexFive'" :res="item.options" />
+      <flexFour v-if="item.type == 'flexFour'" :res="item.options" />
+      <flexTwo v-if="item.type == 'flexTwo'" :res="item.options" />
+      <textPicture v-if="item.type == 'textPicture'" :res="item.options" />
+      <menuLayout v-if="item.type == 'menu'" :res="item.options" />
+      <flexOne v-if="item.type == 'flexOne'" :res="item.options" />
+      <goods v-if="item.type == 'goods'" :res="item.options" />
+      <group v-if="item.type == 'group'" :res="item.options" />
+      <notice v-if="item.type == 'notice'" :res="item.options" />
+      <promotions v-if="item.type == 'promotionDetail'" :res="item.options" />
+      <!-- <joinGroup v-if="item.type == 'joinGroup'" :res="item.options" /> -->
+      <!-- <integral v-if="item.type == 'integral'" :res="item.options" /> -->
+      <!-- <spike v-if="item.type == 'spike'" :res="item.options" /> -->
+    </div>
+    <u-no-network></u-no-network>
+  </div>
+</template>
+
+<script>
+// 引用组件
+import tpl_banner from "@/pages/tabbar/home/template/tpl_banner"; //导航栏模块
+import tpl_title from "@/pages/tabbar/home/template/tpl_title"; //标题栏模块
+import tpl_left_one_right_two from "@/pages/tabbar/home/template/tpl_left_one_right_two"; //左一右二模块
+import tpl_left_two_right_one from "@/pages/tabbar/home/template/tpl_left_two_right_one"; //左二右一模块
+import tpl_top_one_bottom_two from "@/pages/tabbar/home/template/tpl_top_one_bottom_two"; //上一下二模块
+import tpl_top_two_bottom_one from "@/pages/tabbar/home/template/tpl_top_two_bottom_one"; //上二下一模块
+import tpl_flex_one from "@/pages/tabbar/home/template/tpl_flex_one"; //单行图片模块
+import tpl_flex_two from "@/pages/tabbar/home/template/tpl_flex_two"; //两张横图模块
+import tpl_flex_three from "@/pages/tabbar/home/template/tpl_flex_three"; //三列单行图片模块
+import tpl_flex_five from "@/pages/tabbar/home/template/tpl_flex_five"; //五列单行图片模块
+import tpl_flex_four from "@/pages/tabbar/home/template/tpl_flex_four"; //四列单行图片模块
+import tpl_text_picture from "@/pages/tabbar/home/template/tpl_text_picture"; //文字图片模板
+import tpl_menu from "@/pages/tabbar/home/template/tpl_menu"; //五列菜单模块
+import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //搜索栏
+import tpl_group from "@/pages/tabbar/home/template/tpl_group"; //
+import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类以及分类中的商品
+// 结束引用组件
+import { toSpecial, getSpecial } from "@/api/home"; //获取楼层装修接口
+import permision from "@/js_sdk/wa-permission/permission.js"; //权限工具类
+import config from "@/config/config";
+import tpl_notice from "@/pages/tabbar/home/template/tpl_notice"; //标题栏模块
+import tpl_promotions from "@/pages/tabbar/home/template/tpl_promotions_detail"; //标题栏模块
+
+export default {
+  data() {
+    return {
+      id: "",
+      config,
+      pageData: "", //楼层页面数据
+      bodyParam: "",
+      isIos: ""
+    };
+  },
+  components: {
+    carousel: tpl_banner,
+    titleLayout: tpl_title,
+    leftOneRightTwo: tpl_left_one_right_two,
+    leftTwoRightOne: tpl_left_two_right_one,
+    topOneBottomTwo: tpl_top_one_bottom_two,
+    topTwoBottomOne: tpl_top_two_bottom_one,
+    flexThree: tpl_flex_three,
+    flexFive: tpl_flex_five,
+    flexFour: tpl_flex_four,
+    flexTwo: tpl_flex_two,
+    textPicture: tpl_text_picture,
+    menuLayout: tpl_menu,
+    search: tpl_search,
+    flexOne: tpl_flex_one,
+    goods: tpl_goods,
+    group: tpl_group,
+    notice: tpl_notice,
+    promotions: tpl_promotions
+  },
+
+  mounted() {
+    this.init();
+    // #ifdef MP-WEIXIN
+    // 小程序默认分享
+    uni.showShareMenu({ withShareTicket: true });
+    // #endif
+  },
+  onLoad(val) {
+    this.id = val.id;
+    this.bodyParam = val.body;
+  },
+
+  methods: {
+    /**
+     * 实例化首页数据楼层
+     */
+    init() {
+      this.pageData = "";
+	  console.log(this.bodyParam);
+      if (this.bodyParam) {
+        toSpecial({body: this.bodyParam}).then(res => {
+          if (res.data.success) {
+            this.pageData = JSON.parse(res.data.result.pageData);
+          }
+        });
+      } else {
+        getSpecial(this.id).then(res => {
+        if (res.data.success) {
+          this.pageData = JSON.parse(res.data.result.pageData);
+        }
+      });
+      }
+    },
+
+    /**
+     * TODO 扫码功能后续还会后续增加
+     * 应该实现的功能目前计划有：
+     * 扫描商品跳转商品页面
+     * 扫描活动跳转活动页面
+     * 扫描二维码登录
+     * 扫描其他站信息 弹出提示，返回首页。
+     */
+    seacnCode() {
+      uni.scanCode({
+        success: function(res) {
+          let path = encodeURIComponent(res.result);
+
+          // WX_CODE 为小程序码
+          if (res.scanType == "WX_CODE") {
+            console.log(res);
+            uni.navigateTo({
+              url: `/${res.path}`
+            });
+          } else {
+            config.scanAuthNavigation.forEach(src => {
+              if (res.result.indexOf(src) != -1) {
+                uni.navigateTo({
+                  url: `/${res.result.substring(src.length)}`
+                });
+              } else {
+                setTimeout(() => {
+                  uni.navigateTo({
+                    url: "/pages/tabbar/home/web-view?src=" + path
+                  });
+                }, 100);
+              }
+            });
+          }
+        }
+      });
+    },
+
+    /**
+     * 提示获取权限
+     */
+    tipsGetSettings() {
+      uni.showModal({
+        title: "提示",
+        content: "您已经关闭相机权限,去设置",
+        success: function(res) {
+          if (res.confirm) {
+            if (this.isIos) {
+              plus.runtime.openURL("app-settings:");
+            } else {
+              permision.gotoAppPermissionSetting();
+            }
+          }
+        }
+      });
+    },
+
+    /**
+     * 唤醒客户端扫码
+     * 没权限去申请权限，有权限获取扫码功能
+     */
+    async scan() {
+      // #ifdef APP-PLUS
+      this.isIos = plus.os.name == "iOS";
+      // 判断是否是Ios
+      if (this.isIos) {
+        const iosFirstCamera = uni.getStorageSync("iosFirstCamera"); //是不是第一次开启相机
+        if (iosFirstCamera !== "false") {
+          uni.setStorageSync("iosFirstCamera", "false"); //设为false就代表不是第一次开启相机
+          this.seacnCode();
+        } else {
+          if (permision.judgeIosPermission("camera")) {
+            this.seacnCode();
+          } else {
+            // 没有权限提醒是否去申请权限
+            this.tipsGetSettings();
+          }
+        }
+      } else {
+        /**
+         * TODO 安卓 权限已经授权了，调用api总是显示用户已永久拒绝申请。人傻了
+         * TODO 如果xdm有更好的办法请在 https://gitee.com/beijing_hongye_huicheng/lilishop/issues 提下谢谢
+         */
+        this.seacnCode();
+      }
+
+      // #endif
+
+      // #ifdef MP-WEIXIN
+      this.seacnCode();
+      // #endif
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.navbar-right {
+  padding: 0 16rpx 0 0;
+}
+
+.navbar {
+  display: flex;
+  align-items: center;
+}
+</style>

pages/tabbar/user/my.vue

@@ -36,12 +36,7 @@
       </u-row>
       <!-- 我的订单，代付款 -->
       <view class="order">
-        <view class="order-item" @click="navigateTo('/pages/order/myOrder?status=0')">
+       
-          <div class="bag bag1">
-            <u-icon name="order" size="35" color="#fff"></u-icon>
-          </div>
-          <view>我的订单</view>
-        </view>
         <view class="order-item" @click="navigateTo('/pages/order/myOrder?status=1')">
           <div class="bag bag2">
             <u-icon name="bag-fill" size="35" color="#fff"></u-icon>
@@ -64,7 +59,13 @@
           <div class="bag bag5">
             <u-icon name="server-fill" size="35" color="#fff"></u-icon>
           </div>
-          <view>售后服务</view>
+          <view>售后</view>
+        </view>
+		<view class="order-item" @click="navigateTo('/pages/order/myOrder?status=0')">
+		  <div class="bag bag1">
+		    <u-icon name="order" size="35" color="#fff"></u-icon>
+		  </div>
+		  <view>我的订单</view>
 		</view>
       </view>
     </div>

pages/tabbar/user/utils/tool.vue

@@ -5,59 +5,99 @@
 
       <div class="paddingBox">
         <view class="interact-container">
-          <view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
+			<view class="interact-item" @click="navigateTo('/pages/mine/address/addressManage')">
-            <image src="/static/mine/sign.png" mode=""></image>
+			  <image src="/static/mine/myaddress.png" mode=""></image>
-            <view>每日签到</view>
+			  <view>地址管理</view>
 			</view>
-          <view class="interact-item" @click="navigateTo('/pages/mine/point/myPoint')">
+			
-            <image src="/static/mine/mypoint.png" mode=""></image>
+			<view class="interact-item" @click="navigateTo('/pages/mine/myTracks')">
-            <view>我的积分</view>
+			  <image src="/static/mine/logistics.png" mode=""></image>
+			  <view>我的足迹</view>
 			</view>
-          <view class="interact-item" @click="navigateTo('/pages/cart/coupon/myCoupon')">
+		
-            <image src="/static/mine/mycoupon.png" mode=""></image>
+			<view class="interact-item" @click="navigateTo('/pages/order/evaluate/myEvaluate')">
-            <view>优惠券</view>
+			  <image src="/static/mine/feedback.png" mode=""></image>
+			  <view>我的评价</view>
 			</view>
+			<view class="interact-item" @click="linkMsgDetail()">
+			  <image src="/static/mine/mycommit.png" mode=""></image>
+			  <view>我的消息</view>
+			</view>
+		
+		
 			<view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
 			  <image src="/static/mine/myfavorite.png" mode=""></image>
 			  <view>我的关注</view>
 			</view>
-          <view class="interact-item" @click="navigateTo('/pages/mine/myTracks')">
+			
-            <image src="/static/mine/myhistory.png" mode=""></image>
+			
-            <view>我的足迹</view>
+			
+			<view class="interact-item" @click="navigateTo('/pages/mine/point/myPoint')">
+			  <image src="/static/mine/mypoint.png" mode=""></image>
+			  <view>我的积分</view>
 			</view>
-          <view class="interact-item" @click="navigateTo('/pages/order/evaluate/myEvaluate')">
+			
-            <image src="/static/mine/mycommit.png" mode=""></image>
+			<view class="interact-item" @click="distribution">
-            <view>我的评价</view>
+			  <image src="/static/mine/distribution.png" mode=""></image>
+			  <view>我的分销</view>
 			</view>
+			
+			
+			
 			<view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
 			  <image src="/static/mine/shensu.png" mode=""></image>
 			  <view>我的投诉</view>
 			</view>
 				   
-          <view class="interact-item" @click="navigateTo('/pages/mine/set/feedBack')">
+			<view class="interact-item" @click="navigateTo('/pages/cart/coupon/myCoupon')">
-            <image src="/static/mine/feedback.png" mode=""></image>
+			  <image src="/static/mine/mycoupon.png" mode=""></image>
-            <view>意见反馈</view>
+			  <view>优惠券</view>
 			</view>
+			
+		
+			        
+					
+          <view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
+            <image src="/static/mine/sign.png" mode=""></image>
+            <view>每日签到</view>
+          </view>
+         
+         
+       
+          
+
+      
           <view class="interact-item" @click="navigateTo('/pages/cart/coupon/couponCenter')">
             <image src="/static/mine/couponcenter.png" mode=""></image>
             <view>领券中心</view>
           </view>
-          <view class="interact-item" @click="navigateTo('/pages/mine/address/addressManage')">
+          
-            <image src="/static/mine/myaddress.png" mode=""></image>
+         
-            <view>地址管理</view>
+          
-          </view>
-          <view class="interact-item" @click="navigateTo('/pages/mine/set/setUp')">
-            <image src="/static/mine/setting.png" mode=""></image>
-            <view>设置</view>
-          </view>
-          <view class="interact-item" @click="distribution">
-            <image src="/static/mine/distribution.png" mode=""></image>
-            <view>我的分销</view>
-          </view>
           <view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
             <image src="/static/mine/kanjia.png" mode=""></image>
             <view>砍价记录</view>
           </view>
+		  
+		
+		  
+		<view class="interact-item" @click="navigateTo('/pages/mine/set/feedBack')">
+		  <image src="/static/mine/feedback.png" mode=""></image>
+		  <view>意见反馈</view>
+		</view>
+		
+		<view class="interact-item" @click="navigateTo('/pages/mine/set/editionIntro')">
+		  <image src="/static/mine/pointgift.png" mode=""></image>
+		  <view>关于</view>
+		</view>
+		
+		
+		<view class="interact-item" @click="navigateTo('/pages/mine/set/setUp')">
+		  <image src="/static/mine/setting.png" mode=""></image>
+		  <view>设置</view>
+		</view>
+	
+		  
         </view>
       </div>
     </view>
@@ -66,13 +106,30 @@
 
 <script>
 import { distribution } from "@/api/goods";
+import configs from "@/config/config";
+import storage from "@/utils/storage";
+
 export default {
+  data() {
+	return {
+	  configs,
+	  storage
+	  }
+  },
+	
   methods: {
     navigateTo(url) {
       uni.navigateTo({
         url,
       });
     },
+	
+	linkMsgDetail(){
+		uni.navigateTo({
+				url: `/pages/tabbar/home/web-view?IM=0`,
+		});
+	},
+	
     distribution() {
       distribution().then((res) => {
         if (res.data.result) {

plugins/APPUpdate/index.js

@@ -854,7 +854,8 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
 export default function (isPrompt = false) {
   getCurrentNo((version) => {
     getServerNo((res) => {
-      if (res.versionCode.replace(/\./g, "") <= version.versionCode) {
+
+      if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) {
         return false;
       }
 

project.config.json

@@ -0,0 +1,28 @@
+{
+  "appid": "wx98ebde1da5b340d4",
+  "compileType": "miniprogram",
+  "libVersion": "2.27.0",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "lilishop-uniapp",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}

store/index.js

@@ -6,6 +6,7 @@ Vue.use(Vuex);
 
 const store = new Vuex.Store({
   state: {
+    shareLink:"", //分享链接
     verificationKey: "", //获取key表示验证通过
     distributionId:"", //分销员Id 如果当前账户从未登录过时记录
     hasLogin: storage.getHasLogin(),

uni.scss

@@ -150,6 +150,9 @@ $font-weight: 400;
 .flex-a-c{
 	align-items: center;
 }
+.flex-j-sb{
+	justify-content: space-between;
+}
 .relative {
 	position: relative;
 }
@@ -169,3 +172,11 @@ $font-weight: 400;
 	-webkit-line-clamp: 2;
 	overflow: hidden;
 }
+
+.wes-3 {
+	/* 适用于webkit内核和移动端 */
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+	overflow: hidden;
+}

utils/filters.js

@@ -1,5 +1,7 @@
 import Foundation from "./Foundation.js";
 import storage from "@/utils/storage.js";
+import { getUserInfo } from "@/api/members";
+import Vue from "vue";
 /**
  * 金钱单位置换  2999 --> 2,999.00
  * @param val
@@ -19,6 +21,20 @@ export function unitPrice(val, unit, location) {
   return (unit || "") + price;
 }
 
+/**
+ * 格式化价格  1999 --> [1999,00]
+ * @param {*} val 
+ * @returns 
+ */
+export function goodsFormatPrice(val) {
+  if (typeof val == "undefined") {
+    return val;
+  }
+  let valNum = new Number(val);
+  return valNum.toFixed(2).split(".");
+}
+
+
 /**
  * 脱敏姓名
  */
@@ -99,12 +115,44 @@ export function clearStrComma(str) {
 export function isLogin(val) {
   let userInfo = storage.getUserInfo();
   if (val == "auth") {
-    return userInfo.id ? true : false;
+    return userInfo && userInfo.id ? true : false;
   } else {
     return storage.getUserInfo();
   }
 }
 
+export function tipsToLogin() {
+  if (!isLogin("auth")) {
+    uni.showModal({
+      title: "提示",
+      content: "当前用户未登录是否登录？",
+      confirmText: "确定",
+      cancelText: "取消",
+      confirmColor: Vue.prototype.$mainColor,
+      success: (res) => {
+        if (res.confirm) {
+          navigateToLogin();
+        } else if (res.cancel) {
+          uni.navigateBack();
+        }
+      },
+    });
+    return false;
+  }
+  return true;
+}
+
+/**
+ * 获取用户信息并重新添加到缓存里面
+ */
+export async function userInfo() {
+  let res = await getUserInfo();
+  if (res.data.success) {
+    storage.setUserInfo(res.data.result);
+    return res.data.result;
+  }
+}
+
 /**
  * 验证是否登录如果没登录则去登录
  * @param {*} val
@@ -113,7 +161,7 @@ export function isLogin(val) {
 
 export function forceLogin() {
   let userInfo = storage.getUserInfo();
-  if (!userInfo.id) {
+  if (!userInfo || !userInfo.id) {
     // #ifdef MP-WEIXIN
 
     uni.navigateTo({

utils/request.js

@@ -1,12 +1,19 @@
 import Request from "@/lib/request/index.js";
-import { refreshTokenFn } from "@/api/login.js";
+import {
+	refreshTokenFn
+} from "@/api/login.js";
 import storage from "@/utils/storage.js";
-import { md5 } from "@/utils/md5.js";
+import {
+	md5
+} from "@/utils/md5.js";
 import Foundation from "@/utils/Foundation.js";
 import api from "@/config/api.js";
 
 import uuid from "@/utils/uuid.modified.js";
 
+
+let isNavigateTo = false
+
 function cleanStorage() {
 	uni.showToast({
 		title: "你的登录状态已过期，请重新登录",
@@ -25,24 +32,21 @@ function cleanStorage() {
 	storage.setUserInfo({});
 
 
-
+	if (!isNavigateTo) {
+		isNavigateTo = true
 		// 防抖处理跳转
 		// #ifdef MP-WEIXIN
-
 		uni.navigateTo({
 			url: "/pages/passport/wechatMPLogin",
 		});
-
 		// #endif
-
 		// #ifndef MP-WEIXIN
-
 		uni.navigateTo({
 			url: "/pages/passport/login",
 		});
-
 		//  #endif
 	}
+}
 
 let http = new Request();
 
@@ -79,7 +83,10 @@ http.interceptors.request.use(
 				sign,
 			};
 			let params = config.params || {};
-      params = { ...params, ..._params };
+			params = {
+				...params,
+				..._params
+			};
 
 			config.params = params;
 			config.header.accessToken = accessToken;
@@ -105,12 +112,13 @@ let requests = [];
 // 必须使用异步函数，注意
 http.interceptors.response.use(
 	async (response) => {
+			isNavigateTo = false
 			/* 请求之后拦截器。可以使用async await 做异步操作  */
 			// token存在并且token过期
-    if (isRefreshing && response.statusCode === 403) {
+			// if (isRefreshing && response.statusCode === 403) {
-      cleanStorage();
+			//   cleanStorage();
-      isRefreshing = false;
+			//   isRefreshing = false;
-    }
+			// }
 
 			let token = storage.getAccessToken();
 			if (
@@ -118,21 +126,29 @@ http.interceptors.response.use(
 				response.data.status === 403
 			) {
 				if (!isRefreshing) {
+					console.log('旧token', token)
 					isRefreshing = true;
+					storage.setAccessToken('')
+					let oldRefreshToken = storage.getRefreshToken();
 					//调用刷新token的接口
-        return refreshTokenFn(storage.getRefreshToken())
+					return refreshTokenFn(oldRefreshToken)
 						.then((res) => {
-            let { accessToken, refreshToken } = res.data.result;
+							let {
+								accessToken,
+								refreshToken
+							} = res.data.result;
 							storage.setAccessToken(accessToken);
 							storage.setRefreshToken(refreshToken);
 
 							response.header.accessToken = `${accessToken}`;
 							// token 刷新后将数组的方法重新执行
+							console.log('接口队列', requests, '新token', accessToken)
 							requests.forEach((cb) => cb(accessToken));
 							requests = []; // 重新请求完清空
 							return http.request(response.config);
 						})
 						.catch((err) => {
+							console.log('刷新token报错' + oldRefreshToken, err)
 							cleanStorage();
 							return Promise.reject(err);
 						})
@@ -152,9 +168,10 @@ http.interceptors.response.use(
 
 				// 如果当前返回没登录
 			} else if (
-      (!token && response.statusCode === 403) ||
+				(!token && !storage.getRefreshToken() && response.statusCode === 403) ||
 				response.data.code === 403
 			) {
+				console.log('没有token 以及刷新token 内容', token, storage.getRefreshToken())
 				cleanStorage();
 
 				// 如果当前状态码为正常但是success为不正常时
@@ -177,7 +194,9 @@ http.interceptors.response.use(
 		}
 );
 
-export { http };
+export {
+	http
+};
 
 export const Method = {
 	GET: "GET",

utils/storage.js

@@ -18,7 +18,16 @@ export default {
   getHotWords() {
     return uni.getStorageSync(`hotWords`);
   },
-
+  //写入 展示还是不展示
+  setShow(val) {
+    uni.setStorageSync("show", val);
+  },
+  getShow() {
+    if (uni.getStorageSync(`show`) === "" || uni.getStorageSync(`show`) === undefined) {
+      return true;
+    }
+    return uni.getStorageSync(`show`);
+  },
   // 获取face id登录
   getFaceLogin() {
     return uni.getStorageSync(FACE_LOGIN);
@@ -92,11 +101,11 @@ export default {
   removeRefreshToken() {
     uni.removeStorageSync(REFRESH_TOKEN);
   },
-  // 写入刷新token
+
   setAfterSaleData(val) {
     uni.setStorageSync(AFTERSALE_DATA, val);
   },
-  // 获取刷新token
+
   getAfterSaleData() {
     return uni.getStorageSync(AFTERSALE_DATA);
   },

uview-ui/components/u-no-network/u-no-network.vue

@@ -59,6 +59,11 @@
 				return this.zIndex ? this.zIndex : this.$u.zIndex.noNetwork;
 			}
 		},
+		watch:{
+			isConnected(val){
+					this.$emit('isConnected',val)
+			}
+		},
 		mounted() {
 			this.isIOS = (uni.getSystemInfoSync().platform === 'ios');
 			uni.onNetworkStatusChange((res) => {

uview-ui/libs/css/common.scss

@@ -109,63 +109,63 @@ text {
 }
 
 // 定义flex等分
-@for $i from 0 through 12 {
+// @for $i from 0 through 12 {
-	.u-flex-#{$i} {
+// 	.u-flex-#{$i} {
-		flex: $i;
+// 		flex: $i;
-	}
+// 	}
-}
+// }
 
-// 定义字体(px)单位，小于20都为px单位字体
+// // 定义字体(px)单位，小于20都为px单位字体
-@for $i from 9 to 20 {
+// @for $i from 9 to 20 {
-	.u-font-#{$i} {
+// 	.u-font-#{$i} {
-		font-size: $i + px;
+// 		font-size: $i + px;
-	}
+// 	}
-}
+// }
 
-// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+// // 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
-@for $i from 20 through 40 {
+// @for $i from 20 through 40 {
-	.u-font-#{$i} {
+// 	.u-font-#{$i} {
-		font-size: $i + rpx;
+// 		font-size: $i + rpx;
-	}
+// 	}
-}
+// }
 
-// 定义内外边距，历遍1-80
+// // 定义内外边距，历遍1-80
-@for $i from 0 through 80 {
+// @for $i from 0 through 80 {
-	// 只要双数和能被5除尽的数
+// 	// 只要双数和能被5除尽的数
-	@if $i % 2 == 0 or $i % 5 == 0 {
+// 	@if $i % 2 == 0 or $i % 5 == 0 {
-		// 得出：u-margin-30或者u-m-30
+// 		// 得出：u-margin-30或者u-m-30
-		.u-margin-#{$i}, .u-m-#{$i} {
+// 		.u-margin-#{$i}, .u-m-#{$i} {
-			margin: $i + rpx!important;
+// 			margin: $i + rpx!important;
-		}
+// 		}
 		
-		// 得出：u-padding-30或者u-p-30
+// 		// 得出：u-padding-30或者u-p-30
-		.u-padding-#{$i}, .u-p-#{$i} {
+// 		.u-padding-#{$i}, .u-p-#{$i} {
-			padding: $i + rpx!important;
+// 			padding: $i + rpx!important;
-		}
+// 		}
 		
-		@each $short, $long in l left, t top, r right, b bottom {
+// 		@each $short, $long in l left, t top, r right, b bottom {
-			// 缩写版，结果如： u-m-l-30
+// 			// 缩写版，结果如： u-m-l-30
-			// 定义外边距
+// 			// 定义外边距
-			.u-m-#{$short}-#{$i} {
+// 			.u-m-#{$short}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
+// 				margin-#{$long}: $i + rpx!important;
-			}
+// 			}
 			
-			// 定义内边距
+// 			// 定义内边距
-			.u-p-#{$short}-#{$i} {
+// 			.u-p-#{$short}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
+// 				padding-#{$long}: $i + rpx!important;
-			}
+// 			}
 			
-			// 完整版，结果如：u-margin-left-30
+// 			// 完整版，结果如：u-margin-left-30
-			// 定义外边距
+// 			// 定义外边距
-			.u-margin-#{$long}-#{$i} {
+// 			.u-margin-#{$long}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
+// 				margin-#{$long}: $i + rpx!important;
-			}
+// 			}
 			
-			// 定义内边距
+// 			// 定义内边距
-			.u-padding-#{$long}-#{$i} {
+// 			.u-padding-#{$long}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
+// 				padding-#{$long}: $i + rpx!important;
-			}
+// 			}
-		}
+// 		}
-	}
+// 	}
-}
+// }