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

yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

Browse Source
This commit is contained in:
hupeng
2020-01-07 23:32:27 +08:00
parent 24753759f4
commit b6cc8046db
451 changed files with 13868 additions and 8883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/views/activity/combination/form.vue
View File

@ -1,73 +1,73 @@
<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-input v-model="form.title" style="width: 500px;"/>
<el-form-item label="拼团名称">
<el-input v-model="form.title" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团简介" >
<el-input v-model="form.info" style="width: 500px;"/>
<el-form-item label="拼团简介">
<el-input v-model="form.info" style="width: 500px;" />
</el-form-item>
<el-form-item label="单位" >
<el-input v-model="form.unitName" style="width: 500px;"/>
<el-form-item label="单位">
<el-input v-model="form.unitName" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团开始时间" >
<el-form-item label="拼团开始时间">
<template>
<el-date-picker
v-model="form.startTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="拼团结束时间" >
<el-form-item label="拼团结束时间">
<template>
<el-date-picker
v-model="form.endTimeDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</template>
</el-form-item>
<el-form-item label="产品主图片" >
<pic-upload v-model="form.image" style="width: 500px;"/>
<el-form-item label="产品主图片">
<pic-upload v-model="form.image" style="width: 500px;" />
</el-form-item>
<el-form-item label="产品轮播图" >
<mulpic-upload v-model="form.images" style="width: 500px;"/>
<el-form-item label="产品轮播图">
<mulpic-upload v-model="form.images" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团时效(单位小时)" >
<el-input v-model="form.effectiveTime" style="width: 500px;"/>
<el-form-item label="拼团时效(单位小时)">
<el-input v-model="form.effectiveTime" style="width: 500px;" />
</el-form-item>
<el-form-item label="拼团价" >
<el-input v-model="form.price"/>
<el-form-item label="拼团价">
<el-input v-model="form.price" />
</el-form-item>
<el-form-item label="拼团人数" >
<el-input v-model="form.people"/>
<el-form-item label="拼团人数">
<el-input v-model="form.people" />
</el-form-item>
<el-form-item label="库存" >
<el-form-item label="库存">
<el-input v-model="form.stock" />
</el-form-item>
<el-form-item label="销量" >
<el-form-item label="销量">
<el-input v-model="form.sales" />
</el-form-item>
<el-form-item label="排序" >
<el-input v-model="form.sort"/>
<el-form-item label="排序">
<el-input v-model="form.sort" />
</el-form-item>
<el-form-item label="邮费" >
<el-input v-model="form.postage"/>
<el-form-item label="邮费">
<el-input v-model="form.postage" />
</el-form-item>
<el-form-item label="是否包邮" >
<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>
</el-form-item>
<el-form-item label="热门推荐" >
<el-form-item label="热门推荐">
<el-radio v-model="form.isHost" :label="1">是</el-radio>
<el-radio v-model="form.isHost" :label="0" style="width: 200px;">否</el-radio>
</el-form-item>
<el-form-item label="活动状态" >
<el-form-item label="活动状态">
<el-radio v-model="form.isShow" :label="1">开启</el-radio>
<el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
</el-form-item>
<el-form-item label="详情" >
<el-form-item label="详情">
<editor v-model="form.description" />
</el-form-item>
</el-form>

46
src/views/activity/combination/index.vue
View File

@ -3,38 +3,38 @@
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
<el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
</el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
</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-column prop="id" label="id"/>
<el-table-column prop="productId" label="商品id"/>
<el-table-column prop="id" label="id" />
<el-table-column prop="productId" label="商品id" />
<el-table-column prop="image" label="产品主图">
<template slot-scope="scope">
<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="title" label="拼团名称"/>
<el-table-column prop="people" label="参团人数"/>
<el-table-column prop="price" label="拼团价"/>
<el-table-column prop="cost" label="原价"/>
<el-table-column prop="stock" label="库存"/>
<el-table-column prop="browse" label="浏览量"/>
<el-table-column prop="countPeopleAll" label="参与人数"/>
<el-table-column prop="countPeoplePink" label="成团数量"/>
<el-table-column prop="countPeopleBrowse" label="访客人数"/>
<el-table-column prop="title" label="拼团名称" />
<el-table-column prop="people" label="参团人数" />
<el-table-column prop="price" label="拼团价" />
<el-table-column prop="cost" label="原价" />
<el-table-column prop="stock" label="库存" />
<el-table-column prop="browse" label="浏览量" />
<el-table-column prop="countPeopleAll" label="参与人数" />
<el-table-column prop="countPeoplePink" label="成团数量" />
<el-table-column prop="countPeopleBrowse" label="访客人数" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div @click="onSale(scope.row.id,scope.row.isShow)">
<el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已开启</el-tag>
<el-tag style="cursor: pointer" v-else :type=" 'info' ">已关闭</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
</div>
</template>
</el-table-column>
@ -43,20 +43,21 @@
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column v-if="checkPermission(['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-button v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
<el-popover
v-permission="['ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
:ref="scope.row.id"
v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
placement="top"
width="180">
width="180"
>
<p>确定删除本条数据吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
</el-popover>
</template>
</el-table-column>
@ -68,13 +69,14 @@
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
@current-change="pageChange"
/>
</div>
</template>
<script>
import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import initData from '@/mixins/crud'
import { del, onsale } from '@/api/yxStoreCombination'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'