Skip to content

G
gxpt_web
Commit d7cd9c8d by YG8999
Options

Merge remote-tracking branch 'origin/main'

parents 194e89f1 dcde33eb
Showing with 10 additions and 8 deletions
src/views/system/consumerCoupon/index.vue
...@@ -165,10 +165,10 @@ ...@@ -165,10 +165,10 @@
<!--序号--> <!--序号-->
<el-table-column type="index" width="55" align="center" label="序号"/> <el-table-column type="index" width="55" align="center" label="序号"/>
<!-- <el-table-column label="ID" align="center" prop="id"/>--> <!-- <el-table-column label="ID" align="center" prop="id"/>-->
<el-table-column label="用户手机号" align="center" prop="phone"/> <el-table-column label="用户手机号" align="center" prop="phone" width="130px"/>
<el-table-column label="用户昵称" align="center" prop="nickName"/> <el-table-column label="用户昵称" align="center" prop="nickName"/>
<el-table-column label="优惠券编码" align="center" prop="couponCode" width="350px"/> <el-table-column label="优惠券编码" align="center" prop="couponCode" width="150px"/>
<el-table-column label="优惠券名称" align="center" prop="name" width="240px"/> <el-table-column label="优惠券名称" align="center" prop="name" width="300px"/>
<el-table-column label="优惠券类型" align="center" prop="couponType"> <el-table-column label="优惠券类型" align="center" prop="couponType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
......
src/views/system/coupon/durationIndex.vue
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>--> <!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table-column type="index" width="55" align="center" label="序号"/> <el-table-column type="index" width="55" align="center" label="序号"/>
<el-table-column label="优惠券名称" align="center" prop="name"/> <el-table-column label="优惠券名称" align="center" prop="name" width="300px"/>
<el-table-column label="优惠券类型" align="center" prop="couponType"> <el-table-column label="优惠券类型" align="center" prop="couponType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
......
src/views/system/coupon/index.vue
...@@ -110,12 +110,13 @@ ...@@ -110,12 +110,13 @@
<el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>--> <!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table-column type="index" width="55" align="center" label="序号"/> <el-table-column type="index" width="55" align="center" label="序号"/>
<el-table-column label="优惠券名称" align="center" prop="name"/> <el-table-column label="优惠券名称" align="center" prop="name" width="300px"/>
<el-table-column label="优惠券类型" align="center" prop="couponType"> <el-table-column label="优惠券类型" align="center" prop="couponType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
<!-- <el-table-column label="时长" align="center" prop="duration" />--> <!-- <el-table-column label="时长" align="center" prop="duration" />-->
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/system/coupon/queryShopDeal.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-row> <el-row>
<el-table @row-click="clickRow" ref="table" :data="dataList" height="500px"> <el-table @row-click="clickRow" ref="table" :data="dataList" height="500px">
<el-table-column label="套餐名称" align="center" prop="name"/> <el-table-column label="套餐名称" align="center" prop="name" width="300px"/>
<el-table-column label="有效期开始" align="center" prop="startDate"> <el-table-column label="有效期开始" align="center" prop="startDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
......
src/views/system/coupon/querySkuId.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-row> <el-row>
<el-table @row-click="clickRow" ref="table" :data="dataList" height="500px"> <el-table @row-click="clickRow" ref="table" :data="dataList" height="500px">
<el-table-column label="套餐名称" align="center" prop="name"/> <el-table-column label="套餐名称" align="center" prop="name" width="300px"/>
<el-table-column label="有效期开始" align="center" prop="startDate"> <el-table-column label="有效期开始" align="center" prop="startDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
......
src/views/system/coupon/tiktokindex.vue
...@@ -110,12 +110,13 @@ ...@@ -110,12 +110,13 @@
<el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>--> <!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table-column type="index" width="55" align="center" label="序号"/> <el-table-column type="index" width="55" align="center" label="序号"/>
<el-table-column label="优惠券名称" align="center" prop="name"/> <el-table-column label="优惠券名称" align="center" prop="name" width="300px"/>
<el-table-column label="优惠券类型" align="center" prop="couponType"> <el-table-column label="优惠券类型" align="center" prop="couponType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/> <dict-tag :options="dict.type.store_coupon_type" :value="scope.row.couponType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="优惠券原始金额" align="center" prop="subPrice"/>
<!-- <el-table-column label="时长" align="center" prop="duration" />--> <!-- <el-table-column label="时长" align="center" prop="duration" />-->
<el-table-column label="平台类型" align="center" prop="platformType"> <el-table-column label="平台类型" align="center" prop="platformType">
<template slot-scope="scope"> <template slot-scope="scope">
......
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