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

peng

2025-09-11 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d

 manager/src/views/goods/goods-info/goodsDetail.vue

@@ -18,6 +18,9 @@
            <FormItem label="商品卖点">
              {{ goods.sellingPoint }}
            </FormItem>
            <FormItem label="抽成比例">
              {{ goods.commission }}%
            </FormItem>
            <FormItem label="商品参数">
             <div v-if="goods.goodsParamsDTOList && goods.goodsParamsDTOList.length" v-for="(item,index) in goods.goodsParamsDTOList" :key="index">
               <div style="margin-bottom: 10px; display: flex; align-items: center;" >
@@ -27,12 +30,23 @@
               </div>
             </div>
            </FormItem>
            <FormItem label="商品标签">
              <span v-for="(item ,index) in goodsTag" :key="index">
                {{index === goodsTag.length - 1  ? item.tagName: item.tagName +"，" }}
              </span>

            </FormItem>
          </div>
          <h4>商品交易信息</h4>
          <div class="form-item-view">
            <FormItem label="计量单位"> {{ goods.goodsUnit }}</FormItem>
            <FormItem label="销售模式">
              {{ goods.salesModel === "RETAIL" ? "零售型" : "批发型" }}
              <span v-if="goods.salesModel ==='RETAIL'">零售型</span>
              <span v-else-if="goods.salesModel ==='PRESALE'">预售</span>
              <span v-else-if="goods.salesModel ==='WHOLESALE'">批发型</span>
              <span v-else>其他类型</span>

<!--              {{ goods.salesModel === "RETAIL" ? "零售型" : "批发型" }}-->
            </FormItem>
            <FormItem label="销售规则" v-if="goods.salesModel !== 'RETAIL'">
              <Table
@@ -145,11 +159,13 @@
</template>
<script>
import { getGoodsDetail } from "@/api/goods";
import {getGoodSTagById} from "@/api/goods-tag"
import {getSts} from '@/api/file'
export default {
  name: "goodsDetail",
  data() {
    return {
      goodsTag:[],
      goods: {}, // 商品信息
      previewGoodsPicture: "", // 预览图片
      goodsPictureVisible: false, // 预览图片模态框
@@ -190,8 +206,17 @@
  },
  mounted() {
    this.initGoods(this.$route.query.id);
    this.getGoodSTagById(this.$route.query.id);

  },
  methods: {
    getGoodSTagById(id){
      getGoodSTagById(id).then(res =>{
        if (res.code === 200){
          this.goodsTag = res.data;
        }
      })
    },
    // 初始化数据，获取商品详情
    initGoods(id) {
      getGoodsDetail(id).then((res) => {