Skip to content

G
gxpt_web
Commit dd01e291 by 吕明尚
Options

修改后台管理系统页面

parent b3870110
Showing with 79 additions and 53 deletions
src/views/system/IntegralLog/index.vue
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动积分" prop="variableIntegral"/>
<el-table-column align="center" label="当前积分" prop="currentIntegral"/> <el-table-column align="center" label="当前积分" prop="currentIntegral"/>
<el-table-column align="center" label="变动积分" prop="variableIntegral"/>
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>--> <!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType"> <el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180"> <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>--> <!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
......
src/views/system/balanceLog/index.vue
...@@ -122,8 +122,9 @@ ...@@ -122,8 +122,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动金额" prop="variableAmount"/>
<el-table-column align="center" label="当前余额" prop="currentBalance"/> <el-table-column align="center" label="当前余额" prop="currentBalance"/>
<el-table-column align="center" label="变动金额" prop="variableAmount"/>
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>--> <!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType"> <el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180"> <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>--> <!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
......
src/views/system/coupon/durationIndex.vue
...@@ -243,14 +243,20 @@ ...@@ -243,14 +243,20 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="优惠券原始金额" prop="originalPrice">-->
<!-- <el-input v-model="form.originalPrice" placeholder="请输入优惠券原始金额"/>-->
<!-- </el-form-item>-->
<el-form-item label="优惠券原始金额" prop="originalPrice"> <el-form-item label="优惠券原始金额" prop="originalPrice">
<el-input v-model="form.originalPrice" placeholder="请输入优惠券原始金额"/> <el-input-number v-model="form.originalPrice" :max="999" :min="0" placeholder="请输入优惠券原始金额"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="优惠券售卖金额" prop="couponPayPrice">--> <!-- <el-form-item label="优惠券售卖金额" prop="couponPayPrice">-->
<!-- <el-input v-model="form.couponPayPrice" placeholder="请输入优惠券售卖金额"/>--> <!-- <el-input v-model="form.couponPayPrice" placeholder="请输入优惠券售卖金额"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="优惠券促销金额" prop="salePrice">-->
<!-- <el-input v-model="form.salePrice" placeholder="请输入优惠券促销金额"/>-->
<!-- </el-form-item>-->
<el-form-item label="优惠券促销金额" prop="salePrice"> <el-form-item label="优惠券促销金额" prop="salePrice">
<el-input v-model="form.salePrice" placeholder="请输入优惠券促销金额"/> <el-input-number v-model="form.salePrice" :max="999" :min="0" placeholder="优惠券促销金额"/>
</el-form-item> </el-form-item>
<el-form-item label="时长" prop="duration"> <el-form-item label="时长" prop="duration">
<el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" placeholder="请输入时长"/> <el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" placeholder="请输入时长"/>
...@@ -395,13 +401,16 @@ ...@@ -395,13 +401,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="门槛金额" prop="miniPrice"> <!-- <el-form-item label="门槛金额" prop="miniPrice">-->
<el-input-number v-model="sumForm.miniPrice" :max="9999" :min="0" label="优惠卷数量"/> <!-- <el-input-number v-model="sumForm.miniPrice" :max="9999" :min="0" label="优惠卷数量"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="数量" prop="number"> <el-form-item label="优惠券原始金额" prop="originalPrice">
<el-input-number v-model="sumForm.number" :max="9999" :min="1" label="优惠卷数量"/> <el-input-number v-model="sumForm.originalPrice" :max="999" :min="0" placeholder="优惠券原始金额"/>
<!-- <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />-->
</el-form-item> </el-form-item>
<!-- <el-form-item label="数量" prop="number">-->
<!-- <el-input-number v-model="sumForm.number" :max="9999" :min="1" label="优惠卷数量"/>-->
<!-- &lt;!&ndash; <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />&ndash;&gt;-->
<!-- </el-form-item>-->
<el-form-item label="平台类型" prop="platformType"> <el-form-item label="平台类型" prop="platformType">
<el-select v-model="sumForm.platformType" clearable disabled placeholder="请选择平台类型"> <el-select v-model="sumForm.platformType" clearable disabled placeholder="请选择平台类型">
<el-option <el-option
......
src/views/system/durationLog/index.vue
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动时长" prop="variableDuration"/>
<el-table-column align="center" label="当前时长" prop="currentDuration"/> <el-table-column align="center" label="当前时长" prop="currentDuration"/>
<el-table-column align="center" label="变动时长" prop="variableDuration"/>
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>--> <!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType"> <el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180"> <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>--> <!-- <el-table-column align="center" label="是否删除" prop="isDelete"/>-->
......
src/views/system/equityMembersOrder/index.vue
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<el-table v-loading="loading" :data="equityMembersOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="equityMembersOrderList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/> <el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column align="center" label="ID" prop="id"/>--> <!-- <el-table-column align="center" label="ID" prop="id"/>-->
<el-table-column align="center" label="权益订单编号" prop="equityOrderNo" width="190"/>
<el-table-column align="center" label="会员昵称" prop="nickName"/> <el-table-column align="center" label="会员昵称" prop="nickName"/>
<el-table-column align="center" label="会员头像" prop="avatar" width="100"> <el-table-column align="center" label="会员头像" prop="avatar" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -122,6 +121,7 @@ ...@@ -122,6 +121,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="权益订单编号" prop="equityOrderNo" width="190"/>
<el-table-column align="center" label="订单金额" prop="payPrice"/> <el-table-column align="center" label="订单金额" prop="payPrice"/>
<!-- <el-table-column align="center" label="权益会员订单配置id" prop="equityMembersConfigId"/>--> <!-- <el-table-column align="center" label="权益会员订单配置id" prop="equityMembersConfigId"/>-->
<el-table-column align="center" label="支付类型" prop="payType"> <el-table-column align="center" label="支付类型" prop="payType">
......
src/views/system/memberProgressLog/index.vue
...@@ -119,8 +119,9 @@ ...@@ -119,8 +119,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="会员手机号" prop="phone"/> <el-table-column align="center" label="会员手机号" prop="phone"/>
<el-table-column align="center" label="变动进度" prop="variableProgress"/>
<el-table-column align="center" label="当前进度" prop="currentProgress"/> <el-table-column align="center" label="当前进度" prop="currentProgress"/>
<el-table-column align="center" label="变动进度" prop="variableProgress"/>
<!-- <el-table-column align="center" label="操作类型" prop="operationType"/>--> <!-- <el-table-column align="center" label="操作类型" prop="operationType"/>-->
<el-table-column align="center" label="操作类型" prop="operationType"> <el-table-column align="center" label="操作类型" prop="operationType">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作时间" prop="operationTime" width="180"> <el-table-column align="center" label="操作时间" prop="operationTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}npm run dev') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="是否删除" align="center" prop="isDelete" />--> <!-- <el-table-column label="是否删除" align="center" prop="isDelete" />-->
......
src/views/system/order/index.vue
...@@ -239,10 +239,13 @@ ...@@ -239,10 +239,13 @@
<dict-tag :options="dict.type.store_platform_type" :value="scope.row.platformType"/> <dict-tag :options="dict.type.store_platform_type" :value="scope.row.platformType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="columns[10].visible" align="center" label="优惠券id" prop="couponSkuId" width="100"/> <!-- <el-table-column v-if="columns[10].visible" align="center" label="优惠券id" prop="couponSkuId" width="100"/>-->
<el-table-column v-if="columns[11].visible" label="优惠券名称" align="center" prop="couponName" width="100"/> <el-table-column v-if="columns[11].visible" label="优惠券名称" align="center" prop="couponName" width="100"/>
<el-table-column v-if="columns[12].visible" align="center" label="优惠券原价" prop="couponPrice" width="100"/> <el-table-column v-if="columns[12].visible" align="center" label="优惠券原价" prop="couponPrice" width="100"/>
<el-table-column v-if="columns[13].visible" align="center" label="优惠券促销价" prop="couponPayPrice" width="100"/> <el-table-column v-if="columns[13].visible" align="center" label="优惠券促销价" prop="couponPayPrice" width="100"/>
<el-table-column v-if="columns[25].visible" align="center" label="使用时长" prop="duration"/>
<el-table-column v-if="columns[26].visible" align="center" label="使用余额" prop="balance"/>
<el-table-column v-if="columns[27].visible" align="center" label="优惠比例" prop="discountRatio"/>
<el-table-column v-if="columns[14].visible" align="center" label="订单总价" prop="totalPrice"/> <el-table-column v-if="columns[14].visible" align="center" label="订单总价" prop="totalPrice"/>
<el-table-column v-if="columns[15].visible" align="center" label="实际支付金额" prop="payPrice" width="100"/> <el-table-column v-if="columns[15].visible" align="center" label="实际支付金额" prop="payPrice" width="100"/>
<el-table-column v-if="columns[16].visible" align="center" label="支付时间" prop="payTime" width="100"> <el-table-column v-if="columns[16].visible" align="center" label="支付时间" prop="payTime" width="100">
...@@ -710,7 +713,11 @@ export default { ...@@ -710,7 +713,11 @@ export default {
{key: 21, label: `到店时间`, visible: false}, {key: 21, label: `到店时间`, visible: false},
{key: 22, label: `订单状态`, visible: true}, {key: 22, label: `订单状态`, visible: true},
{key: 23, label: `下单时间`, visible: false}, {key: 23, label: `下单时间`, visible: false},
{key: 24, label: `备注`, visible: false} {key: 24, label: `备注`, visible: false},
{key: 25, label: `使用时长`, visible: false},
{key: 26, label: `使用余额`, visible: false},
{key: 27, label: `优惠比例`, visible: false},
], ],
changeOpen: false, changeOpen: false,
changeForm: { changeForm: {
......
src/views/system/pack/index.vue
...@@ -202,11 +202,19 @@ ...@@ -202,11 +202,19 @@
<el-form-item label="套餐名称" prop="name"> <el-form-item label="套餐名称" prop="name">
<el-input v-model="form.name" placeholder="请输入套餐名称" /> <el-input v-model="form.name" placeholder="请输入套餐名称" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="时长" prop="duration">-->
<!-- <el-input v-model="form.duration" placeholder="请输入时长" />-->
<!-- </el-form-item>-->
<el-form-item label="时长" prop="duration"> <el-form-item label="时长" prop="duration">
<el-input v-model="form.duration" placeholder="请输入时长" /> <!--指定0到23范围的数字-->
<el-input-number v-model="form.duration" :max="24" :min="0.5" :step="0.5" label="时长"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="金额" prop="price">-->
<!-- <el-input v-model="form.price" placeholder="请输入金额" />-->
<!-- </el-form-item>-->
<el-form-item label="金额" prop="price"> <el-form-item label="金额" prop="price">
<el-input v-model="form.price" placeholder="请输入金额" /> <!--指定0到23范围的数字-->
<el-input-number v-model="form.price" :max="999" :min="0" label="时长"/>
</el-form-item> </el-form-item>
<el-form-item label="套餐开始时段" prop="packaStartPeriod"> <el-form-item label="套餐开始时段" prop="packaStartPeriod">
<!--指定0到23范围的数字--> <!--指定0到23范围的数字-->
......
src/views/system/records/index.vue
...@@ -8,38 +8,38 @@ ...@@ -8,38 +8,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['system:records:add']" <!-- v-hasPermi="['system:records:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:records:edit']" <!-- v-hasPermi="['system:records:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:records:remove']" <!-- v-hasPermi="['system:records:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
......
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