diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue index 47de6e20..37cd6eb8 100644 --- a/packages/bigscreen/designer/components/form/DataConfig.vue +++ b/packages/bigscreen/designer/components/form/DataConfig.vue @@ -38,10 +38,10 @@
+ v-for="item in sourceData" + :key="item.id" + :label="item.description" + :value="item.id">
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue index 85a2474f..0a249a5f 100644 --- a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue +++ b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue @@ -377,12 +377,12 @@ } for (let i = 0; i < this.form.goodsList.length; i++) { - if (!this.form.goodsList[i].integralPrice) { - return this.$message.error('请输入兑换所需积分') - } - if (!this.form.goodsList[i].payMoney && this.form.goodsList[i].goods.type === '1') { - return this.$message.error('请输入兑换后补差价金额') - } + // if (!this.form.goodsList[i].integralPrice) { + // return this.$message.error('请输入兑换所需积分') + // } + // if (!this.form.goodsList[i].payMoney && this.form.goodsList[i].goods.type === '1') { + // return this.$message.error('请输入兑换后补差价金额') + // } if (!this.form.goodsList[i].stock) { return this.$message.error('请输入库存') } diff --git a/project/shuzipingchang/app/AppIntegratingSupermarket/components/AddStore.vue b/project/shuzipingchang/app/AppIntegratingSupermarket/components/AddStore.vue index 1f70a6ce..7d5a25f5 100644 --- a/project/shuzipingchang/app/AppIntegratingSupermarket/components/AddStore.vue +++ b/project/shuzipingchang/app/AppIntegratingSupermarket/components/AddStore.vue @@ -372,12 +372,12 @@ } for (let i = 0; i < this.form.goodsList.length; i++) { - if (!this.form.goodsList[i].integralPrice) { - return this.$message.error('请输入兑换所需积分') - } - if (!this.form.goodsList[i].payMoney && this.form.goodsList[i].goods.type === '1') { - return this.$message.error('请输入兑换后补差价金额') - } + // if (!this.form.goodsList[i].integralPrice) { + // return this.$message.error('请输入兑换所需积分') + // } + // if (!this.form.goodsList[i].payMoney && this.form.goodsList[i].goods.type === '1') { + // return this.$message.error('请输入兑换后补差价金额') + // } if (!this.form.goodsList[i].stock) { return this.$message.error('请输入库存') }