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

zxl

6 小时以前 9797e46619f64bddb78d4b4eaa03d53069ac2ba4

 manager/src/views/activity-prize/index.vue

@@ -91,6 +91,14 @@
              :disabled="!row.canSet"
              @click="setPrize(row)"
            >奖品设置</Button>
            <Button
              type="info"
              size="small"
              :disabled="row.popup"
              @click="setPopup(row)"
              >
              弹窗活动
            </Button>
<!--            <Button-->
<!--              type="info"-->
<!--              size="small"-->
@@ -490,7 +498,8 @@
  del,
  addActivityRefPrizeList,
  getActivityRefPrizeByActivityId,
  publishPrizeActivity
  publishPrizeActivity,
  popup
} from '@/api/activity-prize.js'
import {delByKey, uploadFileByLmk} from "../../api/common";

@@ -747,6 +756,16 @@
    this.init();
  },
  methods: {
    setPopup(row){
      popup(row.id).then(res =>{
        if (res.code === 200){
          this.$Message.success(res.msg)
          this.getPage()
        }else {
          this.$Message.error(res.msg)
        }
      })
    },
    handleProbabilityInput(event, index) {
      const inputValue = event.target.value;
      let numericValue = parseFloat(inputValue);