fix: 代码合并冲突解决

src/views/online-shop/goods-group.vue

@@ -267,7 +267,8 @@ async function addConfirm() {
         })
         obj.productIds = arr
       }
-      if (obj.time.length) {
+      console.log(obj, '商品分组的参数')
+      if (obj.time && obj.time.length) {
         obj.saleStartTime = obj.time[0]
         obj.saleEndTime = obj.time[1]
       }
@@ -278,6 +279,10 @@ async function addConfirm() {
           myDialogRefAdd.value.close()
         }
       } else {
+        if (obj.useTime == 0) {
+          obj.saleStartTime = null
+          obj.saleEndTime = null
+        }
         let res = await UserAPI.update(obj)
         if (res.code == 200) {
           ElMessage.success("编辑成功");

src/views/tool/Instead/components/goods-item.vue

@@ -13,10 +13,18 @@
       </div>
       <div class="">￥{{ item.lowPrice }}</div>
     </div>
-    <div class="status" v-if="item.isSoldStock || !item.isSale || !item.isSaleTime">
+    <div
+      class="status"
+      v-if="
+        item.isSoldStock ||
+        !item.isSale ||
+        !item.isSaleTime ||
+        (item.isStock && item.stockNumber * 1 <= 0)
+      "
+    >
       <svg-icon
         @click="ElMessage.error('该商品已售罄')"
-        v-if="item.isSoldStock"
+        v-if="item.isSoldStock || (item.isStock && item.stockNumber * 1 <= 0)"
         iconClass="shouqing"
         color="#fff"
         size="60"