diff --git a/App.vue b/App.vue
index 1aa60ee..4304ad7 100644
--- a/App.vue
+++ b/App.vue
@@ -1,232 +1,257 @@
 <script>
-/**
- * vuex管理登录状态，具体可以参考官方登录模板示例
- */
-import { mapMutations } from "vuex";
-import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-import config from "@/config/config";
-import storage from "@/utils/storage";
-// 悬浮球
+	/**
+	 * vuex管理登录状态，具体可以参考官方登录模板示例
+	 */
+	import {
+		mapMutations
+	} from "vuex";
+	import APPUpdate from "@/plugins/APPUpdate";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
+	import config from "@/config/config";
+	import storage from "@/utils/storage";
 
-export default {
-  data() {
-    return {
-      config,
-    };
-  },
-
-  /**
-   * 监听返回
-   */
-  onBackPress(e) {
-    if (e.from == "backbutton") {
-      let routes = getCurrentPages();
-      let curRoute = routes[routes.length - 1].options;
-      routes.forEach((item) => {
-        if (
-          item.route == "pages/tabbar/cart/cartList" ||
-          item.route.indexOf("pages/product/goods") != -1
-        ) {
-          uni.redirectTo({
-            url: item.route,
-          });
-        }
-      });
-
-      if (curRoute.addId) {
-        uni.reLaunch({
-          url: "/pages/tabbar/cart/cartList",
-        });
-      } else {
-        uni.navigateBack();
-      }
-      return true; //阻止默认返回行为
-    }
-  },
-  methods: {
-    ...mapMutations(["login"]),
-  },
-  onLaunch: function () {
-    // #ifdef APP-PLUS
-    this.checkArguments(); // 检测启动参数
-    APPUpdate();
-
-    // 重点是以下： 一定要监听后台恢复 ！一定要
-    plus.globalEvent.addEventListener("newintent", (e) => {
-      this.checkArguments(); // 检测启动参数
-    });
-    // #endif
-
-    // #ifdef MP-WEIXIN
-    this.applyUpdateWeChat();
-    // #endif
-  },
-
-   onShow() {
-    // #ifndef H5
-      this.getClipboard();
-		// #endif
-    // #ifdef APP-PLUS
-  
-    if (storage.getShow()) {
-      if(uni.getSystemInfoSync().platform == 'ios'){
-      this.$u.route("/pages/tabbar/screen/fullScreen");
-
-      }
-    }
-    // #endif
-  },
-  methods: {
-    /**
-     * 微信小程序版本提交更新版本 解决缓存问题
-     */
-    applyUpdateWeChat() {
-      const updateManager = uni.getUpdateManager();
-
-      updateManager.onCheckForUpdate(function (res) {
-        // 请求完新版本信息的回调
-      });
-
-      updateManager.onUpdateReady(function (res) {
-        uni.showModal({
-          title: "更新提示",
-          content: "发现新版本，是否重启应用？",
-          success(res) {
-            if (res.confirm) {
-              // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-              updateManager.applyUpdate();
-            }
-          },
-        });
-      });
-      updateManager.onUpdateFailed(function (res) {
-        // 新的版本下载失败
-      });
-    },
-
-    //  TODO 开屏广告 后续优化添加
-    launch() {
-      try {
-        // 获取本地存储中launchFlag标识 开屏广告
-        const value = uni.getStorageSync("launchFlag");
-        if (!value) {
-          // this.$u.route("/pages/index/agreement");
-        } else {
-          //app启动时打开启动广告页
-          var w = plus.webview.open(
-            "/hybrid/html/advertise/advertise.html",
-            "本地地址",
-            {
-              top: 0,
-              bottom: 0,
-              zindex: 999,
-            },
-            "fade-in",
-            500
-          );
-          //设置定时器，4s后关闭启动广告页
-          setTimeout(function () {
-            plus.webview.close(w);
-            APPUpdate();
-          }, 3000);
-        }
-      } catch (e) {
-        // error
-        uni.setStorage({
-          key: "launchFlag",
-          data: true,
-          success: function () {
-            console.log("error时存储launchFlag");
-          },
-        });
-      }
-    },
-
-    /**
-     * 获取粘贴板数据
-     */
-    async getClipboard() {
-      let res = await getClipboardData();
 	
-      /**
-       * 解析粘贴板数据
-       */
-		
-      if (res.indexOf(config.shareLink) != -1 && (res!= this.$store.state.shareLink)) {
-        this.$store.state.shareLink = res
-        uni.showModal({
-          title: "提示",
-          content: "检测到一个分享链接是否跳转？",
-          confirmText: "跳转",
-          success: function (callback) {
-            if (callback.confirm) {
-              const path = res.split(config.shareLink)[1];
-              if (path.indexOf("tabbar") != -1) {
-                uni.switchTab({
-                  url: path,
-                });
-              } else {
-                uni.navigateTo({
-                  url: path,
-                });
-              }
-            }
-          },
-        });
-      }
-    },
+	
+	/**
+	 * 路由监听并删除路由
+	 * 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
 
-    /**
-     * h5中打开app获取跳转app的链接并跳转
-     */
-    checkArguments() {
-      // #ifdef APP-PLUS
-      setTimeout(() => {
-        const args = plus.runtime.arguments;
-        if (args) {
-          const argsStr = decodeURIComponent(args);
-          const path = argsStr.split("//")[1];
-          if (path.indexOf("tabbar") != -1) {
-            uni.switchTab({
-              url: `/${path}`,
-            });
-          } else {
-            uni.navigateTo({
-              url: `/${path}`,
-            });
-          }
-        }
-      });
-      // #endif
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				config,
+			};
+		},
+
+
+		/**
+		 * 监听返回
+		 */
+		onBackPress(e) {
+			if (e.from == "backbutton") {
+				let routes = getCurrentPages();
+				let curRoute = routes[routes.length - 1].options;
+				routes.forEach((item) => {
+					if (
+						item.route == "pages/tabbar/cart/cartList" ||
+						item.route.indexOf("pages/product/goods") != -1
+					) {
+						uni.redirectTo({
+							url: item.route,
+						});
+					}
+				});
+
+				if (curRoute.addId) {
+					uni.reLaunch({
+						url: "/pages/tabbar/cart/cartList",
+					});
+				} else {
+					uni.navigateBack();
+				}
+				return true; //阻止默认返回行为
+			}
+		},
+		methods: {
+			...mapMutations(["login"]),
+		},
+		onLaunch: function() {
+			// #ifdef APP-PLUS
+			this.checkArguments(); // 检测启动参数
+			APPUpdate();
+
+			// 重点是以下： 一定要监听后台恢复 ！一定要
+			plus.globalEvent.addEventListener("newintent", (e) => {
+				this.checkArguments(); // 检测启动参数
+			});
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.applyUpdateWeChat();
+			// #endif
+		},
+
+		onShow() {
+			// #ifndef H5
+			this.getClipboard();
+			// #endif
+			// #ifdef APP-PLUS
+
+			if (storage.getShow()) {
+				if (uni.getSystemInfoSync().platform == 'ios') {
+					this.$u.route("/pages/tabbar/screen/fullScreen");
+
+				}
+			}
+			// #endif
+		},
+		methods: {
+			/**
+			 * 微信小程序版本提交更新版本 解决缓存问题
+			 */
+			applyUpdateWeChat() {
+				const updateManager = uni.getUpdateManager();
+
+				updateManager.onCheckForUpdate(function(res) {
+					// 请求完新版本信息的回调
+				});
+
+				updateManager.onUpdateReady(function(res) {
+					uni.showModal({
+						title: "更新提示",
+						content: "发现新版本，是否重启应用？",
+						success(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								updateManager.applyUpdate();
+							}
+						},
+					});
+				});
+				updateManager.onUpdateFailed(function(res) {
+					// 新的版本下载失败
+				});
+			},
+
+			//  TODO 开屏广告 后续优化添加
+			launch() {
+				try {
+					// 获取本地存储中launchFlag标识 开屏广告
+					const value = uni.getStorageSync("launchFlag");
+					if (!value) {
+						// this.$u.route("/pages/index/agreement");
+					} else {
+						//app启动时打开启动广告页
+						var w = plus.webview.open(
+							"/hybrid/html/advertise/advertise.html",
+							"本地地址", {
+								top: 0,
+								bottom: 0,
+								zindex: 999,
+							},
+							"fade-in",
+							500
+						);
+						//设置定时器，4s后关闭启动广告页
+						setTimeout(function() {
+							plus.webview.close(w);
+							APPUpdate();
+						}, 3000);
+					}
+				} catch (e) {
+					// error
+					uni.setStorage({
+						key: "launchFlag",
+						data: true,
+						success: function() {
+							console.log("error时存储launchFlag");
+						},
+					});
+				}
+			},
+
+			/**
+			 * 获取粘贴板数据
+			 */
+			async getClipboard() {
+				let res = await getClipboardData();
+
+				/**
+				 * 解析粘贴板数据
+				 */
+
+				if (res.indexOf(config.shareLink) != -1 && (res != this.$store.state.shareLink)) {
+					this.$store.state.shareLink = res
+					uni.showModal({
+						title: "提示",
+						content: "检测到一个分享链接是否跳转？",
+						confirmText: "跳转",
+						success: function(callback) {
+							if (callback.confirm) {
+								const path = res.split(config.shareLink)[1];
+								if (path.indexOf("tabbar") != -1) {
+									uni.switchTab({
+										url: path,
+									});
+								} else {
+									uni.navigateTo({
+										url: path,
+									});
+								}
+							}
+						},
+					});
+				}
+			},
+
+			/**
+			 * h5中打开app获取跳转app的链接并跳转
+			 */
+			checkArguments() {
+				// #ifdef APP-PLUS
+				setTimeout(() => {
+					const args = plus.runtime.arguments;
+					if (args) {
+						const argsStr = decodeURIComponent(args);
+						const path = argsStr.split("//")[1];
+						if (path.indexOf("tabbar") != -1) {
+							uni.switchTab({
+								url: `/${path}`,
+							});
+						} else {
+							uni.navigateTo({
+								url: `/${path}`,
+							});
+						}
+					}
+				});
+				// #endif
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-@import "uview-ui/index.scss";
+	@import "uview-ui/index.scss";
 
-// -------适配底部安全区  苹果x系列刘海屏
+	// -------适配底部安全区  苹果x系列刘海屏
 
-// #ifdef MP-WEIXIN
-.mp-iphonex-bottom {
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-  box-sizing: content-box;
-  height: auto !important;
-  padding-top: 10rpx;
-}
-// #endif
+	// #ifdef MP-WEIXIN
+	.mp-iphonex-bottom {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
+		height: auto !important;
+		padding-top: 10rpx;
+	}
 
-body {
-  background-color: $bg-color;
-}
-/************************ */
-.w200 {
-  width: 200rpx !important;
-}
-.flex1 {
-  flex: 1; //必须父级设置flex
-}
+	// #endif
+
+	body {
+		background-color: $bg-color;
+	}
+
+	/************************ */
+	.w200 {
+		width: 200rpx !important;
+	}
+
+	.flex1 {
+		flex: 1; //必须父级设置flex
+	}
 </style>
diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 60724a3..a6cef91 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -46,20 +46,20 @@
 									    formatPrice(item.price)[0]
 									  }}</span>
 										.{{ formatPrice(item.price)[1] }}
-									</span>
-									<span class='wholesale-item'>
-										{{item.num}}{{goodsDetail.goodsUnit}}
+									</span>
+									<span class='wholesale-item'>
+										{{item.num}}{{goodsDetail.goodsUnit}}
 									</span>
 								</div>
-							</div>
-							<div class="goods-price" v-else>
-								<span>
-									￥
-									<span class="goods-price-bigshow">{{
-							    formatPrice(goodsDetail.price)[0]
-							  }}</span>
-									.{{ formatPrice(goodsDetail.price)[1] }}
-								</span>
+							</div>
+							<div class="goods-price" v-else>
+								<span>
+									￥
+									<span class="goods-price-bigshow">{{
+							    formatPrice(goodsDetail.price)[0]
+							  }}</span>
+									.{{ formatPrice(goodsDetail.price)[1] }}
+								</span>
 							</div>
 						</view>
 						<view class="goods-check-skus">
@@ -68,12 +68,12 @@
 								{{ selectName }}
 								<span>，{{ num }}个</span>
 							</span>
-						</view>
-						<view class="goods-check-skus">
-							库存
-							<span class="goods-check-skus-name">
-								<span>{{ goodsDetail.quantity }}</span>
-							</span>
+						</view>
+						<view class="goods-check-skus">
+							库存
+							<span class="goods-check-skus-name">
+								<span>{{ goodsDetail.quantity }}</span>
+							</span>
 						</view>
 					</view>
 				</view>
@@ -99,10 +99,10 @@
 						</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-input style='text-align: right;' v-model="num" type="number"  />
+						
+						<u-input  class="view-class-input" v-model="num" type="number"  />
 					</view>
 				</scroll-view>
 				<!-- 按钮 -->
@@ -133,14 +133,14 @@
 				formatList: [],
 				currentSelceted: [],
 				skuList: "",
-				isClose: false, //是否可以点击遮罩关闭
+				isClose: false, //是否可以点击遮罩关闭
 				
 			};
 		},
-		props: {
-			wholesaleList:{
-				type: null,
-				default: false,
+		props: {
+			wholesaleList:{
+				type: null,
+				default: false,
 			},
 			buyMask: {
 				type: Boolean,
@@ -170,23 +170,22 @@
 				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){
-						console.log(val)
-						this.val = this.goodsDetail.quantity
-					}
-				}
+		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) {
@@ -399,9 +398,9 @@
 </script>
 <style lang="scss" scoped>
 	@import "./popup.scss";
-	.price-row{
-		text-align: center;
-		
+	.price-row{
+		text-align: center;
+		
 	}
 	.buy {
 		background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
@@ -422,8 +421,14 @@
 
 	.goods-skus-number {
 		justify-content: space-between;
-		display: flex;
-		text-align: right
+		display: flex;
+		
+		>.view-class-title{
+			flex: 8;
+		}
+		>.view-class-input{
+			flex:1
+		}
 	}
 
 	/deep/ .uni-scroll-view {
@@ -468,13 +473,13 @@
 				border-radius: 30rpx;
 			}
 		}
-	}
-	.wholesale-item{
-		color: #999 !important;
-		font-size: 24rpx;
-		margin:0 20rpx;
-		display: flex;
-		justify-content: center;
+	}
+	.wholesale-item{
+		color: #999 !important;
+		font-size: 24rpx;
+		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
 	}
 
 	.goods-header {
@@ -494,7 +499,7 @@
 
 	.goods-price {
 		color: $price-color;
-		line-height: 80rpx;
+		line-height: 80rpx;
 		margin-right: 20rpx;
 		>* {
 			color: $price-color;
@@ -536,4 +541,4 @@
 			color: #333;
 		}
 	}
-</style>
+</style>
diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
index e69de29..33d3a33 100644
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -0,0 +1,347 @@
+<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>{{ formatPrice(item.content.price )[0] }} </span>.{{
+	            formatPrice(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>{{ formatPrice(item.content.price )[0] }} </span>.{{
+			            formatPrice(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;
+			},
+
+
+			// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
+
+			// 数据去重一下 只显示一次 减免 劵 什么的
+			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: 84rpx;
+				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>
diff --git a/components/m-goods-list/promotion.vue b/components/m-goods-list/promotion.vue
new file mode 100644
index 0000000..361bbcb
--- /dev/null
+++ b/components/m-goods-list/promotion.vue
@@ -0,0 +1,160 @@
+<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>{{ formatPrice(item.price )[0] }} </span>.{{
+										formatPrice(item.price )[1]
+									}}
+							</div>
+							<!-- 砍价 -->
+							<div class="price" v-if="type && item.purchasePrice!=undefined">
+								最低：
+								¥<span>{{ formatPrice(item.purchasePrice )[0] }} </span>.{{
+										formatPrice(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) {
+				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: 84rpx;
+			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>
diff --git a/config/api.js b/config/api.js
index e8461b2..96131ba 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,14 +4,8 @@
  */
 // 开发环境
 const dev = {
-  // common: "https://common-api.pickmall.cn",
-  // buyer: "https://buyer-api.pickmall.cn",
-
-  common: "http://192.168.0.106:8890",
-	  buyer: "http://192.168.0.106:8888",
-
-
-
+  common: "https://common-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
 };
 // 生产环境
 const prod = {
diff --git a/main.js b/main.js
index ba42846..9b47071 100644
--- a/main.js
+++ b/main.js
@@ -30,6 +30,8 @@ Object.keys(filters).forEach((key) => {
 
 // 引入Vuex
 Vue.prototype.$store = store;
+
+
 Vue.use(uView);
 Vue.config.productionTip = false;
 
diff --git a/manifest.json b/manifest.json
index 9267136..4cc39c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.2.6",
-    "versionCode" : 4000260,
+    "versionName" : "4.2.5",
+    "versionCode" : 4000250,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages.json b/pages.json
index 4d1a33f..115501b 100644
--- a/pages.json
+++ b/pages.json
@@ -465,7 +465,9 @@
 			"pages": [ {
 					"path": "seckill",
 					"style": {
-						"navigationBarTitleText": "限时抢购",
+						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -478,7 +480,8 @@
 					"path": "joinGroup",
 					"style": {
 						"navigationBarTitleText": "拼团活动",
-						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index f5b092c..71be635 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -138,7 +138,7 @@
 				if (this.routerVal.recharge_sn) {
 					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
-					this.orderType = "RECHARGE";
+					this.orderType = "RECHARGE";
 					
 				} else if (this.routerVal.trade_sn) {
 					this.sn = this.routerVal.trade_sn;
@@ -178,12 +178,12 @@
 					
 						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";
-							});
+						});
+						// 充值的话仅保留微信支付
+						if(this.orderType == "RECHARGE"){
+							this.payList = res.data.result.support.filter((item) => {
+								return item == "WECHAT";
+							});
 						}
 						
 					}
diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue
index 7cf807f..6bc4923 100644
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="add-address">
     <div class="uForm">
-      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
+      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
 				<!-- #ifndef H5 -->
         <view class="selectAddress" @click="clickUniMap">
           选择收货地址
-        </view>
+        </view>
 				<!-- #endif -->
         <u-form-item class="border" label="收货人" label-width="130" prop="name">
           <u-input v-model="form.name" clearable placeholder="请输入收货人姓名" />
@@ -162,9 +162,7 @@ export default {
             delete this.form.updateTime;
             editAddress(this.form).then((res) => {
               if (res.data.success) {
-                uni.navigateTo({
-                  url: `/${beforePage.route}`,
-                });
+                uni.navigateBack();
               }
             });
           }
diff --git a/pages/mine/address/addressManage.vue b/pages/mine/address/addressManage.vue
index 2934f43..f28382c 100644
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -86,23 +86,9 @@ export default {
    * 进入页面检测当前账户是否登录
    */
   onShow() {
-    let that = this;
-    if (this.$options.filters.isLogin("auth")) {
+    if (this.$options.filters.tipsToLogin()) {
       this.getAddressList();
-    } else {
-      uni.showModal({
-        title: "提示",
-        content: "检测到您的账号还未登录,是否去登录？",
-        confirmColor: this.$lightColor,
-        success: function (res) {
-          if (res.confirm) {
-            that.$options.filters.navigateToLogin();
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
-    }
+    } 
   },
   methods: {
     //获取地址列表
diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index 4768c70..00a130f 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -256,4 +256,4 @@
 		display: -webkit-flex;
 		display: flex;
 	}
-</style>
+</style>
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 0683258..2d1eb1c 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -326,10 +326,10 @@ export default {
     // this.loadData(this.status);
   },
   onShow() {
-    if (!this.tabCurrentIndex) {
-     this.initData(0);
-    } else {
-      
+    if(this.$options.filters.tipsToLogin()){
+      if (!this.tabCurrentIndex) {
+        this.initData(0);
+      }
     }
     // this.loadData(this.status);
   },
@@ -340,7 +340,7 @@ export default {
      * 替换onLoad下代码即可
      */
     let status = Number(options.status);
-    this.status = status;
+    this.status = status;
 		
     this.tabCurrentIndex = status;
     // if (status == 0) {
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index dc57cf3..cbceb11 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <u-navbar :border-bottom="false">
+    <u-navbar :border-bottom="false">
 			<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,7 +58,7 @@
     <!-- menu -->
 
     <!-- 商品 -->
-    <div class="contant" v-if="current == 0">
+    <div class="contant" v-if="current == 0">
 		
       <u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='暂无商品信息'></u-empty>
 			<goodsTemplate v-else :res="goodsList" :storeName="false" />
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
+import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
 import goodsTemplate from '@/components/m-goods-list/list'
 import {
   receiveCoupons,
@@ -119,7 +119,7 @@ export default {
     current(val) {
       val == 0 ? ()=>{ this.goodsList = []; this.getGoodsData()} : this.getCategoryData();
     },
-  },
+  },
 	components:{goodsTemplate},
 
   /**
@@ -203,10 +203,10 @@ export default {
       //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
       //     sign,
       // });
-      // // #endif
-			
-			uni.navigateTo({
-			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
+      // // #endif
+			
+			uni.navigateTo({
+			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
 			 });
     },
 
@@ -235,7 +235,7 @@ export default {
     /**
      * 搜索
      */
-    search() {
+    search() {
 			console.log("点击")
       uni.navigateTo({
         url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
@@ -261,7 +261,7 @@ export default {
     async getGoodsData() {
       let res = await getGoodsList(this.goodsParams);
       if (res.data.success) {
-        this.goodsList.push(...res.data.result.content);
+        this.goodsList.push(...res.data.result.content);
 				console.log(this.goodsList)
       }
     },
diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue
index 52cf0dc..185407d 100644
--- a/pages/promotion/bargain/detail.vue
+++ b/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 {
-  background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+.wrapper-box {
+  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 {
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index 7acaf8a..d553050 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -6,22 +6,7 @@
       <!-- 砍价列表 -->
       <div class="box">
         <!-- 已砍的商品 -->
-        <div class="bargain" v-if="bargainList.length!=0">
-          <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>
+        <goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
         <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: {
@@ -91,7 +78,7 @@ page {
   background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  height: 600rpx;
+  height: 506rpx;
   width: 100%;
 }
 
@@ -99,7 +86,7 @@ page {
   background: #fff;
   border-radius: 20rpx;
   position: relative;
-  top: 650rpx;
+  top: 560rpx;
   width: 94%;
   margin: 0 auto;
   > .bargain {
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index 7b953d4..0053229 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -1,155 +1,133 @@
 <template>
-  <view class="wrapper">
+	<view class="wrapper">
+		<u-navbar :border-bottom="false"  :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">
+				<view style="margin-right: 24rpx;" @click="searchFlag()">
+					<view v-if="search">取消</view>
+					<u-icon v-if="!search" size="44rpx" name="search"></u-icon>
+				</view>
+			</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" />
+			
+			<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
+		</div>
 
-    <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">
-        <view style="margin-right: 24rpx;" @click="searchFlag()">
-          <view v-if="search">取消</view>
-          <u-icon v-if="!search" size="44rpx" name="search"></u-icon>
-        </view>
-      </view>
-    </u-navbar>
-    <!-- 顶部栏 -->
-
-    <!-- 商品栏 -->
-    <div class="swiper">
-
-      <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>
+	</view>
 </template>
 
 <script>
-import * as API_Promotions from "@/api/promotions";
-import * as API_Goods from "@/api/goods";
-export default {
-  components: {},
-  data() {
-    return {
-      status: "loadmore",
-      is_empty: false,
-      search: false,
-      title: "拼团活动",
-      background: {
-        backgroundColor: "#fff",
-      },
-      empty: false,
-      params: {
-        pageNumber: 1,
-        pageSize: 10,
-        categoryPath: "",
-        goodsName: "",
-      },
-      groupBuy: [],
-    };
-  },
-  mounted() {},
-  watch: {
-    search(val) {
-      val ? (this.title = "") : (this.title = "拼团活动");
-    },
-  },
-  onReachBottom() {
-    this.loadMore();
-  },
-  // 点击搜索按钮
-  onNavigationBarButtonTap(e) {
-    this.popupFlag = !this.popupFlag;
-  },
-  async onLoad() {
-    this.GET_AssembleGoods();
-  },
+	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: {
+			goodsTemplate
+		},
+		data() {
+			return {
+				is_empty: false,
+				search: false,
+				title: "拼团活动",
 
-  methods: {
-    loadMore() {
-      this.params.pageNumber++;
-      this.GET_AssembleGoods();
-    },
-    searchFlag() {
-      this.search = !this.search;
-    },
+				empty: false,
+				params: {
+					pageNumber: 1,
+					pageSize: 10,
+					categoryPath: "",
+					goodsName: "",
+				},
+				goodsList: [],
+			};
+		},
+		mounted() {},
+		watch: {
+			search(val) {
+				val ? (this.title = "") : (this.title = "拼团活动");
+			},
+		},
+		onReachBottom() {
+			this.loadMore();
+		},
+		// 点击搜索按钮
+		onNavigationBarButtonTap(e) {
+			this.popupFlag = !this.popupFlag;
+		},
+		async onLoad() {
+			this.GET_AssembleGoods();
+		},
 
-    toHref(goods) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
-      });
-    },
-    searchFun() {
-      this.groupBuy = [];
-      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;
+		methods: {
+			loadMore() {
+				this.params.pageNumber++;
+				this.GET_AssembleGoods();
+			},
+			searchFlag() {
+				this.search = !this.search;
+			},
 
-      API_Promotions.getAssembleList(params)
-        .then((response) => {
-          const data = response.data.result.records;
+			toHref(goods) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
+				});
+			},
+			searchFun() {
+				this.goodsList = [];
+				this.GET_AssembleGoods();
+			},
+			// 请求拼团数据
+			GET_AssembleGoods() {
 
-          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 || []));
-          }
-        })
-        .catch(() => {});
-    },
-  },
-};
+				const params = JSON.parse(JSON.stringify(this.params));
+				if (params.category_id === 0) delete params.category_id;
+
+				API_Promotions.getAssembleList(params)
+					.then((response) => {
+						const data = response.data.result.records;
+
+						if (!data || !data.length) {
+							this.is_empty = true;
+
+						} else {
+							if (data.length <= this.params.pageSize) {
+
+							} else {
+
+							}
+							this.is_empty = false;
+							this.goodsList.push(...(data || []));
+						}
+					})
+					.catch(() => {});
+			},
+		},
+	};
 </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>
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index 59187b1..59ddfd6 100644
--- a/pages/promotion/point/pointList.vue
+++ b/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">
-                  {{ item.points }}积分
+                <view class="index-item-price flex flex-a-c flex-j-sb">
+                  <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>
diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue
index 8c88b9e..d70fdd3 100644
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="sale">
-		<view class="sale-head">
-			<image src="@/pages/promotion/static/head-sample.png"></image>
+		<u-navbar title='限时抢购'></u-navbar>
+		<view class="header-wraper">
+				<image mode="widthFix" src="/static/seckill.png"></image>
 		</view>
 		<scroll-view scroll-x>
 			<view class="index-navs">
@@ -14,10 +15,7 @@
 					</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">
 			<goodsTemplate :res="goodsList" />
@@ -39,7 +37,7 @@
 		getSeckillTimeGoods
 	} from "@/api/promotions.js";
 	import Foundation from "@/utils/Foundation.js";
-	import goodsTemplate from '@/components/m-goods-list/seckill.vue'
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
 		components: {
 			goodsTemplate
@@ -184,10 +182,15 @@
 		}
 	}
 
-	.sale-head {
-		image {
-			width: 100%;
-			height: 280rpx;
+	.header-wraper {
+		background: url('/static/bg.png');
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 300rpx;
+			height: 100rpx;
 		}
 	}
 
@@ -195,22 +198,8 @@
 		padding-top: 20rpx;
 	}
 
-	.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;
@@ -241,17 +230,19 @@
 		height: 115rpx;
 		line-height: 1em;
 		position: relative;
+		font-size: 32rpx;
+		font-weight: bold;
 
 		&-active {
-			background-image: url(/static/seckill/active.png);
-			background-size: 100% 115rpx;
-			background-repeat: no-repeat;
-			color: #ffffff;
+			color: $main-color;
 			position: relative;
 			z-index: 30;
-
 			.index-nav-desc {
-				color: #ffffff;
+				color: #fff;
+				font-weight: bold;
+				background: $main-color;
+				padding: 6rpx 16rpx;
+				border-radius: 50px;
 			}
 		}
 	}
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index c4b234f..0842a42 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -111,8 +111,8 @@
                 预估到手价 ￥<span>{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
                 <span>.{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
               </div>
-							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
-								{{skuItem.errorMessage}}
+							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
+								{{skuItem.errorMessage}}
 							</div>
             </view>
           </view>
diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index c511558..5bcc728 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -24,7 +24,9 @@
             {{ item.title }}
           </div>
           <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
+            <div class="goods-price">	¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
+										formatPrice(item.price )[1]
+									}}</div>
           </div>
         </div>
       </div>
@@ -56,6 +58,13 @@ export default {
   },
   mounted() {},
   methods: {
+    	// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
     handleClick(item) {
       uni.navigateTo({
         url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
@@ -163,13 +172,11 @@ $w_94: 94%;
     > .goods-price {
       line-height: 2;
       color: $main-color;
+      >span{
+        font-size: 42rpx;
+      }
     }
   }
 }
 
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>
diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue
index aae0ad5..39c7e6d 100644
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -129,10 +129,10 @@ export default {
         }
       });
     },
-    // 是否有网络链接
-    isConnected(val) {
-      val ? this.init() : "";
-    },
+		// 是否有网络链接
+		isConnected(val){
+			val ? this.init() : ''
+		},
 
     /**
      * TODO 扫码功能后续还会后续增加
diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js
index cfa6979..b980d1c 100644
--- a/plugins/APPUpdate/index.js
+++ b/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.version.replace(/\./g, "") ) {
+
+      if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) {
         return false;
       }
 
diff --git a/static/bg.png b/static/bg.png
new file mode 100644
index 0000000..d5c2b11
Binary files /dev/null and b/static/bg.png differ
diff --git a/static/bg1.png b/static/bg1.png
new file mode 100644
index 0000000..f2e5b72
Binary files /dev/null and b/static/bg1.png differ
diff --git a/static/join-buy.png b/static/join-buy.png
new file mode 100644
index 0000000..5928d53
Binary files /dev/null and b/static/join-buy.png differ
diff --git a/static/seckill.png b/static/seckill.png
new file mode 100644
index 0000000..795cb1c
Binary files /dev/null and b/static/seckill.png differ
diff --git a/static/seckill/active.png b/static/seckill/active.png
deleted file mode 100644
index f5293e0..0000000
Binary files a/static/seckill/active.png and /dev/null differ
diff --git a/uni.scss b/uni.scss
index 20c6fca..c8a7b34 100644
--- a/uni.scss
+++ b/uni.scss
@@ -149,6 +149,9 @@ $font-weight: 400;
 }
 .flex-a-c{
 	align-items: center;
+}
+.flex-j-sb{
+	justify-content: space-between;
 }
 .relative {
 	position: relative;
diff --git a/utils/filters.js b/utils/filters.js
index 312ae57..9635a05 100644
--- a/utils/filters.js
+++ b/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
@@ -99,12 +101,46 @@ 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
+	}
+}
+
+
+
+/**
+ * 获取用户信息并重新添加到缓存里面
+ */
+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 +149,7 @@ export function isLogin(val) {
 
 export function forceLogin() {
   let userInfo = storage.getUserInfo();
-  if (!userInfo.id) {
+  if (!userInfo ||  !userInfo.id) {
     // #ifdef MP-WEIXIN
 
     uni.navigateTo({
diff --git a/utils/request.js b/utils/request.js
index 8cc8969..98c0d8a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,7 +1,11 @@
 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";
 
@@ -11,90 +15,93 @@ import uuid from "@/utils/uuid.modified.js";
 let isNavigateTo = false
 
 function cleanStorage() {
-  uni.showToast({
-    title: "你的登录状态已过期，请重新登录",
-    icon: "none",
-    duration: 1500,
-  });
-  if (uni.showLoading()) {
-    uni.hideLoading();
-  }
+	uni.showToast({
+		title: "你的登录状态已过期，请重新登录",
+		icon: "none",
+		duration: 1500,
+	});
+	if (uni.showLoading()) {
+		uni.hideLoading();
+	}
 
-  storage.setHasLogin(false);
-  storage.setAccessToken("");
-  storage.setRefreshToken("");
-  console.log("清空token");
-  storage.setUuid("");
-  storage.setUserInfo({});
+	storage.setHasLogin(false);
+	storage.setAccessToken("");
+	storage.setRefreshToken("");
+	console.log("清空token");
+	storage.setUuid("");
+	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
-  }
+	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();
 
 
 http.setConfig((config) => {
-  // 没有uuid创建
-  if (!storage.getUuid()) {
-    storage.setUuid(uuid.v1());
-  }
+	// 没有uuid创建
+	if (!storage.getUuid()) {
+		storage.setUuid(uuid.v1());
+	}
 
-  /* 设置全局配置 */
-  config.baseURL = api.buyer;
-  config.header = {
-    ...config.header,
-  };
-  config.validateStatus = (statusCode) => {
-    // 不论什么状态,统一在正确中处理
-    return true;
-  };
-  return config;
+	/* 设置全局配置 */
+	config.baseURL = api.buyer;
+	config.header = {
+		...config.header,
+	};
+	config.validateStatus = (statusCode) => {
+		// 不论什么状态,统一在正确中处理
+		return true;
+	};
+	return config;
 });
 
 http.interceptors.request.use(
-  (config) => {
-    /* 请求之前拦截器。可以使用async await 做异步操作 */
-    let accessToken = storage.getAccessToken();
-    if (accessToken) {
-      const nonce = Foundation.randomString(6);
-      const timestamp = parseInt(new Date().getTime() / 1000);
-      const sign = md5(nonce + timestamp + accessToken);
-      const _params = {
-        nonce,
-        timestamp,
-        sign,
-      };
-      let params = config.params || {};
-      params = { ...params, ..._params };
+	(config) => {
+		/* 请求之前拦截器。可以使用async await 做异步操作 */
+		let accessToken = storage.getAccessToken();
+		if (accessToken) {
+			const nonce = Foundation.randomString(6);
+			const timestamp = parseInt(new Date().getTime() / 1000);
+			const sign = md5(nonce + timestamp + accessToken);
+			const _params = {
+				nonce,
+				timestamp,
+				sign,
+			};
+			let params = config.params || {};
+			params = {
+				...params,
+				..._params
+			};
 
-      config.params = params;
-      config.header.accessToken = accessToken;
+			config.params = params;
+			config.header.accessToken = accessToken;
 
 
-    }
-    config.header = {
-      ...config.header,
-      uuid: storage.getUuid() || uuid.v1(),
-    };
-    return config;
-  },
-  (config) => {
-    return Promise.reject(config);
-  }
+		}
+		config.header = {
+			...config.header,
+			uuid: storage.getUuid() || uuid.v1(),
+		};
+		return config;
+	},
+	(config) => {
+		return Promise.reject(config);
+	}
 );
 
 
@@ -104,90 +111,96 @@ let isRefreshing = false;
 let requests = [];
 // 必须使用异步函数，注意
 http.interceptors.response.use(
-  async (response) => {
-    isNavigateTo = false
-    /* 请求之后拦截器。可以使用async await 做异步操作  */
-    // token存在并且token过期
-    // if (isRefreshing && response.statusCode === 403) {
-    //   cleanStorage();
-    //   isRefreshing = false;
-    // }
-    console.log(response)
-    let token = storage.getAccessToken();
-    if (
-      (token && response.statusCode === 403) ||
-      response.data.status === 403
-    ) {
-      if (!isRefreshing) {
-		console.log('旧token',token) 
-        isRefreshing = true;
-				storage.setAccessToken('')
-		let oldRefreshToken = storage.getRefreshToken();
-        //调用刷新token的接口
-        return refreshTokenFn(oldRefreshToken)
-          .then((res) => {
-            let { accessToken, refreshToken } = res.data.result;
-            storage.setAccessToken(accessToken);
-            storage.setRefreshToken(refreshToken);
+	async (response) => {
+			isNavigateTo = false
+			/* 请求之后拦截器。可以使用async await 做异步操作  */
+			// token存在并且token过期
+			// if (isRefreshing && response.statusCode === 403) {
+			//   cleanStorage();
+			//   isRefreshing = false;
+			// }
 
-            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);
-          })
-          .finally(() => {
-            isRefreshing = false;
-          });
-      } else {
-        // 返回未执行 resolve 的 Promise
-        return new Promise((resolve) => {
-          // 用函数形式将 resolve 存入，等待刷新后再执行
-          requests.push((token) => {
-            response.header.accessToken = `${token}`;
-            resolve(http.request(response.config));
-          });
-        });
-      }
-      // 如果当前返回没登录
-    } else if (
-      (!token && !storage.getRefreshToken() && response.statusCode === 403) ||
-      response.data.code === 403
-    ) {
-	  console.log('没有token 以及刷新token 内容',token,storage.getRefreshToken())
-      cleanStorage();
+			let token = storage.getAccessToken();
+			if (
+				(token && response.statusCode === 403) ||
+				response.data.status === 403
+			) {
+				if (!isRefreshing) {
+					console.log('旧token', token)
+					isRefreshing = true;
+					storage.setAccessToken('')
+					let oldRefreshToken = storage.getRefreshToken();
+					//调用刷新token的接口
+					return refreshTokenFn(oldRefreshToken)
+						.then((res) => {
+							let {
+								accessToken,
+								refreshToken
+							} = res.data.result;
+							storage.setAccessToken(accessToken);
+							storage.setRefreshToken(refreshToken);
 
-      // 如果当前状态码为正常但是success为不正常时
-    } else if (
-      (response.statusCode == 200 && !response.data.success) ||
-      response.statusCode == 400
-    ) {
-      if (response.data.message) {
-        uni.showToast({
-          title: response.data.message,
-          icon: "none",
-          duration: 1500,
-        });
-      }
-    }
-    return response;
-  },
-  (error) => {
-    return error;
-  }
+							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);
+						})
+						.finally(() => {
+							isRefreshing = false;
+						});
+				} else {
+					// 返回未执行 resolve 的 Promise
+					return new Promise((resolve) => {
+						// 用函数形式将 resolve 存入，等待刷新后再执行
+						requests.push((token) => {
+							response.header.accessToken = `${token}`;
+							resolve(http.request(response.config));
+						});
+					});
+				}
+
+				// 如果当前返回没登录
+			} else if (
+				(!token && !storage.getRefreshToken() && response.statusCode === 403) ||
+				response.data.code === 403
+			) {
+				console.log('没有token 以及刷新token 内容', token, storage.getRefreshToken())
+				cleanStorage();
+
+				// 如果当前状态码为正常但是success为不正常时
+			} else if (
+				(response.statusCode == 200 && !response.data.success) ||
+				response.statusCode == 400
+			) {
+				if (response.data.message) {
+					uni.showToast({
+						title: response.data.message,
+						icon: "none",
+						duration: 1500,
+					});
+				}
+			}
+			return response;
+		},
+		(error) => {
+			return error;
+		}
 );
 
-export { http };
+export {
+	http
+};
 
 export const Method = {
-  GET: "GET",
-  POST: "POST",
-  PUT: "PUT",
-  DELETE: "DELETE",
+	GET: "GET",
+	POST: "POST",
+	PUT: "PUT",
+	DELETE: "DELETE",
 };