From 053e5ce062f06e74589f8119b9477138ccffb449 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Tue, 29 Nov 2022 11:40:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BC=98=E5=8C=96=E6=89=B9?=
 =?UTF-8?q?=E5=8F=91=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BD=8E=E4=BA=8E=E8=B5=B7=E6=89=B9=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/goodsDetail/ShowGoods.vue  |  12 ++
 buyer/src/pages/GoodsList.vue                 | 103 +++++++++++-------
 2 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index 7b844042..7924be84 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -238,6 +238,7 @@
                 :disabled="skuDetail.quantity === 0"
                 v-model="count"
                 :precision="0.1"
+                @on-blur="changeCount"
               ></InputNumber>
               <span class="inventory"> 库存{{ skuDetail.quantity }}</span>
             </div>
@@ -317,6 +318,9 @@ export default {
       handler(val) {
         this.skuDetail = val.data;
         this.wholesaleList = val.wholesaleList;
+        if (this.wholesaleList && this.wholesaleList.length > 0) {
+          this.count = this.wholesaleList[0].num;
+        }
         this.swiperGoodsImg();
       },
       deep: true,
@@ -364,6 +368,14 @@ export default {
     },
   },
   methods: {
+    changeCount(val) {
+      if (this.wholesaleList && this.wholesaleList.length > 0) {
+        if (this.count <= this.wholesaleList[0].num) {
+          this.$Message.warning("购买数量不能小于起批数量");
+          this.count = this.wholesaleList[0].num;
+        }
+      }
+    },
     select(index, value) {
       // 选择规格
       this.$set(this.currentSelceted, index, value);
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 6ff52c06..3721b1c0 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -66,7 +66,7 @@
                   v-if="item.content.salesModel === 'WHOLESALE'"
                   class="goods-show-tag"
                   color="purple"
-                  >
+                >
                   批发
                 </Tag>
                 <span>{{ item.content.goodsName }}</span>
@@ -76,33 +76,30 @@
                 >人评价
               </div>
               <div class="goods-show-seller">
-                <Tag
-                  class="goods-show-buyer"
-                  v-if="item.content.selfOperated"
-                  size="default"
-                  color="error"
-                  >自营
-                </Tag>
-                <div class="goods-show-right">
-                  <div
-                    class="goods-show-middle"
-                    v-if="goodsListType.content.goodsType == 'VIRTUAL_GOODS'"
-                  >
-                    虚拟
-                  </div>
-                  <div
-                    class="goods-show-middle"
-                    v-else-if="
-                      goodsListType.content.goodsType == 'PHYSICAL_GOODS'
-                    "
-                  >
-                    实物
-                  </div>
-                </div>
                 <span class="text-bottom" style="color: #e4393c">{{
                   item.content.storeName
                 }}</span>
               </div>
+
+              <div class="goods-show-right">
+                <Tag class="goods-show-tag" color="red" v-if="item.content.selfOperated">
+                  自营
+                </Tag>
+                <Tag
+                  class="goods-show-tag" color="blue"
+                  v-if="goodsListType.content.goodsType == 'VIRTUAL_GOODS'"
+                >
+                  虚拟
+                </Tag>
+                <Tag
+                  class="goods-show-tag" color="blue"
+                  v-else-if="
+                    goodsListType.content.goodsType == 'PHYSICAL_GOODS'
+                  "
+                >
+                  实物
+                </Tag>
+              </div>
             </div>
           </div>
         </div>
@@ -257,11 +254,12 @@ export default {
 <style scoped lang="scss">
 @import "../assets/styles/goodsList.scss";
 .goods-show-info > .goods-show-seller > .goods-show-buyer {
-  height: 16px;
-  width: 30px;
+  width: 35px;
+  height: 17px;
   white-space: nowrap;
   line-height: 17px;
   text-align: center;
+  align-content: center;
   padding: 0 3px;
   background-color: #e23a3a;
 }
@@ -298,27 +296,48 @@ export default {
   border: 1px solid #ccc;
 }
 .goods-show-right {
-  width: 35px;
-  height: 17px;
-  // vertical-align:middle;
-  overflow: hidden;
-  margin-top: 1.5px;
-  margin-right: 5px;
-  line-height: 16px;
-  background: white;
-  border-radius: 4px;
-  margin-bottom: 5px;
+  display: flex;
+  flex-direction: row;
+  margin-top: 5px;
+}
+
+
+.goods-show-self {
   float: left;
+  height: 16px;
+  line-height: 16px;
+  padding: 0 3px;
+  margin-right: 3px;
+  overflow: hidden;
   text-align: center;
+  font-style: normal;
+  font-size: 12px;
+  background: #e23a3a;
+  color: #fff;
+  border-radius: 2px;
+}
+
+.goods-show-middle {
+  float: left;
+  height: 16px;
+  line-height: 16px;
+  padding: 0 3px;
+  margin-right: 3px;
+  overflow: hidden;
+  text-align: center;
+  font-style: normal;
+  font-size: 12px;
   border: 1px solid rgba(112, 123, 187, 0.8);
   color: rgba(112, 123, 187, 0.8);
 }
-.goods-show-middle:hover {
-  color: rgba(2, 15, 88, 0.6);
-  border: 0.2px solid rgba(0, 13, 87, 0.6);
-  border-radius: 4px;
-  line-height: 18px;
-}
+
+// .goods-show-middle:hover {
+//   color: rgba(2, 15, 88, 0.6);
+//   border: 0.2px solid rgba(0, 13, 87, 0.6);
+//   border-radius: 4px;
+//   line-height: 18px;
+// }
+
 .item-as-title {
   width: 100%;
   height: 36px;