Skip to content

S
shareConfig
Commit 816d2e7c by crushh
Options

Merge branch 'feature/7月迭代' into dev

parents eb0fe570 43d6c079
Showing with 2 additions and 2 deletions
src/components/active-config/base-config.vue
...@@ -48,10 +48,10 @@ import baseConfig from '@/components/active-config/base-config.vue'; ...@@ -48,10 +48,10 @@ import baseConfig from '@/components/active-config/base-config.vue';
prop="cardCoupName" prop="cardCoupName"
> >
{{activeInfoData.cardCoupName}} {{activeInfoData.cardCoupName}}
<el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus!=null"> <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="!!activeInfoData.cardCoupStatus">
{{statusText[activeInfoData.cardCoupStatus]}} {{statusText[activeInfoData.cardCoupStatus]}}
</el-tag> </el-tag>
<el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus==null&&activeInfoData.cardCoupStock==0"> <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus==0&&activeInfoData.cardCoupStock==0">
库存不足 库存不足
</el-tag> </el-tag>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment