From 42d20f0fd9c3bbeb2aec844cfd67d9ed233a22ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 30 May 2022 16:37:50 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=E6=A0=BC=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E6=97=A7=E7=89=88=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-goods-list/README.md             |  10 +
 components/m-goods-list/list.vue              | 293 ++++++++++++++++++
 components/m-goods-recommend/index.vue        |  21 +-
 pages/navigation/search/search.scss           | 180 -----------
 pages/navigation/search/searchPage.vue        |  96 +-----
 .../product/goods/-goods-recommend.vue        | 161 +---------
 pages/product/shopPage.vue                    |  64 +---
 pages/product/shopPageGoods.vue               | 204 +++++-------
 8 files changed, 402 insertions(+), 627 deletions(-)
 create mode 100644 components/m-goods-list/README.md
 create mode 100644 components/m-goods-list/list.vue

diff --git a/components/m-goods-list/README.md b/components/m-goods-list/README.md
new file mode 100644
index 0000000..74fa4c2
--- /dev/null
+++ b/components/m-goods-list/README.md
@@ -0,0 +1,10 @@
+## 商品列表展示
+
+### OBJECT 参数说明
+
+| 属性        | 说明                                                       | 类型    | 必填 |
+| ----------- | ---------------------------------------------------------- | ------- | ---- |
+| `res`       | 显示数据                                                   | Array   | 是   |
+| `type`      | 商品展示类型 oneColumns twoColumns  ，默认展示一行两列商品 | String  | 否   |
+| `storeName` | 是否展示店铺名称，默认展示                                 | Boolean | 否   |
+
diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
new file mode 100644
index 0000000..55446b7
--- /dev/null
+++ b/components/m-goods-list/list.vue
@@ -0,0 +1,293 @@
+<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" @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 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>
+	export default {
+		data() {
+			return {}
+		},
+		props: {
+			// 遍历的数据
+			res: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			// 一行两列还是一行一列显示
+			type: {
+				type: String,
+				default: 'twoColumns',
+				validator() {
+					return ['twoColumns', 'oneColumns']
+				}
+			},
+			storeName: {
+				type: Boolean,
+				default: true
+			}
+
+		},
+		methods: {
+			// 格式化金钱  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-recommend/index.vue b/components/m-goods-recommend/index.vue
index dbd5815..8f60967 100644
--- a/components/m-goods-recommend/index.vue
+++ b/components/m-goods-recommend/index.vue
@@ -1,27 +1,11 @@
 <template>
   <div>
     <div class="goods-recommend">{{title ? `--${title}-- `:''}}</div>
-    <div class="goods-list">
-      <div @click="handleClick(item)" class="goods-item" v-for="(item, item_index) in goodsList" :key="item_index">
-        <div class="goods-img">
-          <u-image :src="item.content.thumbnail" mode="aspectFill" height="350rpx" width="100%">
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-        </div>
-        <div class="goods-desc">
-          <div class="goods-title">
-            {{ item.content.goodsName }}
-          </div>
-          <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.content.price | unitPrice }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
+		 <goodsTemplate :res='goodsList' />
   </div>
 </template>
-
 <script>
+	import goodsTemplate from '@/components/m-goods-list/list'
 import { getGoodsList } from "@/api/goods.js";
 export default {
   data() {
@@ -50,6 +34,7 @@ export default {
       default: "",
     },
   },
+	components:{goodsTemplate},
   mounted() {
     this.initGoods();
   },
diff --git a/pages/navigation/search/search.scss b/pages/navigation/search/search.scss
index a3efed1..6985233 100644
--- a/pages/navigation/search/search.scss
+++ b/pages/navigation/search/search.scss
@@ -22,19 +22,6 @@
   }
 }
 
-.promotion {
-  margin-top: 4rpx;
-  display: flex;
-  div {
-    span {
-      font-size: 24rpx;
-      color: $light-color;
-      margin-right: 10rpx;
-      padding: 0 4rpx;
-      border-radius: 2rpx;
-    }
-  }
-}
 .status_bar {
   height: var(--status-bar-height);
   background: #fff !important;
@@ -437,180 +424,13 @@ view {
       margin-left: 4rpx;
       font-size: 26rpx;
       color: #888;
-
-    
     }
 
     .xia {
       transform: scaleY(-1);
     }
   }
-
-  .cate-item {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    width: 80rpx;
-    position: relative;
-    font-size: 44rpx;
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      border-left: 1px solid #ddd;
-      width: 0;
-      height: 36rpx;
-    }
-  }
 }
-
-/* 分类 */
-.cate-mask {
-  position: fixed;
-  left: 0;
-  top: var(--window-top);
-  bottom: 0;
-  width: 100%;
-  background: rgba(0, 0, 0, 0);
-  z-index: 95;
-  transition: 0.3s;
-
-  .cate-content {
-    width: 630rpx;
-    height: 100%;
-    background: #fff;
-    float: right;
-    transform: translateX(100%);
-    transition: 0.3s;
-  }
-
-  &.none {
-    display: none;
-  }
-
-  &.show {
-    background: rgba(0, 0, 0, 0.4);
-
-    .cate-content {
-      transform: translateX(0);
-    }
-  }
-}
-
-.cate-list {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-
-  .cate-item {
-    display: flex;
-    align-items: center;
-    height: 90rpx;
-    padding-left: 30rpx;
-    font-size: 28rpx;
-    color: #555;
-    position: relative;
-  }
-
-  .two {
-    height: 64rpx;
-    color: #303133;
-    font-size: 30rpx;
-    background: #f8f8f8;
-  }
-}
-.price-box {
-  margin-top: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-right: 10rpx;
-  font-size: 24rpx;
-  color: $font-color-light;
-}
-
-.price {
-  font-size: 26rpx;
-  line-height: 1;
-  color: $main-color;
-  font-weight: bold;
-  /deep/ span:nth-of-type(1) {
-    font-size: 38rpx;
-  }
-}
-/* 商品列表 */
-.goods-list {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 10rpx 20rpx 284rpx;
-
-
-  // background: #fff;
-  width: 100%;
-  .goods-item {
-    background-color: #ffffff;
-    display: flex;
-    border-radius: 16rpx;
-    flex-direction: column;
-    width: calc(50% - 30rpx);
-    margin-bottom: 20rpx;
-    padding-bottom: 20rpx;
-
-    &:nth-child(2n + 1) {
-      margin-right: 20rpx;
-    }
-
-    .goods-detail {
-      margin: 0 20rpx;
-    }
-  }
-
-  .image-wrapper {
-    width: 100%;
-    height: 330rpx;
-    border-radius: 16rpx 16rpx 0 0;
-    overflow: hidden;
-    padding: 0;
-    image {
-      width: 100%;
-      height: 100%;
-      opacity: 1;
-      border-radius: 16rpx 16rpx 0 0;
-    }
-  }
-
-  .title {
-    font-size: $font-base;
-    color: $font-color-dark;
-    line-height: 1.5;
-    height: 84rpx;
-    padding: 10rpx 0 0;
-    display: -webkit-box;
-
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    overflow: hidden;
-  }
-
-  .count-config,
-  .store-seller-name {
-    font-size: $font-sm;
-  }
-
-  .text-hidden {
-    
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
 .status_bar {
   height: var(--status-bar-height);
   width: 100%;
diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue
index 5aa2f2a..5cbc9f6 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -82,50 +82,7 @@
       <div v-if="isSWitch">
         <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250"
           @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
-          <div class="goods-class">
-            <div v-for="(item, index) in goodsList" :key="index" class="goods-row">
-              <div class="flex goods-col">
-                <div class="goods-img" @click="navigateToDetailPage(item)">
-                  <u-image width="230rpx" height="230rpx" :src="item.content.thumbnail">
-                    <u-loading slot="loading"></u-loading>
-                  </u-image>
-                </div>
-                <div class="goods-detail">
-                  <div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
-                  <view class="price-box" @click="navigateToDetailPage(item)">
-                    <div class="price" v-if="item.content.price!=undefined">
-                      ¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
-                      formatPrice(item.content.price )[1]
-                    }}
-                    </div>
-                  </view>
-                  <div class="promotion" @click="navigateToDetailPage(item)">
-                    <div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
-                      <span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
-                      <span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
-                      <span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
-                    </div>
-                  </div>
-                  <div style="overflow: hidden" @click="navigateToDetailPage(item)" class="count-config">
-                    <span style="float: left; font-size: 22rpx">已售 {{ item.content.buyCount || '0' }}</span>
-                    <span style="float: right; font-size: 22rpx">{{ item.content.commentNum || '0' }}条评论</span>
-                  </div>
-                  <div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
-                    <div class="text-hidden">
-                      <u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated" text="自营"
-                        type="error" />
-                      <span class="line1-store-name">{{ item.content.storeName }}</span>
-                      <span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon></span>
-                    </div>
-                    <span>
-                      <u-icon name="arrow-right" color="#c5c5c5"></u-icon>
-                    </span>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-          </div>
+          <goodsList :res='goodsList' type='oneColumns' />
           <uni-load-more :status="loadingType" @loadmore="loadmore()"></uni-load-more>
         </scroll-view>
       </div>
@@ -136,49 +93,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">
-            <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-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" @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>
+					<goodsList :res='goodsList' />
           <uni-load-more :status="loadingType"></uni-load-more>
         </scroll-view>
       </div>
@@ -277,7 +192,7 @@
 
 <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";
@@ -343,6 +258,7 @@ export default {
       routerVal: "",
     };
   },
+	
   onPageScroll(e) {
     console.log(e);
     this.scrollTop = e.scrollTop;
@@ -375,6 +291,7 @@ export default {
   },
   components: {
     mSearch,
+		goodsList
   },
   watch: {
     /**
@@ -766,6 +683,9 @@ export default {
     doSearchSwitch() {
       this.isSWitch = !this.isSWitch;
       this.isShowSeachGoods = true;
+			this.params.pageNumber = 1 
+			this.params.pageSize = 10
+			this.loadData("refresh", 1);
     },
 
     /**
diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue
index c05de1e..3e3dadc 100644
--- a/pages/product/product/goods/-goods-recommend.vue
+++ b/pages/product/product/goods/-goods-recommend.vue
@@ -1,169 +1,20 @@
 <template>
   <view class="recommend-box" >
     <h4 class="goods-recommend-title">宝贝推荐</h4>
-    <view class="like-goods-list">
-      <view class="like-goods-list">
-        <view
-          class="like-goods-item"
-          @click="clickGoods(item)"
-          v-for="(item, index) in res"
-          :key="index"
-        >
-          <u-image
-            :fade="true"
-            duration="450"
-            :lazy-load="true"
-            :src="item.content.thumbnail"
-            width="330rpx"
-            height="330rpx"
-            class="like-goods-uimage"
-          >
-            <u-loading slot="loading"></u-loading>
-          </u-image>
-          <view style="background-color: #ffffff; width: 100%">
-            <view class="name">{{ item.content.goodsName }}</view>
-            <view class="price-sales">
-              <div class="item-price" v-if="item.content.price != undefined">
-                ￥
-                <span>{{ formatPrice(item.content.price)[0] }}</span>
-                .{{formatPrice(item.content.price)[1]}}
-                <!-- <text v-if="item.point != undefined">+{{ item.point }}积分</text> -->
-              </div>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+		<goodsList :res='res' :storeName="false" />
+	 </view>
 </template>
 
-<script>
+<script>
+import goodsList from '@/components/m-goods-list/list.vue'
 export default {
-  props: ["res"],
+  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>
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 07f050c..161bcf6 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -60,18 +60,7 @@
     <!-- 商品 -->
     <div class="contant" 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-image width="100%" height="330rpx" mode="aspectFit" :src="item.content.thumbnail">
-          <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>
+			<goodsTemplate :res="goodsList" :storeName="false" />
     </div>
     <!-- 全部分类 -->
     <div class="category" v-if="current == 1">
@@ -94,7 +83,8 @@
 </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,
   deleteStoreCollection,
@@ -128,7 +118,8 @@ export default {
     current(val) {
       val == 0 ? ()=>{ this.goodsList = []; this.getGoodsData()} : this.getCategoryData();
     },
-  },
+  },
+	components:{goodsTemplate},
 
   /**
    * 加载
@@ -277,15 +268,6 @@ export default {
       }
     },
 
-    /**
-     * 跳转到商品详情
-     */
-    navigateToGoodsDetail(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
-      });
-    },
-
     /**
      *  是否收藏
      */
@@ -404,42 +386,6 @@ export default {
     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;
diff --git a/pages/product/shopPageGoods.vue b/pages/product/shopPageGoods.vue
index 91ec53b..7780148 100644
--- a/pages/product/shopPageGoods.vue
+++ b/pages/product/shopPageGoods.vue
@@ -1,127 +1,77 @@
-<template>
-  <div>
-    <u-navbar :title="title"></u-navbar>
-    <!-- 商品 -->
-    <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)">
-        <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";
-export default {
-  data() {
-    return {
-      title: "",
-      routerVal: "",
-      goodsList: [],
-      params: {
-        pageNumber: 1,
-        pageSize: 10,
-        keyword: "",
-        storeCatId: "",
-        storeId: "",
-      },
-    };
-  },
-  onLoad(options) {
-    this.routerVal = options;
-    this.params.storeId = options.storeId;
-    this.params.storeCatId = options.id;
-    this.title = options.title;
-  },
-  onShow() {
-    this.goodsList =[]
-    this.params.pageNumber = 1;
-    this.getGoodsData();
-  },
-  onReachBottom(){
-    this.params.pageNumber ++;
-    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);
-      if (goodsList.data.success) {
-        this.goodsList.push(...goodsList.data.result.content);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.contant {
-  margin-top: 20rpx;
-  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>
\ No newline at end of file
+<template>
+	<div>
+		<u-navbar :title="title"></u-navbar>
+		<!-- 商品 -->
+		<div class="contant">
+			<view v-if="!goodsList.length" class="empty">暂无商品信息</view>
+			<goodsTemplate :res='goodsList' :storeName='false' />
+		</div>
+	</div>
+
+</template>
+
+<script>
+	import {
+		getGoodsList
+	} from "@/api/goods.js";
+	import goodsTemplate from '@/components/m-goods-list/list'
+	export default {
+		data() {
+			return {
+				title: "",
+				routerVal: "",
+				goodsList: [],
+				params: {
+					pageNumber: 1,
+					pageSize: 10,
+					keyword: "",
+					storeCatId: "",
+					storeId: "",
+				},
+			};
+		},
+		components: {
+			goodsTemplate
+		},
+		onLoad(options) {
+			this.routerVal = options;
+			this.params.storeId = options.storeId;
+			this.params.storeCatId = options.id;
+			this.title = options.title;
+		},
+		onShow() {
+			this.goodsList = []
+			this.params.pageNumber = 1;
+			this.getGoodsData();
+		},
+		onReachBottom() {
+			this.params.pageNumber++;
+			this.getGoodsData();
+		},
+		methods: {
+			async getGoodsData() {
+				// #TODO
+				let goodsList = await getGoodsList(this.params);
+				if (goodsList.data.success) {
+					this.goodsList.push(...goodsList.data.result.content);
+				}
+			},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.contant {
+		margin-top: 20rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
+		>.empty {
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			margin-top: 40rpx;
+		}
+}
+</style>

From ded0ab5381b4b6e947d8cedfee40456bc6e6f26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 31 May 2022 12:06:30 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=AD=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/set/securityCenter/editPassword.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pages/mine/set/securityCenter/editPassword.vue b/pages/mine/set/securityCenter/editPassword.vue
index 7be7247..7da13e0 100644
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -1,12 +1,13 @@
 <template>
   <view class="box">
     <view class="box-tips">
-      <h2>
+      <h2 class='h2'>
         {{verificationTitle[validateFlage==false ? 0 : 1].title}}
       </h2>
       <view class="verification">{{verificationTitle[step].desc}}</view>
     </view>
-    <u-form :model="codeForm" class="form" ref="validateCodeForm">
+		<view class="form">
+			<u-form :model="codeForm"  ref="validateCodeForm">
       <view v-if="!validateFlage">
         <u-form-item label-width="120" label="手机号" prop="mobile">
           <u-input maxlength="11" v-model="codeForm.mobile" placeholder="请输入您的手机号" />
@@ -35,7 +36,8 @@
         <view class="submit" @click="updatePassword">修改密码</view>
       </view>
     </u-form>
-  </view>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -221,8 +223,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import url("../../../passport/login.scss");
-.u-form-item {
+@import url("@/pages/passport/login.scss");
+/deep/ .u-form-item {
   margin: 40rpx 0;
 }
 .sendCode {
@@ -230,6 +232,10 @@ export default {
     display: flex;
   }
 }
+.h2{
+	font-size: 40rpx;
+	font-weight: bold;
+}
 page {
   background: #fff;
 }
@@ -248,4 +254,5 @@ page {
   color: #999;
   margin-top: 10rpx;
 }
+
 </style>
\ No newline at end of file

From 3c9f0d3c5c725149f458d21b94922494e21229e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 31 May 2022 15:42:21 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=86=E5=8A=B5?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E9=80=BB=E8=BE=91=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/coupon/couponCenter.vue | 549 ++++++++++++++---------------
 uni.scss                           |   8 +
 2 files changed, 280 insertions(+), 277 deletions(-)

diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index 0a48d22..c7f9457 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -1,299 +1,294 @@
 <template>
-  <view class="coupon-center">
-    <swiper class="swiper-box">
-      <swiper-item class="swiper-item">
-        <scroll-view class="scroll-v" enableBackToTop="true" scroll-y @scrolltolower="loadMore">
-          <u-empty mode="coupon" text="没有优惠券了" v-if="whetherEmpty"></u-empty>
-          <view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
-            <view class="left">
-              <view class="wave-line">
-                <view class="wave" v-for="(item, index) in 12" :key="index"></view>
-              </view>
-              <view class="message">
-                <view>
-                  <!--判断当前优惠券类型  couponType  PRICE || DISCOUNT -->
-                  <span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
-                  <span v-else>{{ item.price }}元</span>
-                </view>
-                <view>满{{ item.consumeThreshold | unitPrice }}元可用</view>
-              </view>
-              <view class="circle circle-top"></view>
-              <view class="circle circle-bottom"></view>
-            </view>
-            <view class="right">
-              <view>
-                <!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
-                <view v-if="item.scopeType">
-                  <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
-                  <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
-                  <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
-                </view>
-                <view v-if="item.endTime">有效期至：{{  item.endTime.split(" ")[0] }}</view>
-              </view>
-              <view class="receive" @click="receive(item)">
-                <text>点击</text><br />
-                <text>领取</text>
-              </view>
-              <view class="bg-quan"> 券 </view>
-            </view>
-          </view>
-          <uni-load-more :status="loadStatus"></uni-load-more>
-        </scroll-view>
-      </swiper-item>
-    </swiper>
-  </view>
+	<view class="coupon-center">
+		<div class="swiper-box">
+			<div class="swiper-item">
+				<div class="scroll-v" enableBackToTop="true" scroll-y>
+					<u-empty mode="coupon" style='margin-top: 20%;' text="没有优惠券了" v-if="whetherEmpty"></u-empty>
+					<view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
+						<view class="left">
+							<view class="wave-line">
+								<view class="wave" v-for="(item, index) in 12" :key="index"></view>
+							</view>
+							<view class="message">
+								<view>
+									<!--判断当前优惠券类型  couponType  PRICE || DISCOUNT -->
+									<span v-if="item.couponType == 'DISCOUNT'">{{ item.couponDiscount }}折</span>
+									<span v-else>{{ item.price }}元</span>
+								</view>
+								<view>满{{ item.consumeThreshold | unitPrice }}元可用</view>
+							</view>
+							<view class="circle circle-top"></view>
+							<view class="circle circle-bottom"></view>
+						</view>
+						<view class="right">
+							<view>
+								<!-- 根据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 == 'PORTION_CATEGORY'">仅限品类</span>
+									<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
+									</view>
+								</view>
+								<view v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
+							</view>
+							<view class="receive" @click="receive(item)">
+								<text>点击</text><br />
+								<text>领取</text>
+							</view>
+							<view class="bg-quan"> 券 </view>
+						</view>
+					</view>
+
+				</div>
+			</div>
+		</div>
+	</view>
 </template>
 
 <script>
-import { receiveCoupons } from "@/api/members.js";
-import { getAllCoupons } from "@/api/promotions.js";
-export default {
-  data() {
-    return {
-      loadStatus: "more", //下拉状态
-      whetherEmpty: false, //是否为空
-      couponList: [], // 优惠券列表
-      params: {
-        pageNumber: 1,
-        pageSize: 10,
-      },
-      storeId: "", //店铺 id
-    };
-  },
-  onLoad(option) {
-    this.storeId = option.storeId;
-    this.getCoupon();
-  },
-  onPullDownRefresh() {
-    //下拉刷新
-    this.params.pageNumber = 1;
-    this.couponList = [];
-    this.getCoupon();
-  },
-  methods: {
-    /**
-     * 获取当前优惠券
-     */
-    getCoupon() {
-      uni.showLoading({
-        title: "加载中",
-      });
-      let submitData = { ...this.params };
-      // 判断当前是否有店铺
-      this.storeId ? (submitData = { ...this.params, storeId: this.storeId }): "",
-        getAllCoupons(submitData)
-          .then((res) => {
-            uni.hideLoading();
-            uni.stopPullDownRefresh();
-            if (res.data.code == 200) {
-              // 如果请求成功，展示数据并进行展示
-              let data = res.data.result;
-              if (data.total == 0) {
-                // 当本次请求数据为空展示空信息
-                this.whetherEmpty = true;
-              } else {
-                this.couponList.push(...data.records);
-                this.loadStatus = "noMore";
-              }
-            }
-          })
-          .catch((err) => {
-            uni.hideLoading();
-          });
-    },
-    /**
-     * 领取优惠券
-     */
-    receive(item) {
-      receiveCoupons(item.id).then((res) => {
-        if (res.data.code == 200) {
-          uni.showToast({
-            title: "领取成功",
-            icon: "none",
-          });
-        } else {
-          uni.showToast({
-            title: res.data.message,
-            icon: "none",
-          });
-        }
-      });
-    },
-    /**
-     * 加载更多
-     */
-    loadMore() {
-      if (this.loadStatus != "noMore") {
-        this.params.pageNumber++;
-        this.getAllCoupons();
-      }
-    },
-  },
-  onNavigationBarButtonTap(e) {
-    uni.navigateTo({
-      url: "/pages/cart/coupon/couponIntro",
-    });
-  },
-};
+	import {
+		receiveCoupons
+	} from "@/api/members.js";
+	import {
+		getAllCoupons
+	} from "@/api/promotions.js";
+	export default {
+		data() {
+			return {
+				loadStatus: "more", //下拉状态
+				whetherEmpty: false, //是否为空
+				couponList: [], // 优惠券列表
+				params: {
+					pageNumber: 1,
+					pageSize: 10,
+				},
+				storeId: "", //店铺 id,
+				couponData: ""
+			};
+		},
+		onLoad(option) {
+			this.storeId = option.storeId;
+			this.getCoupon();
+		},
+		onReachBottom() {
+
+			this.loadMore()
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			this.params.pageNumber = 1;
+			this.couponList = [];
+			this.getCoupon();
+		},
+		methods: {
+			/**
+			 * 获取当前优惠券
+			 */
+			getCoupon() {
+				uni.showLoading({
+					title: "加载中",
+				});
+				let submitData = {
+					...this.params
+				};
+				// 判断当前是否有店铺
+				this.storeId ? (submitData = {
+						...this.params,
+						storeId: this.storeId
+					}) : "",
+					getAllCoupons(submitData)
+					.then((res) => {
+						uni.hideLoading();
+						uni.stopPullDownRefresh();
+						if (res.data.code == 200) {
+							// 如果请求成功，展示数据并进行展示
+							this.couponData = res.data.result
+							if (this.couponData.total == 0) {
+								// 当本次请求数据为空展示空信息
+								this.whetherEmpty = true;
+							} else {
+								this.couponList.push(...this.couponData.records);
+								this.loadStatus = "noMore";
+							}
+						}
+					})
+					.catch((err) => {
+						uni.hideLoading();
+					});
+			},
+			/**
+			 * 领取优惠券
+			 */
+			receive(item) {
+				receiveCoupons(item.id).then((res) => {
+					if (res.data.code == 200) {
+						uni.showToast({
+							title: "领取成功",
+							icon: "none",
+						});
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: "none",
+						});
+					}
+				});
+			},
+			/**
+			 * 加载更多
+			 */
+			loadMore() {
+				if (this.couponData.total > this.params.pageNumber * this.params.pageSize) {
+					this.params.pageNumber++;
+					this.getCoupon();
+				}
+			},
+		},
+		onNavigationBarButtonTap(e) {
+			uni.navigateTo({
+				url: "/pages/cart/coupon/couponIntro",
+			});
+		},
+	};
 </script>
 <style>
-page {
-  height: 100%;
-}
+	page {
+		height: 100%;
+	}
 </style>
 <style lang="scss" scoped>
-.coupon-center {
-  height: 100%;
+	.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;
+		.swiper-box {
+			.coupon-item {
+				display: flex;
+				align-items: center;
+				height: 220rpx;
+				margin: 20rpx;
 
-    .tab-item {
-      width: 160rpx;
-      height: 80rpx;
-      line-height: 60rpx;
-      text-align: center;
-      display: inline-block;
-    }
+				.left {
+					height: 100%;
+					width: 260rpx;
+					background-color: $light-color;
+					position: relative;
 
-    .active {
-      border-bottom: 2px solid #ffffff;
-      broder-width: 60rpx;
-      font-size: 30rpx;
-      font-weight: 700;
-      padding-bottom: 4rpx;
-    }
-  }
+					.message {
+						color: $font-color-white;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						flex-direction: column;
+						margin-top: 40rpx;
 
-  .swiper-box {
-    height: 100%;
+						view:nth-child(1) {
+							font-weight: bold;
+							font-size: 60rpx;
+						}
 
-    .scroll-v {
-      height: 100%;
-    }
+						view:nth-child(2) {
+							font-size: $font-sm;
+						}
+					}
 
-    .coupon-item {
-      display: flex;
-      align-items: center;
-      height: 220rpx;
-      margin: 20rpx;
+					.wave-line {
+						height: 220rpx;
+						width: 8rpx;
+						position: absolute;
+						top: 0;
+						left: 0;
+						background-color: $light-color;
+						overflow: hidden;
 
-      .left {
-        height: 100%;
-        width: 260rpx;
-        background-color: $light-color;
-        position: relative;
-        .message {
-          color: $font-color-white;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          flex-direction: column;
-          margin-top: 40rpx;
+						.wave {
+							width: 8rpx;
+							height: 16rpx;
+							background-color: #ffffff;
+							border-radius: 0 16rpx 16rpx 0;
+							margin-top: 4rpx;
+						}
+					}
 
-          view:nth-child(1) {
-            font-weight: bold;
-            font-size: 60rpx;
-          }
+					.circle {
+						width: 40rpx;
+						height: 40rpx;
+						background-color: $bg-color;
+						position: absolute;
+						border-radius: 50%;
+						z-index: 111;
+					}
 
-          view:nth-child(2) {
-            font-size: $font-sm;
-          }
-        }
+					.circle-top {
+						top: -20rpx;
+						right: -20rpx;
+					}
 
-        .wave-line {
-          height: 220rpx;
-          width: 8rpx;
-          position: absolute;
-          top: 0;
-          left: 0;
-          background-color: $light-color;
-          overflow: hidden;
+					.circle-bottom {
+						bottom: -20rpx;
+						right: -20rpx;
+					}
+				}
 
-          .wave {
-            width: 8rpx;
-            height: 16rpx;
-            background-color: #ffffff;
-            border-radius: 0 16rpx 16rpx 0;
-            margin-top: 4rpx;
-          }
-        }
-        .circle {
-          width: 40rpx;
-          height: 40rpx;
-          background-color: $bg-color;
-          position: absolute;
-          border-radius: 50%;
-          z-index: 111;
-        }
-        .circle-top {
-          top: -20rpx;
-          right: -20rpx;
-        }
-        .circle-bottom {
-          bottom: -20rpx;
-          right: -20rpx;
-        }
-      }
+				.right {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					width: 450rpx;
+					font-size: $font-sm;
+					height: 100%;
+					background-color: #ffffff;
+					overflow: hidden;
+					position: relative;
 
-      .right {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        width: 450rpx;
-        font-size: $font-sm;
-        height: 100%;
-        background-color: #ffffff;
-        overflow: hidden;
-        position: relative;
-        > view:nth-child(1) {
-          color: #666666;
-          margin-left: 20rpx;
-          line-height: 3em;
-          > view:nth-child(1) {
-            color: #ff6262;
-            font-size: 30rpx;
-          }
-        }
+					>view:nth-child(1) {
+						color: #666666;
+						margin-left: 20rpx;
+						display: flex;
+						height: 100%;
+						flex-direction: column;
+						justify-content: space-around;
 
-        .receive {
-          color: #ffffff;
-          background-color: $main-color;
-          border-radius: 50%;
-          width: 86rpx;
-          height: 86rpx;
-          text-align: center;
-          margin-right: 30rpx;
-          vertical-align: middle;
-          padding-top: 8rpx;
-          position: relative;
-          z-index: 2;
-        }
+						>view:nth-child(1) {
+							color: #ff6262;
+							font-size: 30rpx;
+						}
+					}
 
-        .bg-quan {
-          width: 244rpx;
-          height: 244rpx;
-          border: 6rpx solid $main-color;
-          border-radius: 50%;
-          opacity: 0.1;
-          color: $main-color;
-          text-align: center;
-          padding-top: 30rpx;
-          font-size: 130rpx;
-          position: absolute;
-          right: -54rpx;
-          bottom: -60rpx;
-        }
-      }
-    }
-  }
-}
-</style>
+					.receive {
+						color: #ffffff;
+						background-color: $main-color;
+						border-radius: 50%;
+						width: 86rpx;
+						height: 86rpx;
+						text-align: center;
+						margin-right: 30rpx;
+						vertical-align: middle;
+						padding-top: 8rpx;
+						position: relative;
+						z-index: 2;
+					}
+
+					.bg-quan {
+						width: 244rpx;
+						height: 244rpx;
+						border: 6rpx solid $main-color;
+						border-radius: 50%;
+						opacity: 0.1;
+						color: $main-color;
+						text-align: center;
+						padding-top: 30rpx;
+						font-size: 130rpx;
+						position: absolute;
+						right: -54rpx;
+						bottom: -60rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.coupon-title {
+		width: 260rpx;
+
+	}
+</style>
diff --git a/uni.scss b/uni.scss
index 7fe2f11..20c6fca 100644
--- a/uni.scss
+++ b/uni.scss
@@ -168,4 +168,12 @@ $font-weight: 400;
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 2;
 	overflow: hidden;
+}
+
+.wes-3 {
+	/* 适用于webkit内核和移动端 */
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+	overflow: hidden;
 }

From b8fe2aacf132edee4f62a8da3bb2e52d55485b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Jun 2022 10:58:54 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E5=8F=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-buy/goods.vue |  5 ++++-
 pages/product/goods.vue    | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 075b1da..60724a3 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -473,6 +473,8 @@
 		color: #999 !important;
 		font-size: 24rpx;
 		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
 	}
 
 	.goods-header {
@@ -492,7 +494,8 @@
 
 	.goods-price {
 		color: $price-color;
-		line-height: 80rpx;
+		line-height: 80rpx;
+		margin-right: 20rpx;
 		>* {
 			color: $price-color;
 			line-height: 80rpx;
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 0f24955..f6178d7 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -150,9 +150,14 @@
                     </span>
 
                     <span v-else>
-                      <span>¥</span
-                      ><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span
-                      >.{{ formatPrice(goodsDetail.price)[1] }}
+												<!-- 	<span v-if="wholesaleList.length">
+														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}</span>.{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[1] }}
+														~
+														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[0].price)[0] }}</span>.{{ formatPrice(wholesaleList[0].price)[1] }}
+													</span>
+													<span v-else>
+														<span>¥</span><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{ formatPrice(goodsDetail.price)[1] }}
+													</span> -->
                     </span>
                   </view>
                   <view class="-goods-price" v-else>

From ddcd03f0967666c66f48dc37f2a3c4567bbefe93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Jun 2022 11:02:25 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index f6178d7..8e1af3c 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -150,14 +150,14 @@
                     </span>
 
                     <span v-else>
-												<!-- 	<span v-if="wholesaleList.length">
-														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}</span>.{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[1] }}
-														~
-														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[0].price)[0] }}</span>.{{ formatPrice(wholesaleList[0].price)[1] }}
-													</span>
-													<span v-else>
-														<span>¥</span><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{ formatPrice(goodsDetail.price)[1] }}
-													</span> -->
+													<span v-if="wholesaleList.length">
+														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}</span>.{{ formatPrice(wholesaleList[wholesaleList.length-1].price)[1] }}
+														~
+														<span>¥</span><span class="price">{{ formatPrice(wholesaleList[0].price)[0] }}</span>.{{ formatPrice(wholesaleList[0].price)[1] }}
+													</span>
+													<span v-else>
+														<span>¥</span><span class="price">{{ formatPrice(goodsDetail.price)[0] }}</span>.{{ formatPrice(goodsDetail.price)[1] }}
+													</span>
                     </span>
                   </view>
                   <view class="-goods-price" v-else>
@@ -352,7 +352,7 @@
           :isGroup="isGroup"
           :id="productId"
           v-if="goodsDetail.id"
-          :pointDetail="pointDetail"
+          :pointDetail="pointDetail"
 					:wholesaleList="wholesaleList"
           @handleClickSku="selectSku"
           :buyMask="buyMask"
@@ -528,12 +528,12 @@ export default {
       startTimer: false, //未开启 是false
 
       routerVal: "",
-      IMLink: "", // IM地址
+      IMLink: "", // IM地址
 			wholesaleList:[]
     };
   },
 
-  computed: {
+  computed: {
 	// udesk IM 
     IM() {
       return this.IMLink + this.storeDetail.merchantEuid;
@@ -716,21 +716,21 @@ export default {
     },
 
     linkMsgDetail() {
-      // lili 基础客服
-	
-	  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}`,
-		//   });
-		// }
-		  
+      // lili 基础客服
+	
+	  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,

From 470995c13d3bfa9fb8cd16e42e06ebbcc5b8873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Jun 2022 11:30:23 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E5=8F=91=E7=8E=B0=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  2 +-
 pages/product/goods.vue                       | 20 +++++++++----------
 .../product/goods/-goods-recommend.vue        |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifest.json b/manifest.json
index 119a102..4cc39c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "lili商城",
-    "appid" : "__UNI__83F0C3D",
+    "appid" : "__UNI__EC9FD60",
     "description" : "",
     "versionName" : "4.2.5",
     "versionCode" : 4000250,
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 8e1af3c..1cf8b5c 100644
--- a/pages/product/goods.vue
+++ b/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 || "" }}
@@ -410,7 +410,6 @@ export default {
     return {
       setup,
       promotionShow: false, //弹窗开关
-      promotionFlag: true, //活动开关
       // #ifdef H5
       navbarListX: 110, //导航栏列表栏x轴
       navbarListY: 80, //导航栏列表栏y轴
@@ -447,9 +446,10 @@ export default {
         },
       ],
       popupsSwitch: false, //导航栏列表栏开关
-      shareFlage: false,
+      enableShare: false,
       selectedGoods: "", //选择的商品规格昵称
       isGroup: false, // 是否是拼团活动
+      isSeckill:false, // 是否秒杀活动
       pointDetail: "", // 是否是积分商品
       assemble: "", //拼团的sku
       navbarOnlyBack: {
@@ -485,7 +485,6 @@ export default {
           id: "4",
         },
       ],
-      oldtabScrollTop: 0,
       tabScrollTop: null,
       scrollArr: [],
       scrollId: "1",
@@ -547,10 +546,7 @@ export default {
           this.$refs.popupGoods.buyType = "PINTUAN";
           clearInterval(timer);
         }, 100);
-
-        this.promotionFlag = false;
       } else {
-        this.promotionFlag = true;
         this.$refs.popupGoods.buyType = "";
       }
     },
@@ -684,6 +680,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;
@@ -1074,7 +1074,7 @@ export default {
      * 点击分享
      */
     async shareChange() {
-      this.shareFlage = true;
+      this.enableShare = true;
     },
   },
 };
diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue
index 3e3dadc..e2f9655 100644
--- a/pages/product/product/goods/-goods-recommend.vue
+++ b/pages/product/product/goods/-goods-recommend.vue
@@ -1,14 +1,14 @@
 <template>
   <view class="recommend-box" >
     <h4 class="goods-recommend-title">宝贝推荐</h4>
-		<goodsList :res='res' :storeName="false" />
+		<goodsList :res='res' v-if="res" :storeName="false" />
 	 </view>
 </template>
 
-<script>
+<script>
 import goodsList from '@/components/m-goods-list/list.vue'
 export default {
-  props: ["res"],
+  props: ["res"],
 	components:{goodsList},
   methods: {
     }

From 9a149eb67374d03d83a1b2d04d5dbe4baa7572c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Jun 2022 17:28:46 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/shopPage.vue | 50 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 161bcf6..6a0041d 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -179,30 +179,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:
+      //     "/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
+			
+			uni.navigateTo({
+			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
+			 });
     },
 
     /** 获取店铺分类 */

From 403d93831f476b48821e212ed46704782512e355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 2 Jun 2022 19:09:57 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/App.vue b/App.vue
index c7e2217..b59ad23 100644
--- a/App.vue
+++ b/App.vue
@@ -8,6 +8,7 @@ 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 {
@@ -66,14 +67,14 @@ export default {
 
    onShow() {
     // #ifndef H5
-    // this.getClipboard();
+    this.getClipboard();
     // #endif
     // #ifdef APP-PLUS
-    console.log(storage.getShow());
+  
     if (storage.getShow()) {
       if(uni.getSystemInfoSync().platform == 'ios'){
       this.$u.route("/pages/tabbar/screen/fullScreen");
-      // uni.reLaunch({ url: "/pages/tabbar/screen/fullScreen" });
+
       }
     }
     // #endif

From bb24b27963133c882efe1979d899ec78523ea1a8 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 6 Jun 2022 10:23:33 +0800
Subject: [PATCH 09/10] =?UTF-8?q?token=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue          | 5 ++---
 utils/request.js | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index c7e2217..b64374f 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,3 @@
-
-
 <script>
 /**
  * vuex管理登录状态，具体可以参考官方登录模板示例
@@ -7,7 +5,8 @@
 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 config from "@/config/config";
+import storage from "@/utils/storage.js";
 // 悬浮球
 
 export default {
diff --git a/utils/request.js b/utils/request.js
index 17cf14a..3cb42cc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -119,9 +119,11 @@ http.interceptors.response.use(
       response.data.status === 403
     ) {
       if (!isRefreshing) {
+		console.log('旧token',token) 
         isRefreshing = true;
+		let oldRefreshToken = storage.getRefreshToken();
         //调用刷新token的接口
-        return refreshTokenFn(storage.getRefreshToken())
+        return refreshTokenFn(oldRefreshToken)
           .then((res) => {
             let { accessToken, refreshToken } = res.data.result;
             storage.setAccessToken(accessToken);
@@ -129,11 +131,13 @@ http.interceptors.response.use(
 
             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);
           })
@@ -153,9 +157,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为不正常时

From 63e3718178865e1d3cadfd1ef2f5853b888605ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 7 Jun 2022 15:34:09 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=ACsku=E5=AD=97=E6=AE=B5=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=20id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/home/template/tpl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index e0d8f23..0e8897e 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -27,7 +27,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":