Commit 8b1a574a by huaying

fix: 优惠券和退款列表默认图片展示修改,编辑卡券新增字段不可编辑

parent 09350082
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div v-loading="loading"> <div v-loading="loading" class="scroll_class">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="tableDate" :data="tableDate"
...@@ -130,6 +130,7 @@ ...@@ -130,6 +130,7 @@
<img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt> <img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt>
<img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt> <img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt>
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt> <img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt>
<img v-if="scope.row.cardType === 3 && !scope.row.mainImageUrl" src="../../../../static/img/quan04.png" alt>
<div class="info-name"> <div class="info-name">
<div> <div>
<el-tooltip :content="'优惠券id:' + scope.row.integralMallProId" effect="dark" placement="top-start"> <el-tooltip :content="'优惠券id:' + scope.row.integralMallProId" effect="dark" placement="top-start">
...@@ -512,7 +513,9 @@ import couponLadderPrice from '../../../components/couponLadderPrice'; ...@@ -512,7 +513,9 @@ import couponLadderPrice from '../../../components/couponLadderPrice';
import checkStockDistirbute from '../../../components/checkStockDistirbute'; import checkStockDistirbute from '../../../components/checkStockDistirbute';
import relatePop from '@/components/relatePop'; import relatePop from '@/components/relatePop';
// import stockModal from '../../../components/getSkuList'; // import stockModal from '../../../components/getSkuList';
import sticky from '@/utils/sticky.js';
export default { export default {
mixins: [sticky],
components: { components: {
eqCode, eqCode,
editInfo, editInfo,
...@@ -524,6 +527,9 @@ export default { ...@@ -524,6 +527,9 @@ export default {
}, },
data () { data () {
return { return {
headerTop: '62px',
parent: 'scroll_class',
scrollClass: 'dm-layout-page',
getTime: getInputVal.getTime, getTime: getInputVal.getTime,
getSeconds: getInputVal.getSeconds, getSeconds: getInputVal.getSeconds,
searchValue: '', searchValue: '',
......
...@@ -480,15 +480,16 @@ ...@@ -480,15 +480,16 @@
<div class="section-content"> <div class="section-content">
<h3>售后服务</h3> <h3>售后服务</h3>
<el-form-item label="支持退款" prop="refundType"> <el-form-item label="支持退款" prop="refundType">
<el-radio v-model="couponForm.refundType" :label="0"> <el-radio v-model="couponForm.refundType" :label="0" :disabled="$route.query.giftId != '-1'">
</el-radio> </el-radio>
<el-radio v-model="couponForm.refundType" :label="1"> <el-radio v-model="couponForm.refundType" :label="1" :disabled="$route.query.giftId != '-1'">
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item label="退款期限" prop="refundPeriod"> <el-form-item label="退款期限" prop="refundPeriod">
<el-input-number v-model="couponForm.refundPeriod" <el-input-number v-model="couponForm.refundPeriod"
:disabled="$route.query.giftId != '-1'"
controls-position="right" controls-position="right"
:min="1" :min="1"
:max="10" :max="10"
...@@ -497,7 +498,7 @@ ...@@ -497,7 +498,7 @@
step-strictly></el-input-number> step-strictly></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="退款方式" prop="refundWay"> <el-form-item label="退款方式" prop="refundWay">
<el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange"> <el-checkbox-group v-model="couponForm.refundWay" @change="checkBoxChange" :disabled="$route.query.giftId != '-1'">
<el-checkbox label="1">主动退款</el-checkbox> <el-checkbox label="1">主动退款</el-checkbox>
<el-checkbox label="2">过期自动退款</el-checkbox> <el-checkbox label="2">过期自动退款</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -638,7 +639,7 @@ export default { ...@@ -638,7 +639,7 @@ export default {
timeZones: ['', ''], timeZones: ['', ''],
ladder: [], ladder: [],
refundType: 0, refundType: 0,
refundPeriod: 10, refundPeriod: 1,
refundWay: [], refundWay: [],
}, },
uploadAction: getInputVal.uploadAction(), uploadAction: getInputVal.uploadAction(),
...@@ -919,7 +920,7 @@ export default { ...@@ -919,7 +920,7 @@ export default {
this.getCardInfo(); this.getCardInfo();
} }
this.couponForm.refundType = res.data.result.refundType ? res.data.result.refundType : 0; this.couponForm.refundType = res.data.result.refundType ? res.data.result.refundType : 0;
this.couponForm.refundPeriod = res.data.result.refundPeriod ? res.data.result.refundPeriod : 10; this.couponForm.refundPeriod = res.data.result.refundPeriod ? res.data.result.refundPeriod : 1;
this.couponForm.refundWay = res.data.result.refundWay ? res.data.result.refundWay.split(',') : []; this.couponForm.refundWay = res.data.result.refundWay ? res.data.result.refundWay.split(',') : [];
this.echoVisibleData(res.data.result); this.echoVisibleData(res.data.result);
this.couponForm.proName = res.data.result.proName; this.couponForm.proName = res.data.result.proName;
......
...@@ -102,7 +102,12 @@ ...@@ -102,7 +102,12 @@
<el-table-column fixed label="礼品信息" min-width="310px"> <el-table-column fixed label="礼品信息" min-width="310px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<img :src="scope.row.photoUrl"> <!-- <img :src="scope.row.photoUrl"> -->
<img v-if="scope.row.photoUrl" :src="scope.row.photoUrl" alt>
<img v-if="scope.row.cardType === 2 && !scope.row.photoUrl" src="../../../static/img/quan02.png" alt>
<img v-if="scope.row.cardType === 0 && !scope.row.photoUrl" src="../../../static/img/quan01.png" alt>
<img v-if="scope.row.cardType === 1 && !scope.row.photoUrl" src="../../../static/img/quan03.png" alt>
<img v-if="scope.row.cardType === 3 && !scope.row.photoUrl" src="../../../static/img/quan04.png" alt>
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis"> <p class="pro-ellipsis">
{{ scope.row.proName }} {{ scope.row.proName }}
......
static/img/quan01.png

1.67 KB | W: | H:

static/img/quan01.png

4.95 KB | W: | H:

static/img/quan01.png
static/img/quan01.png
static/img/quan01.png
static/img/quan01.png
  • 2-up
  • Swipe
  • Onion skin
static/img/quan02.png

1.47 KB | W: | H:

static/img/quan02.png

5.05 KB | W: | H:

static/img/quan02.png
static/img/quan02.png
static/img/quan02.png
static/img/quan02.png
  • 2-up
  • Swipe
  • Onion skin
static/img/quan03.png

1.46 KB | W: | H:

static/img/quan03.png

4.79 KB | W: | H:

static/img/quan03.png
static/img/quan03.png
static/img/quan03.png
static/img/quan03.png
  • 2-up
  • Swipe
  • Onion skin
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