cxc/yshopb2c-qd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.6发布：新增砍价功能,新增加锁功能,修复其他bug

Browse Source
This commit is contained in:
hupeng
2019-12-23 20:10:03 +08:00
parent d2585cdd8b
commit 1ccc3e7092
5 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/activity/bargain/form.vue
View File

@ -1,16 +1,18 @@
<template>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '开启砍价'" width="900px">
<el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
<el-form-item label="砍价名称" >
<el-form-item label="砍价活动名称" >
<el-input v-model="form.title" style="width: 500px;"/>
</el-form-item>
<el-form-item label="砍价简介" >
<el-form-item label="砍价活动简介" >
<el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea"/>
</el-form-item>
<el-form-item label="砍价产品名称" >
<el-input v-model="form.storeName" style="width: 500px;" />
</el-form-item>
<el-form-item label="单位" >
<el-input v-model="form.unitName" style="width: 500px;"/>
</el-form-item>
<el-form-item label="秒杀开始时间" >
<template>
<el-date-picker
@ -41,17 +43,13 @@
<el-form-item label="销量" >
<el-input-number v-model="form.sales" />
</el-form-item>
<!-- <el-form-item label="砍价产品名称" >-->
<!-- <el-input v-model="form.storeName" />-->
<!-- </el-form-item>-->
<el-form-item label="砍价金额" >
<el-input-number v-model="form.price" />
</el-form-item>
<el-form-item label="允许砍到最低价" >
<el-form-item label="最低购买价" >
<el-input-number v-model="form.minPrice" />
</el-form-item>
<el-form-item label="限购" >
<el-form-item label="允许购买数量" >
<el-input-number v-model="form.num" />
</el-form-item>
<el-form-item label="单次砍最高价" >
@ -60,26 +58,12 @@
<el-form-item label="单次砍最低价" >
<el-input-number v-model="form.bargainMinPrice" />
</el-form-item>
<el-form-item label="用户每次砍价的次数" >
<el-input-number v-model="form.bargainNum" />
</el-form-item>
<el-form-item label="反多少积分" >
<el-input-number v-model="form.giveIntegral" />
</el-form-item>
<el-form-item label="砍价状态" >
<el-radio v-model="form.status" :label="1">到砍价时间自动开启</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 110px;">到砍价时间不自动开启</el-radio>
</el-form-item>
<el-form-item label="成本价" >
<el-input-number v-model="form.cost" />
</el-form-item>
<el-form-item label="排序" >
<el-input-number v-model="form.sort" />
</el-form-item>
<el-form-item label="是否推荐" >
<el-radio v-model="form.isHot" :label="1">是</el-radio>
<el-radio v-model="form.isHot" :label="0" style="width: 110px;">否</el-radio>
</el-form-item>
<el-form-item label="是否包邮" >
<el-radio v-model="form.isPostage" :label="1">是</el-radio>
<el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
@ -87,6 +71,10 @@
<el-form-item label="邮费" v-if="form.isPostage ===0">
<el-input-number v-model="form.postage" />
</el-form-item>
<el-form-item label="活动状态" >
<el-radio v-model="form.status" :label="1">开启</el-radio>
<el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
</el-form-item>
<el-form-item label="砍价规则" >
<editor v-model="form.rule" />
</el-form-item>

21
src/views/activity/bargain/index.vue
View File

@ -3,21 +3,11 @@
<!--工具栏-->
<div class="head-container">
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="砍价产品ID"/>
<el-table-column prop="title" label="砍价标题"/>
<el-table-column prop="info" label="砍价简介"/>
<el-table-column prop="image" label="砍价图片">
@ -25,9 +15,14 @@
<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
</template>
</el-table-column>
<el-table-column prop="unitName" label="单位名称"/>
<el-table-column prop="price" label="砍价价格"/>
<el-table-column prop="price" label="砍价区间">
<template slot-scope="scope">
<span>{{ scope.row.bargainMinPrice }}~{{ scope.row.bargainMaxPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="minPrice" label="最低价"/>
<el-table-column prop="stock" label="库存"/>
<el-table-column prop="sales" label="销量"/>
<el-table-column prop="startTime" label="开始时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.startTime) }}</span>
@ -38,9 +33,7 @@
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="storeName" label="砍价产品名称"/>-->
<el-table-column prop="look" label="浏览量"/>
<el-table-column prop="share" label="分享量"/>
<el-table-column v-if="checkPermission(['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>