diff --git a/App.vue b/App.vue
index b64374f..b59ad23 100644
--- a/App.vue
+++ b/App.vue
@@ -1,3 +1,5 @@
+
+
 <script>
 /**
  * vuex管理登录状态，具体可以参考官方登录模板示例
@@ -5,8 +7,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 storage from "@/utils/storage.js";
+import config from "@/config/config";
+import storage from "@/utils/storage";
 // 悬浮球
 
 export default {
@@ -65,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
diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index cca176f..60724a3 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -1,515 +1,539 @@
 <template>
-  <div class="wrapper">
-    <u-popup
-      class="popup"
-      v-model="buyMask"
-      :height="setup.height"
-      closeable
-      :mode="setup.mode"
-      :border-radius="setup.radius"
-      @close="closeMask()"
-    >
-      <!-- 商品 -->
-      <view class="goods-box bottom">
-        <view class="goods-header">
-          <view class="goods-img">
-            <u-image
-              width="200rpx"
-              border-radius="20"
-              class="uimage"
-              height="200rpx"
-              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"
-            ></u-image>
-          </view>
-          <view class="goods-skus">
-            <!-- 有活动商品价格 -->
-            <view class="goods-price" v-if="goodsDetail.promotionPrice && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
-              <span v-if="goodsDetail.promotionPrice && !pointDetail">
-                ￥
-                <span class="goods-price-promotionShow goods-price-bigshow">{{
+	<div class="wrapper">
+		<u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
+			:border-radius="setup.radius" @close="closeMask()">
+			<!-- 商品 -->
+			<view class="goods-box bottom">
+				<view class="goods-header">
+					<view class="goods-img">
+						<u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
+							:src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+					</view>
+					<view class="goods-skus">
+						<!-- 有活动商品价格 -->
+						<view class="goods-price"
+							v-if="goodsDetail.promotionPrice && ((isGroup && buyType === 'PINTUAN') || !isGroup)">
+							<span v-if="goodsDetail.promotionPrice && !pointDetail">
+								￥
+								<span class="goods-price-promotionShow goods-price-bigshow">{{
                   formatPrice(goodsDetail.promotionPrice)[0]
                 }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
-              </span>
-              <span v-if="pointDetail.points">
-                <span class="goods-price-promotionShow goods-price-bigshow">{{
+								.{{ formatPrice(goodsDetail.promotionPrice)[1] }}
+							</span>
+							<span v-if="pointDetail.points">
+								<span class="goods-price-promotionShow goods-price-bigshow">{{
                   pointDetail.points
                 }}</span>
-                积分
-              </span>
-              <div class="promotion-box">
-                ￥
-                <span class="goods-price-bigshow">{{
+								积分
+							</span>
+							<div class="promotion-box">
+								￥
+								<span class="goods-price-bigshow">{{
                   formatPrice(goodsDetail.price)[0]
                 }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
-              </div>
-            </view>
-            <!-- 正常商品的价格 -->
-            <view class="goods-price" v-else>
-              <span>
-                ￥
-                <span class="goods-price-bigshow">{{
-                  formatPrice(goodsDetail.price)[0]
-                }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
-              </span>
-            </view>
-            <view class="goods-check-skus">
-              已选
-              <span class="goods-check-skus-name">
-                {{ selectName }}
-                <span>，{{ num }}个</span>
-              </span>
-            </view>
-          </view>
-        </view>
-        <!-- 商品信息 -->
-        <scroll-view class="goods-skus-box" :scroll-y="true">
-          <!-- 规格 -->
-          <view
-            class="goods-skus-view"
-            :key="specIndex"
-            v-for="(spec, specIndex) in formatList"
-          >
-            <view class="skus-view-list">
-              <view class="view-class-title">{{ spec.name }}</view>
+								.{{ formatPrice(goodsDetail.price)[1] }}
+							</div>
+						</view>
+						<!-- 正常商品的价格 -->
+						<view v-else>
+							
+							<!-- 批发价格 -->
+							<div class='price-row flex' v-if="wholesaleList.length">
+								<div class='goods-price' v-for="(item,index) in wholesaleList" :key="index">
+									<span>
+										￥
+										<span class="goods-price-bigshow">{{
+									    formatPrice(item.price)[0]
+									  }}</span>
+										.{{ formatPrice(item.price)[1] }}
+									</span>
+									<span class='wholesale-item'>
+										{{item.num}}{{goodsDetail.goodsUnit}}
+									</span>
+								</div>
+							</div>
+							<div class="goods-price" v-else>
+								<span>
+									￥
+									<span class="goods-price-bigshow">{{
+							    formatPrice(goodsDetail.price)[0]
+							  }}</span>
+									.{{ formatPrice(goodsDetail.price)[1] }}
+								</span>
+							</div>
+						</view>
+						<view class="goods-check-skus">
+							已选
+							<span class="goods-check-skus-name">
+								{{ selectName }}
+								<span>，{{ num }}个</span>
+							</span>
+						</view>
+						<view class="goods-check-skus">
+							库存
+							<span class="goods-check-skus-name">
+								<span>{{ goodsDetail.quantity }}</span>
+							</span>
+						</view>
+					</view>
+				</view>
+				<!-- 商品信息 -->
+				<scroll-view class="goods-skus-box" :scroll-y="true">
+					<!-- 规格 -->
+					<view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
+						<view class="skus-view-list">
+							<view class="view-class-title">{{ spec.name }}</view>
 
-              <!-- 正常逻辑 循环出sku -->
-              <view
-                v-if="!parentOrder"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
-                class="skus-view-item"
-                v-for="(spec_val, spec_index) in spec.values"
-                :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)"
-                >{{ spec_val.value }}
-              </view>
+							<!-- 正常逻辑 循环出sku -->
+							<view v-if="!parentOrder" :class="{ active: spec_val.value == currentSelceted[specIndex] }"
+								class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
+							</view>
 
-              <!-- 拼团购买，仅筛选出当前拼团类型商品 -->
-              <view
-                v-if="parentOrder && spec_val.skuId == goodsDetail.id"
-                :class="{ active: spec_val.value == currentSelceted[specIndex] }"
-                class="skus-view-item"
-                v-for="(spec_val, spec_index) in spec.values"
-                :key="spec_index"
-                @click="handleClickSpec(spec, specIndex, spec_val)"
-                >{{ spec_val.value }}
-              </view>
-            </view>
-          </view>
-          <!-- 数量 -->
-          <view class="goods-skus-number">
-            <view class="view-class-title">数量</view>
-            <u-number-box
-              :bg-color="numberBox.bgColor"
-              :max="200"
-              :color="numberBox.color"
-              :input-width="numberBox.width"
-              :input-height="numberBox.height"
-              :size="numberBox.size"
-              :min="1"
-              v-model="num"
-            >
-            </u-number-box>
-          </view>
-        </scroll-view>
-        <!-- 按钮 -->
-        <view class="btns">
-          <view
-            class="box-btn card"
-            v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
-            @click="addToCartOrBuy('cart')"
-            >加入购物车</view
-          >
-          <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
-        </view>
-      </view>
-    </u-popup>
-  </div>
+							<!-- 拼团购买，仅筛选出当前拼团类型商品 -->
+							<view v-if="parentOrder && spec_val.skuId == goodsDetail.id"
+								:class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+								v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+								@click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}
+							</view>
+						</view>
+					</view>
+					<!-- 数量 -->
+					<view class="goods-skus-number">
+						<view class="view-class-title">数量</view>
+						
+						<u-input style='text-align: right;' v-model="num" type="number"  />
+					</view>
+				</scroll-view>
+				<!-- 按钮 -->
+				<view class="btns">
+					<view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType != 'VIRTUAL_GOODS'"
+						@click="addToCartOrBuy('cart')">加入购物车</view>
+					<view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
+				</view>
+			</view>
+		</u-popup>
+	</div>
 </template>
 <script>
-import * as API_trade from "@/api/trade.js";
-import setup from "./popup";
+	import * as API_trade from "@/api/trade.js";
+	import setup from "./popup";
 
-export default {
-  data() {
-    return {
-      setup,
-      num: 1,
-      // 步进器的大小尺寸单位是 rpx
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
-      selectName: "", //选中商品的昵称
-      selectSkuList: "", //选中商铺sku,
-      selectedSpecImg: "", //选中的图片路径
-      buyType: "", //用于存储促销，拼团等活动类型
-      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
-      formatList: [],
-      currentSelceted: [],
-      skuList: "",
-      isClose: false, //是否可以点击遮罩关闭
-    };
-  },
-  props: {
-    buyMask: {
-      type: Boolean,
-      default: false,
-    },
-	isGroup: {
-	  type: Boolean,
-	  default: false,
-	},
-    goodsDetail: {
-      default: "",
-      type: null,
-    },
-    selectedSku: {
-      default: "",
-      type: null,
-    },
-    goodsSpec: {
-      default: "",
-      type: null,
-    },
-    addr: {
-      default: "",
-      type: null,
-    },
-    pointDetail: {
-      default: "",
-      type: null,
-    },
-  },
-  watch: {
-    buyType: {
-      handler(val) {
-        if (val) {
-          this.buyType = val;
-        }
-      },
-      immediate: true,
-    },
-    selectSkuList: {
-      handler(val, oldval) {
-        this.$emit("changed", val);
-      },
-      deep: true,
-    },
-  },
+	export default {
+		data() {
+			return {
+				setup,
+				num: 1,
+				
+				selectName: "", //选中商品的昵称
+				selectSkuList: "", //选中商铺sku,
+				selectedSpecImg: "", //选中的图片路径
+				buyType: "", //用于存储促销，拼团等活动类型
+				parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
+				formatList: [],
+				currentSelceted: [],
+				skuList: "",
+				isClose: false, //是否可以点击遮罩关闭
+				
+			};
+		},
+		props: {
+			wholesaleList:{
+				type: null,
+				default: false,
+			},
+			buyMask: {
+				type: Boolean,
+				default: false,
+			},
+			isGroup: {
+				type: Boolean,
+				default: false,
+			},
+			goodsDetail: {
+				default: "",
+				type: null,
+			},
+			selectedSku: {
+				default: "",
+				type: null,
+			},
+			goodsSpec: {
+				default: "",
+				type: null,
+			},
+			addr: {
+				default: "",
+				type: null,
+			},
+			pointDetail: {
+				default: "",
+				type: null,
+			},
+		},
+		computed: {
+			wholesalePrice(key){
+				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[]
+			},
+			wholesaleNum(key){
+				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[]
+			}
+		},
+		watch: {
+			num(val){
+				if(val){
+					if(val > this.goodsDetail.quantity){
+						console.log(val)
+						this.val = this.goodsDetail.quantity
+					}
+				}
+			},
+			buyType: {
+				handler(val) {
+					if (val) {
+						this.buyType = val;
+					}
+				},
+				immediate: true,
+			},
+			selectSkuList: {
+				handler(val, oldval) {
+					this.$emit("changed", val);
+				},
+				deep: true,
+			},
+		},
 
-  methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
+		methods: {
+			// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
 
-    closeMask() {
-      this.$emit("closeBuy", false);
-    },
+			closeMask() {
+				this.$emit("closeBuy", false);
+			},
 
-    /**点击规格 */
-    handleClickSpec(val, index, specValue) {
-      this.currentSelceted[index] = specValue.value;
-      let selectedSkuId = this.goodsSpec.find((i) => {
-        let matched = true;
-        let specValues = i.specValues.filter((j) => j.specName !== "images");
-        for (let n = 0; n < specValues.length; n++) {
-          if (specValues[n].specValue !== this.currentSelceted[n]) {
-            matched = false;
-            return;
-          }
-        }
-        if (matched) {
-          return i;
-        }
-      });
-      if (selectedSkuId?.skuId) {
-        this.$set(this.currentSelceted, index, specValue.value);
-        this.selectSkuList = {
-          spec: {
-            specName: val.name,
-            specValue: specValue.value,
-          },
-          data: this.goodsDetail,
-        };
-        this.selectName = specValue.value;
+			/**点击规格 */
+			handleClickSpec(val, index, specValue) {
+				this.currentSelceted[index] = specValue.value;
+				let selectedSkuId = this.goodsSpec.find((i) => {
+					let matched = true;
+					let specValues = i.specValues.filter((j) => j.specName !== "images");
+					for (let n = 0; n < specValues.length; n++) {
+						if (specValues[n].specValue !== this.currentSelceted[n]) {
+							matched = false;
+							return;
+						}
+					}
+					if (matched) {
+						return i;
+					}
+				});
+				if (selectedSkuId?.skuId) {
+					this.$set(this.currentSelceted, index, specValue.value);
+					this.selectSkuList = {
+						spec: {
+							specName: val.name,
+							specValue: specValue.value,
+						},
+						data: this.goodsDetail,
+					};
+					this.selectName = specValue.value;
 
-        this.$emit("handleClickSku", {
-          skuId: selectedSkuId.skuId,
-          goodsId: this.goodsDetail.goodsId,
-        });
-      } else {
-        uni.showToast({
-          title: "暂无该商品!",
-          duration: 2000,
-          icon: "none",
-        });
-      }
-    },
+					this.$emit("handleClickSku", {
+						skuId: selectedSkuId.skuId,
+						goodsId: this.goodsDetail.goodsId,
+					});
+				} else {
+					uni.showToast({
+						title: "暂无该商品!",
+						duration: 2000,
+						icon: "none",
+					});
+				}
+			},
 
-    /**
-     * 直接购买
-     */
-    buy(data) {
-      API_trade.addToCart(data).then((res) => {
-        if (res.data.success) {
-          uni.navigateTo({
-            url: `/pages/order/fillorder?way=${
+			/**
+			 * 直接购买
+			 */
+			buy(data) {
+				API_trade.addToCart(data).then((res) => {
+					if (res.data.success) {
+						uni.navigateTo({
+							url: `/pages/order/fillorder?way=${
               data.cartType
             }&addr=${""}&parentOrder=${encodeURIComponent(
               JSON.stringify(this.parentOrder)
             )}`,
-          });
-        }
-      });
-    },
+						});
+					}
+				});
+			},
 
-    /**
-     * 添加到购物车或购买
-     */
-    addToCartOrBuy(val) {
-      if (!this.selectSkuList) {
-        uni.showToast({
-          title: "请选择规格商品",
-          icon: "none",
-        });
-        return;
-      }
-      let data = {
-        skuId: this.goodsDetail.id,
-        num: this.num,
-      };
+			/**
+			 * 添加到购物车或购买
+			 */
+			addToCartOrBuy(val) {
+				if (!this.selectSkuList) {
+					uni.showToast({
+						title: "请选择规格商品",
+						icon: "none",
+					});
+					return;
+				}
+				let data = {
+					skuId: this.goodsDetail.id,
+					num: this.num,
+				};
 
-      if (val == "cart") {
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.showToast({
-              title: "商品已添加到购物车",
-              icon: "none",
-            });
+				if (val == "cart") {
+					API_trade.addToCart(data).then((res) => {
+						if (res.data.code == 200) {
+							uni.showToast({
+								title: "商品已添加到购物车",
+								icon: "none",
+							});
 
-            this.$emit("queryCart");
-            this.closeMask();
-          }
-        });
-      } else {
-        // 判断是否拼团商品
-        if (this.buyType) {
-          data.cartType = "PINTUAN";
-        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
-          data.cartType = "VIRTUAL";
-        } else {
-          data.cartType = "BUY_NOW";
-        }
+							this.$emit("queryCart");
+							this.closeMask();
+						}
+					});
+				} else {
+					// 判断是否拼团商品
+					if (this.buyType) {
+						data.cartType = "PINTUAN";
+					} else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
+						data.cartType = "VIRTUAL";
+					} else {
+						data.cartType = "BUY_NOW";
+					}
 
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.navigateTo({
-              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
+					API_trade.addToCart(data).then((res) => {
+						if (res.data.code == 200) {
+							uni.navigateTo({
+								url: `/pages/order/fillorder?way=${data.cartType}&addr=${
                 this.addr.id || ""
               }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`,
-            });
-          }
-        });
-      }
-    },
-    formatSku(list) {
-      // 格式化数据
-      let arr = [{}];
-      
-      if(!Array.isArray(list)){
-        return false
-      }
-      list.forEach((item, index) => {
-        item.specValues.forEach((spec, specIndex) => {
-          let name = spec.specName;
-          let values = {
-            value: spec.specValue,
-            quantity: item.quantity,
-            skuId: item.skuId,
-          };
-          if (name === "images") {
-            return;
-          }
+							});
+						}
+					});
+				}
+			},
+			formatSku(list) {
+				// 格式化数据
+				let arr = [{}];
 
-          arr.forEach((arrItem, arrIndex) => {
-            if (
-              arrItem.name == name &&
-              arrItem.values &&
-              !arrItem.values.find((i) => {
-                return i.value === values.value;
-              })
-            ) {
-              arrItem.values.push(values);
-            }
+				if (!Array.isArray(list)) {
+					return false
+				}
+				list.forEach((item, index) => {
+					item.specValues.forEach((spec, specIndex) => {
+						let name = spec.specName;
+						let values = {
+							value: spec.specValue,
+							quantity: item.quantity,
+							skuId: item.skuId,
+						};
+						if (name === "images") {
+							return;
+						}
 
-            let keys = arr.map((key) => {
-              return key.name;
-            });
-            if (!keys.includes(name)) {
-              arr.push({
-                name: name,
-                values: [values],
-              });
-            }
-          });
-        });
-      });
+						arr.forEach((arrItem, arrIndex) => {
+							if (
+								arrItem.name == name &&
+								arrItem.values &&
+								!arrItem.values.find((i) => {
+									return i.value === values.value;
+								})
+							) {
+								arrItem.values.push(values);
+							}
 
-      arr.shift();
-      this.formatList = arr;
+							let keys = arr.map((key) => {
+								return key.name;
+							});
+							if (!keys.includes(name)) {
+								arr.push({
+									name: name,
+									values: [values],
+								});
+							}
+						});
+					});
+				});
 
-      list.forEach((item) => {
-        // 默认选中
-        if (item.skuId === this.goodsDetail.id) {
-          item.specValues
-            .filter((i) => i.specName !== "images")
-            .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValue;
+				arr.shift();
+				this.formatList = arr;
 
-              this.selectName = value.specValue;
+				list.forEach((item) => {
+					// 默认选中
+					if (item.skuId === this.goodsDetail.id) {
+						item.specValues
+							.filter((i) => i.specName !== "images")
+							.forEach((value, _index) => {
+								this.currentSelceted[_index] = value.specValue;
 
-              this.selectSkuList = {
-                spec: value,
-                data: this.goodsDetail,
-              };
-            });
-        }
-      });
+								this.selectName = value.specValue;
 
-      this.skuList = list;
-      // console.log(" this.skuList", this.skuList)
-    },
-  },
+								this.selectSkuList = {
+									spec: value,
+									data: this.goodsDetail,
+								};
+							});
+					}
+				});
 
-  mounted() {
-    this.formatSku(this.goodsSpec);
-  },
-};
+				this.skuList = list;
+				// console.log(" this.skuList", this.skuList)
+			},
+		},
+
+		mounted() {
+			this.formatSku(this.goodsSpec);
+		},
+	};
 </script>
 <style lang="scss" scoped>
-@import "./popup.scss";
+	@import "./popup.scss";
+	.price-row{
+		text-align: center;
+		
+	}
+	.buy {
+		background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
+		box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
+	}
 
-.buy {
-  background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
+	.card {
+		background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
+		box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
+	}
 
-.card {
-  background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
+	/deep/.u-icon-plus,
+	.u-icon-minus,
+	.u-icon-disabled {
+		height: 30rpx !important;
+		background: #fff !important;
+	}
 
-/deep/.u-icon-plus,
-.u-icon-minus,
-.u-icon-disabled {
-  height: 30rpx !important;
-  background: #fff !important;
-}
+	.goods-skus-number {
+		justify-content: space-between;
+		display: flex;
+		text-align: right
+	}
 
-.goods-skus-number {
-  justify-content: space-between;
-  display: flex;
-}
+	/deep/ .uni-scroll-view {
+		overflow: hidden !important;
+	}
 
-/deep/ .uni-scroll-view {
-  overflow: hidden !important;
-}
+	.active {
+		background: $price-light-color !important;
+		border: 2rpx solid $price-color;
+		font-weight: bold;
+		color: $price-color !important;
+		box-sizing: border-box;
+	}
 
-.active {
-  background: $price-light-color !important;
-  border: 2rpx solid $price-color;
-  font-weight: bold;
-  color: $price-color !important;
-  box-sizing: border-box;
-}
+	.goods-skus-box {
+		overflow-y: auto;
+		height: 610rpx;
+		// #ifdef MP-WEIXIN
+		height: 570rpx;
+		// #endif
+		margin-bottom: 10rpx;
+	}
 
-.goods-skus-box {
-  overflow-y: auto;
-  height: 610rpx;
-  // #ifdef MP-WEIXIN
-  height: 570rpx;
-  // #endif
-  margin-bottom: 10rpx;
-}
+	.goods-skus-view {
+		overflow: hidden;
 
-.goods-skus-view {
-  overflow: hidden;
+		.skus-view-list {
+			>.skus-view-item {
+				flex: 1;
+				padding: 0 36rpx;
 
-  .skus-view-list {
-    > .skus-view-item {
-      flex: 1;
-      padding: 0 36rpx;
+				overflow: hidden;
+				height: 60rpx;
+				line-height: 60rpx;
+				float: left;
+				text-align: center;
+				margin-left: 24rpx;
+				margin-bottom: 20rpx;
+				font-size: 22rpx;
+				color: #262626;
+				background: #f2f2f2;
+				border-radius: 30rpx;
+			}
+		}
+	}
+	.wholesale-item{
+		color: #999 !important;
+		font-size: 24rpx;
+		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
+	}
 
-      overflow: hidden;
-      height: 60rpx;
-      line-height: 60rpx;
-      float: left;
-      text-align: center;
-      margin-left: 24rpx;
-      margin-bottom: 20rpx;
-      font-size: 22rpx;
-      color: #262626;
-      background: #f2f2f2;
-      border-radius: 30rpx;
-    }
-  }
-}
+	.goods-header {
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		margin-bottom: 36rpx;
+	}
 
-.goods-header {
-  height: 200rpx;
-  display: flex;
-  align-items: center;
-  margin-bottom: 36rpx;
-}
+	.goods-box {
+		padding: 50rpx 36rpx 0 36rpx;
+	}
 
-.goods-box {
-  padding: 50rpx 36rpx 0 36rpx;
-}
+	.goods-skus {
+		padding: 0 20rpx;
+	}
 
-.goods-skus {
-  padding: 0 20rpx;
-}
+	.goods-price {
+		color: $price-color;
+		line-height: 80rpx;
+		margin-right: 20rpx;
+		>* {
+			color: $price-color;
+			line-height: 80rpx;
+	
+		}
+	}
 
-.goods-price {
-  color: $price-color;
-  line-height: 80rpx;
-  display: flex;
-}
-.promotion-box {
-  line-height: 1;
-  display: flex;
-  align-items: center;
-  text-decoration: line-through;
-  color: #999;
-  margin-left: 10rpx;
-  /deep/ span {
-    font-size: 30rpx;
-  }
-}
-.promotion {
-  font-size: 30rpx;
-}
-.goods-price-promotionShow {
-  font-size: 48rpx;
-}
-.goods-check-skus {
-  font-size: 24rpx;
-  color: #999;
-  > .goods-check-skus-name {
-    margin-left: 4rpx;
-  }
-  > span {
-    color: #333;
-  }
-}
-</style>
+	.promotion-box {
+		line-height: 1;
+		display: flex;
+		align-items: center;
+		text-decoration: line-through;
+		color: #999;
+		margin-left: 10rpx;
+
+		/deep/ span {
+			font-size: 30rpx;
+		}
+	}
+
+	.promotion {
+		font-size: 30rpx;
+	}
+
+	.goods-price-promotionShow {
+		font-size: 48rpx;
+	}
+
+	.goods-check-skus {
+		font-size: 24rpx;
+		color: #999;
+
+		>.goods-check-skus-name {
+			margin-left: 4rpx;
+		}
+
+		>span {
+			color: #333;
+		}
+	}
+</style>
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/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/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/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index b485793..4768c70 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -116,12 +116,12 @@
 					uni.stopPullDownRefresh();
 					uni.hideLoading();
 					if (res.statusCode == 200) {
-						res.data.result &&
-							res.data.result.forEach((item) => {
+						res.data.result.records.length &&
+							res.data.result.records.forEach((item) => {
 								item.show = false;
 							});
 
-						let data = res.data.result;
+						let data = res.data.result.records;
 						if (data.total == 0) {
 							this.whetherEmpty = true;
 						} else {
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
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 d0da958..5cbc9f6 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -82,65 +82,10 @@
       <div v-if="isSWitch">
         <scroll-view :style="{ height: goodsHeight }" enableBackToTop="true" lower-threshold="250"
           @scrolltolower="loadmore()" scroll-with-animation scroll-y class="scoll-page">
-          <div class="goods-class">
-            <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>
-      <div class="empty" v-if="goodsList == [] || goodsList == '' || goodsList == null">
-        <view>
-          <image style="width: 320rpx; height: 240rpx" src="/static/nodata.png">
-
-          </image>
-        </view>
-        <view>
-          <p>没有找到相关的商品信息</p>
-          <p>请换一个关键词试试吧</p>
-        </view>
-      </div>
-
       <!-- 一行两个商品展示 -->
       <div v-if="
           !isSWitch &&
@@ -148,45 +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-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>
@@ -268,19 +175,31 @@
         </view>
       </view>
     </u-popup>
+	<div class="empty" v-if="empty">
+		<view>
+			<image style="width: 320rpx; height: 240rpx" src="/static/nodata.png">
+	
+			</image>
+		</view>
+		<view>
+			<p>没有找到相关的商品信息</p>
+			<p>请换一个关键词试试吧</p>
+		</view>
+	</div>
     <u-back-top :scroll-top="scrollTop"></u-back-top>
   </view>
 </template>
 
 <script>
 import { getGoodsList, getGoodsRelated } from "@/api/goods.js";
-
+import goodsList from '@/components/m-goods-list/list.vue'
 import { getHotKeywords } from "@/api/home.js";
 import mSearch from "@/components/m-search-revision/m-search-revision.vue";
 import storage from "@/utils/storage";
 export default {
   data() {
     return {
+	  empty:false,
       scrollTop: 0,
       loadIndex: 10,
       oldKeywordIndex: "",
@@ -339,6 +258,7 @@ export default {
       routerVal: "",
     };
   },
+	
   onPageScroll(e) {
     console.log(e);
     this.scrollTop = e.scrollTop;
@@ -371,6 +291,7 @@ export default {
   },
   components: {
     mSearch,
+		goodsList
   },
   watch: {
     /**
@@ -709,8 +630,11 @@ export default {
       let goodsList = await getGoodsList(this.params);
 
       if (goodsList.data.result.content.length < 10) {
-        this.loadingType = "noMore";
-      }
+		  this.loadingType = "noMore";
+		  this.empty = true
+	    } else {
+		  this.empty = false
+	    }
       this.goodsList.push(...goodsList.data.result.content);
       this.initSortGoods();
       uni.hideLoading();
@@ -759,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/order/myOrder.vue b/pages/order/myOrder.vue
index 88cae7e..0683258 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(this.tabCurrentIndex);
+    if (!this.tabCurrentIndex) {
+     this.initData(0);
     } else {
-      this.initData(0);
+      
     }
     // this.loadData(this.status);
   },
@@ -340,7 +340,8 @@ export default {
      * 替换onLoad下代码即可
      */
     let status = Number(options.status);
-    this.status = status;
+    this.status = status;
+		
     this.tabCurrentIndex = status;
     // if (status == 0) {
     //   this.loadData(status);
@@ -434,6 +435,7 @@ export default {
      */
     loadData(index) {
       this.params.pageNumber = this.navList[index].pageNumber;
+      // this.params.tag = this.orderStatus[index].orderStatus;
       getOrderList(this.params).then((res) => {
         uni.stopPullDownRefresh();
         if (!res.data.success) {
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 5125e34..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 || "" }}
@@ -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>
@@ -348,6 +353,7 @@
           :id="productId"
           v-if="goodsDetail.id"
           :pointDetail="pointDetail"
+					:wholesaleList="wholesaleList"
           @handleClickSku="selectSku"
           :buyMask="buyMask"
         />
@@ -404,7 +410,6 @@ export default {
     return {
       setup,
       promotionShow: false, //弹窗开关
-      promotionFlag: true, //活动开关
       // #ifdef H5
       navbarListX: 110, //导航栏列表栏x轴
       navbarListY: 80, //导航栏列表栏y轴
@@ -441,9 +446,10 @@ export default {
         },
       ],
       popupsSwitch: false, //导航栏列表栏开关
-      shareFlage: false,
+      enableShare: false,
       selectedGoods: "", //选择的商品规格昵称
       isGroup: false, // 是否是拼团活动
+      isSeckill:false, // 是否秒杀活动
       pointDetail: "", // 是否是积分商品
       assemble: "", //拼团的sku
       navbarOnlyBack: {
@@ -479,7 +485,6 @@ export default {
           id: "4",
         },
       ],
-      oldtabScrollTop: 0,
       tabScrollTop: null,
       scrollArr: [],
       scrollId: "1",
@@ -523,10 +528,11 @@ export default {
 
       routerVal: "",
       IMLink: "", // IM地址
+			wholesaleList:[]
     };
   },
 
-  computed: {
+  computed: {
 	// udesk IM 
     IM() {
       return this.IMLink + this.storeDetail.merchantEuid;
@@ -540,10 +546,7 @@ export default {
           this.$refs.popupGoods.buyType = "PINTUAN";
           clearInterval(timer);
         }, 100);
-
-        this.promotionFlag = false;
       } else {
-        this.promotionFlag = true;
         this.$refs.popupGoods.buyType = "";
       }
     },
@@ -661,6 +664,7 @@ export default {
       }
       /**商品信息以及规格信息存储 */
       this.goodsDetail = response.data.result.data;
+      this.wholesaleList = response.data.result.wholesaleList;
       this.goodsSpec = response.data.result.specs;
       this.PromotionList = response.data.result.promotionMap;
       this.goodsParams = response.data.result.goodsParamsDTOList || [];
@@ -676,6 +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;
@@ -708,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,
@@ -1066,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 c05de1e..e2f9655 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' v-if="res" :storeName="false" />
+	 </view>
 </template>
 
 <script>
+import goodsList from '@/components/m-goods-list/list.vue'
 export default {
   props: ["res"],
+	components:{goodsList},
   methods: {
-    // 点击店铺推荐
-    clickGoods(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`
-      });
-    },
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-  
-      return val.toFixed(2).split(".");
     }
-  }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../mp-goods.scss";
 @import "../product.scss";
-
-.goods_recomm {
-  padding: 12px 0 20rpx 20rpx;
-  color: #000;
-  font-size: 30rpx;
-  font-weight: 400;
-  margin-bottom: 28rpx;
-}
-
-.like-goods-uimage {
-  /deep/ .u-image {
-    height: 350rpx !important;
-  }
-
-  width: 100%;
-}
-
-.recommend-box {
-  background-color: #ffffff;
- 
-  width: 100%;
-
-  padding-bottom: 120rpx;
-
-  .title {
-    width: 120rpx;
-    height: 42rpx;
-    font-size: 30rpx;
-    font-weight: 700;
-    text-align: left;
-    color: #333333;
-    margin-left: 20rpx;
-  }
-}
-.like-goods-list {
-  display: flex;
-  width: 100%;
-  flex-wrap: wrap;
-}
-.like-goods-item {
-  padding: 0 !important;
-  width: 48%;
-  margin: 0 1% 10rpx 1%;
-  background: #f7f7f7;
-  border-radius: 12rpx;
-
-  overflow: hidden;
-
-  /deep/ .u-image {
-    width: 100%;
-  }
-}
-
-.like-goods-list {
-  // background-color: #f8f8f8;
-  width: 100%;
-  margin-bottom: 100rpx;
-
-  .name {
-    padding: 14rpx 8rpx 0 8rpx;
-
-    color: #333;
-    font-size: 24rpx;
-    display: -webkit-box;
-    overflow: hidden;
-    -webkit-box-orient: vertical;
-
-    -webkit-line-clamp: 2;
-
-    background: #f7f7f7;
-    height: 80rpx;
-  }
-
-  .price-sales {
-    padding: 8rpx;
-    background: #f7f7f7;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .item-price {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      font-size: 26rpx;
-      text-align: left;
-      color: $price-color;
-      line-height: 23px;
-      font-weight: bold;
-      > span {
-        font-size: 32rpx;
-      }
-    }
-
-    .sales {
-      line-height: 23px;
-      font-size: 22rpx;
-      text-align: left;
-      letter-spacing: 0;
-      color: #cccccc;
-      // padding-right: 10rpx;
-    }
-  }
-}
 </style>
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 07f050c..6a0041d 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},
 
   /**
    * 加载
@@ -188,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}`,
+			 });
     },
 
     /** 获取店铺分类 */
@@ -277,15 +272,6 @@ export default {
       }
     },
 
-    /**
-     * 跳转到商品详情
-     */
-    navigateToGoodsDetail(val) {
-      uni.navigateTo({
-        url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
-      });
-    },
-
     /**
      *  是否收藏
      */
@@ -404,42 +390,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>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 0623bfa..c4b234f 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -74,6 +74,7 @@
               </p>
               <!-- 规格 -->
               <p class="sp-type">{{skuItem.goodsSku.simpleSpecs}}</p>
+              <p class="sp-type" v-if="skuItem.goodsSku.salesModel == 'WHOLESALE'">批发商品</p>
               <p class="sp-number">
                 <view class="sp-price">
                   <div class="default-color" :class="{'main-color':Object.keys(skuItem.promotionMap).length ==0  }">
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;
 }