Merge remote-tracking branch 'origin/dev' into send_coupon

peng

2025-09-11 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d

 seller/src/views/goods/goods-seller/goods.vue

@@ -95,10 +95,11 @@
        <template slot="goodsSlot" slot-scope="{ row }">
          <div style="margin-top: 5px; height: 90px; display: flex">
            <div style="">
              <img
              <img v-if="row.original"
                :src="row.original"
                style="height: 80px; margin-top: 3px; width: 70px"
              />
              <video :src="row.goodsVideo" v-else style="height: 80px; margin-top: 3px; width: 70px"></video>
            </div>

            <div style="margin-left: 13px">
@@ -332,6 +333,8 @@
              return h("Tag", { props: { color: "orange" } }, "零售");
            } else if (params.row.salesModel === "WHOLESALE") {
              return h("Tag", { props: { color: "magenta" } }, "批发");
            }  else if (params.row.salesModel === "PRESALE") {
              return h("Tag", { props: { color: "magenta" } }, "预售");
            } else {
              return h("Tag", { props: { color: "volcano" } }, "其他类型");
            }