Browse Source

1.3版本发布

master
hupeng 5 years ago
parent
commit
185fc51e1d
  1. 28
      README.md
  2. 2
      src/views/activity/combination/form.vue
  3. 9
      src/views/activity/combination/index.vue
  4. 69
      src/views/activity/combinlist/index.vue
  5. 2
      src/views/shop/order/index.vue

28
README.md

@ -72,28 +72,28 @@ yshop基于当前流行技术组合: SpringBoot2+Jpa+MybatisPlus+SpringSecurit
<table> <table>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194017_9207632f_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1107/194017_9207632f_477893.png"/></td>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194030_70f5ce92_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/230257_5844f5f1_477893.png"/></td>
</tr> </tr>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194114_cd0b06ce_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/230051_971db503_477893.png "/></td>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194130_abb4f788_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/230342_f379583e_477893.png"/></td>
</tr> </tr>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194147_63de73f4_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/230224_5f0dec5d_477893.png"/></td>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194207_7b3b1f53_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1107/194207_7b3b1f53_477893.png"/></td>
</tr> </tr>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194217_3f47214f_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/230424_f01fca77_477893.png"/></td>
<td></td> <td></td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201443_df1cc3a6_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/231156_df0430c8_477893.jpeg"/></td>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201540_ef6123a9_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/231246_797725e6_477893.jpeg"/></td>
</tr> </tr>
<tr> <tr>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201601_acd0ccd3_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1121/231335_7d732dbd_477893.jpeg"/></td>
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201622_f913b59c_477893.png"/></td> <td><img src="https://images.gitee.com/uploads/images/2019/1107/201622_f913b59c_477893.png"/></td>
</tr> </tr>
<tr> <tr>
@ -127,10 +127,14 @@ yshop基于当前流行技术组合: SpringBoot2+Jpa+MybatisPlus+SpringSecurit
#### 项目发布明细 #### 项目发布明细
1.0版本
1.1版本新增积分与优惠券抵扣 - 1.0版本
1.2版本分销功能已经发布 - 1.1版本新增积分与优惠券抵扣
1.2.1增加了未付款订单取消功能库存销量退出、优惠券、积分功能,个人中心增加了积分流水 - 1.2版本分销功能已经发布
- 1.2.1增加了未付款订单取消功能库存销量退出、优惠券、积分功能,个人中心增加了积分流水
- 1.3版本新增拼团功能,已经发布
- 1.4版本规划:补充公众号功能、新增redisson队列、发布mpvue小程序
#### 反馈交流 #### 反馈交流
- QQ交流群:907721261 - QQ交流群:907721261

2
src/views/activity/combination/form.vue

@ -160,7 +160,7 @@ export default {
edit(this.form).then(res => { edit(this.form).then(res => {
this.resetForm() this.resetForm()
this.$notify({ this.$notify({
title: '修改成功', title: '操作成功',
type: 'success', type: 'success',
duration: 2500 duration: 2500
}) })

9
src/views/activity/combination/index.vue

@ -9,15 +9,6 @@
</el-select> </el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
</div>
</div> </div>
<!--表单组件--> <!--表单组件-->
<eForm ref="form" :is-add="isAdd"/> <eForm ref="form" :is-add="isAdd"/>

69
src/views/activity/combinlist/index.vue

@ -3,51 +3,41 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
</div>
</div> </div>
<!--表单组件--> <!--表单组件-->
<eForm ref="form" :is-add="isAdd"/> <eForm ref="form" :is-add="isAdd"/>
<!--表格渲染--> <!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;"> <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/> <el-table-column prop="id" label="id"/>
<el-table-column prop="uid" label="用户id"/> <el-table-column prop="uid" label="开团团长" width="150">
<el-table-column prop="orderId" label="订单id 生成"/>
<el-table-column prop="orderIdKey" label="订单id 数据库"/>
<el-table-column prop="totalNum" label="购买商品个数"/>
<el-table-column prop="totalPrice" label="购买总金额"/>
<el-table-column prop="cid" label="拼团产品id"/>
<el-table-column prop="pid" label="产品id"/>
<el-table-column prop="people" label="拼图总人数"/>
<el-table-column prop="price" label="拼团产品单价"/>
<el-table-column prop="addTime" label="开始时间"/>
<el-table-column prop="stopTime" label="stopTime"/>
<el-table-column prop="kId" label="团长id 0为团长"/>
<el-table-column prop="isTpl" label="是否发送模板消息0未发送1已发送"/>
<el-table-column prop="isRefund" label="是否退款 0未退款 1已退款"/>
<el-table-column prop="status" label="状态1进行中2已完成3未完成"/>
<el-table-column v-if="checkPermission(['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_EDIT','YXSTOREPINK_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/> <span>{{ scope.row.nickname }}/{{ scope.row.uid }}</span>
<el-popover </template>
v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_DELETE']" </el-table-column>
:ref="scope.row.id" <el-table-column label="开团时间">
placement="top" <template slot-scope="scope">
width="180"> <span>{{ formatTimeTwo(scope.row.addTime) }}</span>
<p>确定删除本条数据吗</p> </template>
<div style="text-align: right; margin: 0"> </el-table-column>
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button> <el-table-column label="拼团产品">
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button> <template slot-scope="scope">
</div> <span>{{ scope.row.title }}/{{ scope.row.cid }}</span>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/> </template>
</el-popover> </el-table-column>
<el-table-column prop="orderId" label="订单号" width="150"/>
<el-table-column prop="totalPrice" label="拼团价"/>
<el-table-column prop="people" label="几人团"/>
<el-table-column prop="countPeople" label="几人参加"/>
<el-table-column label="结束时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span v-if="scope.row.status == 1">进行中</span>
<span v-else-if="scope.row.status == 2">已完成</span>
<span v-else>未完成</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -67,6 +57,7 @@ import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData' import initData from '@/mixins/initData'
import { del } from '@/api/yxStorePink' import { del } from '@/api/yxStorePink'
import eForm from './form' import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
export default { export default {
components: { eForm }, components: { eForm },
mixins: [initData], mixins: [initData],
@ -81,6 +72,8 @@ export default {
}) })
}, },
methods: { methods: {
parseTime,
formatTimeTwo,
checkPermission, checkPermission,
beforeInit() { beforeInit() {
this.url = 'api/yxStorePink' this.url = 'api/yxStorePink'

2
src/views/shop/order/index.vue

@ -28,7 +28,7 @@
<el-table-column prop="orderId" width="140" label="订单号"> <el-table-column prop="orderId" width="140" label="订单号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.orderId }}</span> <span>{{ scope.row.orderId }}</span>
<p>[{{ scope.row.pinkName }}]</p> <p>{{ scope.row.pinkName }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="realName" label="用户姓名"/> <el-table-column prop="realName" label="用户姓名"/>

Loading…
Cancel
Save