From 47b58c290a65c78eace72577773b9ed90457c8e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 15 Nov 2021 16:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-buy/goods.vue              | 128 ++++---
 pages/cart/payment/popup/goods.vue      | 436 ------------------------
 pages/cart/payment/popup/popup.js       |   8 -
 pages/cart/payment/popup/popup.scss     |  37 --
 pages/product/goods.vue                 |   2 +-
 pages/product/product/popup/address.vue |   4 +-
 pages/product/product/popup/goods.vue   | 429 -----------------------
 pages/product/product/popup/popup.scss  |  37 --
 pages/promotion/bargain/detail.vue      |   5 +
 9 files changed, 93 insertions(+), 993 deletions(-)
 delete mode 100644 pages/cart/payment/popup/goods.vue
 delete mode 100644 pages/cart/payment/popup/popup.js
 delete mode 100644 pages/cart/payment/popup/popup.scss
 delete mode 100644 pages/product/product/popup/goods.vue
 delete mode 100644 pages/product/product/popup/popup.scss

diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index a809743..cbe310b 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrapper">
     <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+    :border-radius="setup.radius" @close="closeMask()">
       <!-- 商品 -->
       <view class="goods-box bottom">
         <view class="goods-header">
@@ -10,14 +10,18 @@
               :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
           </view>
           <view class="goods-skus">
+
             <!-- 有活动商品价格 -->
             <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span>
+              <span v-if="goodsDetail.promotionPrice && !pointDetail">
                 ￥
-                <span class="goods-price-promotionShow goods-price-bigshow"
-                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span
+                  class="goods-price-promotionShow goods-price-bigshow">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
                 .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
-                <span></span>
+              </span>
+              <span v-if="pointDetail.points">
+                <span class="goods-price-promotionShow goods-price-bigshow">{{ pointDetail.points }}</span>
+                积分
               </span>
               <div class="promotion-box">
                 ￥
@@ -36,6 +40,7 @@
                 formatPrice(goodsDetail.price)[0]
               }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
+
               </span>
             </view>
             <view class="goods-check-skus">
@@ -48,24 +53,33 @@
           </view>
         </view>
         <!-- 商品信息 -->
-          <scroll-view class="goods-skus-box" :scroll-y="true">
+        <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>
-              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+
+
+              <!-- 正常逻辑 循环出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>
+                @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" :color="numberBox.color" :input-width="numberBox.width"
-              :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
+            <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>
+        </scroll-view>
         <!-- 按钮 -->
         <view class="btns">
 
@@ -80,6 +94,7 @@
 <script>
 import * as API_trade from "@/api/trade.js";
 import setup from "./popup";
+
 export default {
   data() {
     return {
@@ -101,17 +116,35 @@ export default {
       formatList: [],
       currentSelceted: [],
       skuList: "",
-      isMask: false, //是否显示遮罩层
       isClose: false, //是否可以点击遮罩关闭
     };
   },
-  props: [
-    "goodsDetail", //商品详情
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-  ],
+  props: {
+    buyMask: {
+      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) {
@@ -120,7 +153,7 @@ export default {
       immediate: true,
     },
     selectSkuList: {
-      handler(val) {
+      handler(val, oldval) {
         this.$emit("changed", val);
       },
       deep: true,
@@ -128,6 +161,8 @@ export default {
   },
 
   methods: {
+    
+
     // 格式化金钱  1999 --> [1999,00]
     formatPrice(val) {
       if (typeof val == "undefined") {
@@ -142,7 +177,7 @@ export default {
 
     /**点击规格 */
     handleClickSpec(val, index, specValue) {
-       this.currentSelceted[index] = specValue.value;
+      this.currentSelceted[index] = specValue.value;
       let selectedSkuId = this.goodsSpec.find((i) => {
         let matched = true;
         let specValues = i.specValues.filter((j) => j.specName !== "images");
@@ -180,6 +215,24 @@ export default {
       }
     },
 
+     /**
+     * 直接购买
+     */
+    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)
+            )}`,
+          });
+        }
+      });
+    },
+
+
     /**
      * 添加到购物车或购买
      */
@@ -231,27 +284,9 @@ export default {
         });
       }
     },
-
-    /**
-     * 直接购买
-     */
-    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)
-            )}`,
-          });
-        }
-      });
-    },
-
     formatSku(list) {
       // 格式化数据
-      if (!Array.isArray(list)) return false;
+      console.log(list);
       let arr = [{}];
       list.forEach((item, index) => {
         item.specValues.forEach((spec, specIndex) => {
@@ -259,6 +294,7 @@ export default {
           let values = {
             value: spec.specValue,
             quantity: item.quantity,
+            skuId: item.skuId,
           };
           if (name === "images") {
             return;
@@ -268,7 +304,9 @@ export default {
             if (
               arrItem.name == name &&
               arrItem.values &&
-              !arrItem.values.find((i) => i.value === values.value)
+              !arrItem.values.find((i) => {
+                return i.value === values.value;
+              })
             ) {
               arrItem.values.push(values);
             }
@@ -277,6 +315,7 @@ export default {
               return key.name;
             });
             if (!keys.includes(name)) {
+              console.log(name, values);
               arr.push({
                 name: name,
                 values: [values],
@@ -285,16 +324,20 @@ export default {
           });
         });
       });
+
       arr.shift();
       this.formatList = arr;
 
       list.forEach((item) => {
+        // 默认选中
         if (item.skuId === this.goodsDetail.id) {
           item.specValues
             .filter((i) => i.specName !== "images")
             .forEach((value, _index) => {
               this.currentSelceted[_index] = value.specValue;
+
               this.selectName = value.specValue;
+
               this.selectSkuList = {
                 spec: value,
                 data: this.goodsDetail,
@@ -304,13 +347,12 @@ export default {
       });
 
       this.skuList = list;
+      // console.log(" this.skuList", this.skuList)
     },
   },
 
   mounted() {
     this.formatSku(this.goodsSpec);
-
-    console.log(this.goodsDetail);
   },
 };
 </script>
diff --git a/pages/cart/payment/popup/goods.vue b/pages/cart/payment/popup/goods.vue
deleted file mode 100644
index edf2f7e..0000000
--- a/pages/cart/payment/popup/goods.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
-      <!-- 商品 -->
-      <view class="goods-box bottom">
-        <view class="goods-header">
-          <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
-              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
-          </view>
-          <view class="goods-skus">
-            <!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span>
-                ￥
-                <span class="goods-price-promotionShow goods-price-bigshow"
-                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
-                .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
-                <span></span>
-              </span>
-              <div class="promotion-box">
-                ￥
-                <span class="goods-price-bigshow">{{
-                formatPrice(goodsDetail.price)[0]
-              }}</span>
-                .{{ formatPrice(goodsDetail.price)[1] }}
-
-              </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>
-              <view :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" :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>
-</template>
-<script>
-import * as API_trade from "@/api/trade.js";
-import setup from "./popup";
-export default {
-  data() {
-    return {
-      setup,
-      num: 1,
-      // 步进器的大小尺寸单位是 rpx
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
-      selectName: "", //选中商品的昵称
-      selectSkuList: "", //选中商铺sku,
-      selectedSpecImg: "", //选中的图片路径
-      buyType: "", //用于存储促销，拼团等活动类型
-      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
-      formatList: [],
-      currentSelceted: [],
-      skuList: "",
-      isMask: false, //是否显示遮罩层
-      isClose: false, //是否可以点击遮罩关闭
-    };
-  },
-  props: [
-    "goodsDetail", //商品详情
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-  ],
-  watch: {
-    buyType: {
-      handler(val) {
-        this.buyType = val;
-      },
-      immediate: true,
-    },
-    selectSkuList: {
-      handler(val, oldval) {
-        this.$emit("changed", val);
-      },
-      deep: true,
-    },
-  },
-
-  methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
-    closeMask() {
-      this.$emit("closeBuy", false);
-    },
-
-    /**点击规格 */
-    handleClickSpec(val, index, specValue) {
-       this.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",
-        });
-      }
-    },
-
-    /**
-     * 添加到购物车或购买
-     */
-    addToCartOrBuy(val) {
-      if (!this.selectSkuList) {
-        uni.showToast({
-          title: "请选择规格商品",
-          icon: "none",
-        });
-        return;
-      }
-      let data = {
-        skuId: this.goodsDetail.id,
-        num: this.num,
-      };
-
-      if (val == "cart") {
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.showToast({
-              title: "商品已添加到购物车",
-              icon: "none",
-            });
-
-            this.$emit("queryCart");
-            this.closeMask();
-          }
-        });
-      } else {
-        // 判断是否拼团商品
-        if (this.buyType) {
-          data.cartType = "PINTUAN";
-        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
-          data.cartType = "VIRTUAL";
-        } else {
-          data.cartType = "BUY_NOW";
-        }
-
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.navigateTo({
-              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
-                this.addr.id || ""
-              }&parentOrder=${encodeURIComponent(
-                JSON.stringify(this.parentOrder)
-              )}`,
-            });
-          }
-        });
-      }
-    },
-
-    /**
-     * 直接购买
-     */
-    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)
-            )}`,
-          });
-        }
-      });
-    },
-
-    formatSku(list) {
-      // 格式化数据
-
-      let arr = [{}];
-      list.forEach((item, index) => {
-        item.specValues.forEach((spec, specIndex) => {
-          let name = spec.specName;
-          let values = {
-            value: spec.specValue,
-            quantity: item.quantity,
-          };
-          if (name === "images") {
-            return;
-          }
-
-          arr.forEach((arrItem, arrIndex) => {
-            if (
-              arrItem.name == name &&
-              arrItem.values &&
-              !arrItem.values.find((i) => i.value === values.value)
-            ) {
-              arrItem.values.push(values);
-            }
-
-            let keys = arr.map((key) => {
-              return key.name;
-            });
-            if (!keys.includes(name)) {
-              arr.push({
-                name: name,
-                values: [values],
-              });
-            }
-          });
-        });
-      });
-
-      arr.shift();
-      this.formatList = arr;
-
-      list.forEach((item) => {
-        if (item.skuId === this.goodsDetail.id) {
-          item.specValues
-            .filter((i) => i.specName !== "images")
-            .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValue;
-
-              this.selectName = value.specValue;
-
-              this.selectSkuList = {
-                spec: value,
-                data: this.goodsDetail,
-              };
-            });
-        }
-      });
-
-      this.skuList = list;
-    },
-  },
-
-  mounted() {
-    this.formatSku(this.goodsSpec);
-
-    console.log(this.goodsDetail);
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "./popup.scss";
-
-.buy {
-  background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-.card {
-  background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-/deep/.u-icon-plus,
-.u-icon-minus,
-.u-icon-disabled {
-  height: 30rpx !important;
-  background: #fff !important;
-}
-
-.goods-skus-number {
-  justify-content: space-between;
-  display: flex;
-}
-
-/deep/ .uni-scroll-view {
-  overflow: hidden !important;
-}
-
-.active {
-  background: $price-light-color !important;
-  border: 2rpx solid $price-color;
-  font-weight: bold;
-  color: $price-color !important;
-  box-sizing: border-box;
-}
-
-.goods-skus-box {
-  overflow-y: auto;
-  height: 610rpx;
-  // #ifdef MP-WEIXIN
-  height: 570rpx;
-  // #endif
-  margin-bottom: 10rpx;
-}
-
-.goods-skus-view {
-  overflow: hidden;
-
-  .skus-view-list {
-    > .skus-view-item {
-      flex: 1;
-      padding: 0 36rpx;
-
-      overflow: hidden;
-      height: 60rpx;
-      line-height: 60rpx;
-      float: left;
-      text-align: center;
-      margin-left: 24rpx;
-      margin-bottom: 20rpx;
-      font-size: 22rpx;
-      color: #262626;
-      background: #f2f2f2;
-      border-radius: 30rpx;
-    }
-  }
-}
-
-.goods-header {
-  height: 200rpx;
-  display: flex;
-  align-items: center;
-  margin-bottom: 36rpx;
-}
-
-.goods-box {
-  padding: 50rpx 36rpx 0 36rpx;
-}
-
-.goods-skus {
-  padding: 0 20rpx;
-}
-
-.goods-price {
-  color: $price-color;
-  line-height: 80rpx;
-  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>
diff --git a/pages/cart/payment/popup/popup.js b/pages/cart/payment/popup/popup.js
deleted file mode 100644
index 2833633..0000000
--- a/pages/cart/payment/popup/popup.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-export default {
-    height:"1000rpx", //弹出层高度
-    mode:"bottom", //弹出层位置
-    radius:"32", //圆角 rpx,
-    close:false //能否点击遮罩退出
-}
\ No newline at end of file
diff --git a/pages/cart/payment/popup/popup.scss b/pages/cart/payment/popup/popup.scss
deleted file mode 100644
index d571c30..0000000
--- a/pages/cart/payment/popup/popup.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.view-class-title {
-    font-size: 26rpx;
-    color: #262626;
-
-    font-weight: 700;
-    height: 80rpx;
-    line-height: 80rpx;
-}
-.confirmBtn {
-    width: 90%;
-}
-.confirmBtn,
-.box-btn {
-    line-height: 80rpx;
-    height: 80rpx;
-    
-    background: $price-color;
-    color: #fff;
-    border-radius: 200px;
-    text-align: center;
-    margin: 5rpx auto;
-}
-
-.btns {
-    display: flex;
-    width: 100%;
-
-    margin: 0 auto;
-}
-.goods-price-bigshow {
-    font-size: 48rpx;
-    font-weight: bold;
-}
-.box-btn {
-    flex: 1;
-    margin: 0 10rpx;
-}
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index c3fa1b0..876e9df 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -263,7 +263,7 @@ import GoodsRecommend from "./product/goods/-goods-recommend"; //宝贝推荐
 import storeLayout from "./product/shop/-shop"; //店铺组件
 import Evaluation from "./product/evaluation/-evaluation"; //评价组件
 import GoodsSwiper from "./product/goods/-goods-swiper"; //轮播图组件
-import popupGoods from "./product/popup/goods"; //购物车商品的模块
+import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
 import popupAddress from "./product/popup/address"; //地址选择模块
 import shares from "@/components/m-share/index"; //分享
 import popups from "@/components/popups/popups"; //气泡框
diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue
index 8c89866..ee9fb51 100644
--- a/pages/product/product/popup/address.vue
+++ b/pages/product/product/popup/address.vue
@@ -27,7 +27,7 @@
   </u-popup>
 </template>
 <script>
-import setup from "./popup";
+import setup from "@/components/m-buy/popup.js";
 /************请求存储***************/
 
 import * as API_Address from "@/api/address.js";
@@ -157,7 +157,7 @@ export default {
   border-radius: 50%;
   border: 2rpx solid #ededed;
 }
-@import "./popup.scss";
+@import "@/components/m-buy/popup.scss";
 .view-box {
   height: 810rpx;
   // #ifdef MP-WEIXIN
diff --git a/pages/product/product/popup/goods.vue b/pages/product/product/popup/goods.vue
deleted file mode 100644
index eb98d57..0000000
--- a/pages/product/product/popup/goods.vue
+++ /dev/null
@@ -1,429 +0,0 @@
-<template>
-  <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
-      :mask-close-able="setup.close" :border-radius="setup.radius" @close="closeMask()">
-      <!-- 商品 -->
-      <view class="goods-box bottom">
-        <view class="goods-header">
-          <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
-              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
-          </view>
-          <view class="goods-skus">
-
-            <!-- 有活动商品价格 -->
-            <view class="goods-price " v-if="goodsDetail.promotionPrice">
-              <span 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">{{ pointDetail.points }}</span>
-                积分
-              </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>
-              <view :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>
-</template>
-<script>
-import * as API_trade from "@/api/trade.js";
-import setup from "./popup";
-
-export default {
-  data() {
-    return {
-      setup,
-      num: 1,
-      // 步进器的大小尺寸单位是 rpx
-      numberBox: {
-        width: "50",
-        height: "50",
-        size: "22",
-        color: "#333",
-        bgColor: "#fff",
-      },
-      selectName: "", //选中商品的昵称
-      selectSkuList: "", //选中商铺sku,
-      selectedSpecImg: "", //选中的图片路径
-      buyType: "", //用于存储促销，拼团等活动类型
-      parentOrder: "", //父级拼团活动的数据 - 如果是团员则有数据
-      formatList: [],
-      currentSelceted: [],
-      skuList: "",
-      isClose: false, //是否可以点击遮罩关闭
-    };
-  },
-  props: [
-    "goodsDetail", //商品详情
-    "buyMask",
-    "selectedSku",
-    "goodsSpec",
-    "addr",
-    "pointDetail", // 积分详情
-  ],
-  watch: {
-    buyType: {
-      handler(val) {
-        this.buyType = val;
-      },
-      immediate: true,
-    },
-    selectSkuList: {
-      handler(val, oldval) {
-        this.$emit("changed", val);
-      },
-      deep: true,
-    },
-  },
-
-  methods: {
-    // 格式化金钱  1999 --> [1999,00]
-    formatPrice(val) {
-      if (typeof val == "undefined") {
-        return val;
-      }
-      return val.toFixed(2).split(".");
-    },
-
-    closeMask() {
-      this.$emit("closeBuy", false);
-    },
-
-    /**点击规格 */
-    handleClickSpec(val, index, specValue) {
-      this.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",
-        });
-      }
-    },
-
-    /**
-     * 添加到购物车或购买
-     */
-    addToCartOrBuy(val) {
-      if (!this.selectSkuList) {
-        uni.showToast({
-          title: "请选择规格商品",
-          icon: "none",
-        });
-        return;
-      }
-      let data = {
-        skuId: this.goodsDetail.id,
-        num: this.num,
-      };
-
-      if (val == "cart") {
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.showToast({
-              title: "商品已添加到购物车",
-              icon: "none",
-            });
-
-            this.$emit("queryCart");
-            this.closeMask();
-          }
-        });
-      } else {
-        // 判断是否拼团商品
-        if (this.buyType) {
-          data.cartType = "PINTUAN";
-        } else if (this.goodsDetail.goodsType == "VIRTUAL_GOODS") {
-          data.cartType = "VIRTUAL";
-        } else {
-          data.cartType = "BUY_NOW";
-        }
-
-        API_trade.addToCart(data).then((res) => {
-          if (res.data.code == 200) {
-            uni.navigateTo({
-              url: `/pages/order/fillorder?way=${data.cartType}&addr=${
-                this.addr.id || ""
-              }&parentOrder=${encodeURIComponent(
-                JSON.stringify(this.parentOrder)
-              )}`,
-            });
-          }
-        });
-      }
-    },
-    formatSku(list) {
-      // 格式化数据
-      console.log(list);
-      let arr = [{}];
-      list.forEach((item, index) => {
-        item.specValues.forEach((spec, specIndex) => {
-          let name = spec.specName;
-          let values = {
-            value: spec.specValue,
-            quantity: item.quantity,
-            skuId: item.skuId,
-          };
-          if (name === "images") {
-            return;
-          }
-
-          arr.forEach((arrItem, arrIndex) => {
-            if (
-              arrItem.name == name &&
-              arrItem.values &&
-              !arrItem.values.find((i) => {
-                return i.value === values.value;
-              })
-            ) {
-              arrItem.values.push(values);
-            }
-
-            let keys = arr.map((key) => {
-              return key.name;
-            });
-            if (!keys.includes(name)) {
-              console.log(name, values);
-              arr.push({
-                name: name,
-                values: [values],
-              });
-            }
-          });
-        });
-      });
-
-      arr.shift();
-      this.formatList = arr;
-
-      list.forEach((item) => {
-        // 默认选中
-        if (item.skuId === this.goodsDetail.id) {
-          item.specValues
-            .filter((i) => i.specName !== "images")
-            .forEach((value, _index) => {
-              this.currentSelceted[_index] = value.specValue;
-
-              this.selectName = value.specValue;
-
-              this.selectSkuList = {
-                spec: value,
-                data: this.goodsDetail,
-              };
-            });
-        }
-      });
-
-      this.skuList = list;
-      // console.log(" this.skuList", this.skuList)
-    },
-  },
-
-  mounted() {
-    this.formatSku(this.goodsSpec);
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "./popup.scss";
-
-.buy {
-  background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-.card {
-  background-image: linear-gradient(135deg, #f2140c, #f2270c 70%, #f24d0c);
-  box-shadow: 0 2px 6px 0 rgba(255, 65, 66, 0.2);
-}
-
-/deep/.u-icon-plus,
-.u-icon-minus,
-.u-icon-disabled {
-  height: 30rpx !important;
-  background: #fff !important;
-}
-
-.goods-skus-number {
-  justify-content: space-between;
-  display: flex;
-}
-
-/deep/ .uni-scroll-view {
-  overflow: hidden !important;
-}
-
-.active {
-  background: $price-light-color !important;
-  border: 2rpx solid $price-color;
-  font-weight: bold;
-  color: $price-color !important;
-  box-sizing: border-box;
-}
-
-.goods-skus-box {
-  overflow-y: auto;
-  height: 610rpx;
-  // #ifdef MP-WEIXIN
-  height: 570rpx;
-  // #endif
-  margin-bottom: 10rpx;
-}
-
-.goods-skus-view {
-  overflow: hidden;
-
-  .skus-view-list {
-    > .skus-view-item {
-      flex: 1;
-      padding: 0 36rpx;
-
-      overflow: hidden;
-      height: 60rpx;
-      line-height: 60rpx;
-      float: left;
-      text-align: center;
-      margin-left: 24rpx;
-      margin-bottom: 20rpx;
-      font-size: 22rpx;
-      color: #262626;
-      background: #f2f2f2;
-      border-radius: 30rpx;
-    }
-  }
-}
-
-.goods-header {
-  height: 200rpx;
-  display: flex;
-  align-items: center;
-  margin-bottom: 36rpx;
-}
-
-.goods-box {
-  padding: 50rpx 36rpx 0 36rpx;
-}
-
-.goods-skus {
-  padding: 0 20rpx;
-}
-
-.goods-price {
-  color: $price-color;
-  line-height: 80rpx;
-  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>
diff --git a/pages/product/product/popup/popup.scss b/pages/product/product/popup/popup.scss
deleted file mode 100644
index d571c30..0000000
--- a/pages/product/product/popup/popup.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.view-class-title {
-    font-size: 26rpx;
-    color: #262626;
-
-    font-weight: 700;
-    height: 80rpx;
-    line-height: 80rpx;
-}
-.confirmBtn {
-    width: 90%;
-}
-.confirmBtn,
-.box-btn {
-    line-height: 80rpx;
-    height: 80rpx;
-    
-    background: $price-color;
-    color: #fff;
-    border-radius: 200px;
-    text-align: center;
-    margin: 5rpx auto;
-}
-
-.btns {
-    display: flex;
-    width: 100%;
-
-    margin: 0 auto;
-}
-.goods-price-bigshow {
-    font-size: 48rpx;
-    font-weight: bold;
-}
-.box-btn {
-    flex: 1;
-    margin: 0 10rpx;
-}
diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue
index 697e97a..39bc09d 100644
--- a/pages/promotion/bargain/detail.vue
+++ b/pages/promotion/bargain/detail.vue
@@ -496,6 +496,11 @@ page {
   > .user-name {
     > div:nth-of-type(1) {
       font-size: 28rpx;
+      max-width: 300rpx;
+      overflow: hidden;
+      word-wrap: normal;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
     > div:nth-last-of-type(1) {
       font-size: 24rpx;