Skip to content

I
integral-mall
Commit 4208bd62 by damodmg
Options

调整跳转

parent 56a24425
Showing with 135 additions and 72 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.4e3fd1f544cc05b14c674fe045acf6d6.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.046f865dcceac694f703.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.fe598762b6cad55e81096134282f831c.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.7be0802c2d888df93c05.js></script></body></html>
\ No newline at end of file
dist/static/css/iconfont.css
......@@ -28,10 +28,22 @@
content: "\e87c";
}
.icon-zhankai:before {
content: "\e742";
}
.icon-shouqi:before {
content: "\e743";
}
.icon-shangpin:before {
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -48,7 +60,3 @@
content: "\e74f";
}
dist/static/fonts/iconfont.svg
......@@ -29,9 +29,18 @@ Created by iconfont
<glyph glyph-name="youhuiquan" unicode="&#59516;" d="M508 416.1c-5.4 0-10.7 2-14.8 6.2L391.4 524.1c-8.2 8.2-8.2 21.5 0 29.7s21.5 8.2 29.7 0L522.9 452c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.2-14.9-6.2zM508.7 416.1c-5.4 0-10.7 2-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l101.8 101.8c8.2 8.2 21.5 8.2 29.7 0s8.2-21.5 0-29.7L523.6 422.3c-4.1-4.1-9.5-6.2-14.9-6.2zM624 381.29999999999995H400c-11.6 0-21 9.4-21 21s9.4 21 21 21h224c11.6 0 21-9.4 21-21s-9.4-21-21-21zM624 268.79999999999995H400c-11.6 0-21 9.4-21 21s9.4 21 21 21h224c11.6 0 21-9.4 21-21s-9.4-21-21-21zM514.6 208.10000000000002c-11.6 0-21 9.4-21 21V408.6c0 11.6 9.4 21 21 21s21-9.4 21-21v-179.5c0-11.6-9.4-21-21-21zM883.8 19H140.2C99.3 19 66 52.299999999999955 66 93.20000000000005V218.10000000000002c0 10 7 18.6 16.8 20.6 68.6 14 118.5 75.1 118.5 145.3S151.4 515.3 82.8 529.3c-9.8 2-16.8 10.6-16.8 20.6V674.8c0 40.9 33.3 74.2 74.2 74.2h743.5c40.9 0 74.2-33.3 74.2-74.2v-124.9c0-10-7-18.6-16.8-20.6-68.6-14-118.5-75.1-118.5-145.3s49.8-131.3 118.5-145.3c9.8-2 16.8-10.6 16.8-20.6v-124.9c0.1-40.9-33.2-74.2-74.1-74.2zM108 201.79999999999995v-108.6c0-17.8 14.5-32.2 32.2-32.2h743.5c17.8 0 32.2 14.5 32.2 32.2V201.79999999999995c-35.7 10.8-67.8 32.1-91.8 61.1-28 34-43.5 77-43.5 121.1s15.4 87.1 43.5 121.1c24 29 56.1 50.3 91.8 61.1V674.8c0 17.8-14.5 32.2-32.2 32.2H140.2c-17.8 0-32.2-14.5-32.2-32.2v-108.6c35.7-10.8 67.8-32.1 91.8-61.1 28-34 43.5-77 43.5-121.1s-15.4-87.1-43.5-121.1c-24-29-56.1-50.3-91.8-61.1z" horiz-adv-x="1024" />
<glyph glyph-name="zhankai" unicode="&#59202;" d="M535.744 440.064h-535.68v-114.112h535.68V440.064z m489.28-389.952H1.28V-64h1023.744v114.112z m-260.096 145.472V576l260.096-190.208-260.096-190.208zM1025.024 832H2.624v-116.096h1022.4V832z" horiz-adv-x="1089" />
<glyph glyph-name="shouqi" unicode="&#59203;" d="M489.536 440.064h535.68v-114.112H489.6V440.064zM0.256 50.112H1024V-64H0.256v114.112z m260.096 145.472V576L0.256 385.792l260.096-190.208zM0.256 832h1022.4v-116.096H0.256V832z" horiz-adv-x="1088" />
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
......
dist/static/js/app.046f865dcceac694f703.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.7be0802c2d888df93c05.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/info.vue
......@@ -17,32 +17,31 @@
<el-form :model="couponForm" :rules="couponRules" ref="couponForm" label-width="100px" class="demo-ruleForm" label-position="right">
<div class="section-content">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'">
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
<el-button plain @click="showCard">添加卡券</el-button>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">支持选择兑换券</span>
</el-form-item>
<el-form-item label="选择卡券" required v-show="cardList.length > 0">
<el-table :data="cardList" style="width: 900px">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ scope.row.beginDate + '至' + scope.row.endDate }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
</template>
</el-table-column>
<el-table-column label="库存" prop="couponStock"> </el-table-column>
</el-table>
</el-form-item>
<el-form-item label="选择卡券" required v-show="mallProId !== '-1'"> </el-form-item>
<el-table :data="cardList" style="width: 900px;margin-left:135px;margin-top:-44px;" v-show="cardList.length > 0">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ scope.row.beginDate + '至' + scope.row.endDate }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
</template>
</el-table-column>
<el-table-column label="库存" prop="couponStock"> </el-table-column>
</el-table>
</div>
<div class="section-content">
<h3>销售信息</h3>
......@@ -57,6 +56,10 @@
</el-form-item>
<el-form-item label="库存" prop="virtualStock">
<el-input-number class="w-350" :precision="0" :min="0" v-model="couponForm.virtualStock"></el-input-number>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;" v-show="cardList.length"
>兑换限制不得大于此优惠券的库存：<i>{{ couponCardStock }}</i
>张</span
>
</el-form-item>
</div>
<div class="section-content">
......@@ -73,7 +76,10 @@
<el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
<span v-if="couponForm.limitTimesStatus"><el-input-number controls-position="right" v-model="couponForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number> 次</span>
<span style="font-size:12px;color:rgb(144, 147, 153);margin-left:5px;">请注意兑换限制不得大于此优惠券的库存</span>
<span v-show="cardList.length" style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;"
>兑换限制不得大于此优惠券的领取次数：<i>{{ limitTimesNum }}</i
>次</span
>
</el-form-item>
<el-form-item label="兑换日期" required>
<template>
......@@ -174,6 +180,7 @@ export default {
selectedData: {},
cardList: [],
limitTimes: 0,
limitTimesNum: 0,
proReferId: '', //卡券关联id
couponForm: {
cardType: '', //卡券类型
......@@ -343,6 +350,7 @@ export default {
if (res.data.errorCode === 0) {
this.cardList.push(res.data.result);
this.limitTimes = Number(res.data.result.cardLimit);
this.limitTimesNum = res.data.result.cardLimit;
this.couponCardStock = res.data.result.couponStock;
// this.couponForm.virtualStock = this.couponCardStock;
this.couponForm.proName = res.data.result.cardName;
......@@ -358,6 +366,8 @@ export default {
// this.couponForm.limitTimes = this.limitTimes;
return false;
}
} else {
this.limitTimesNum = this.couponForm.limitTimes;
}
},
//门店分类回执方法
......@@ -377,13 +387,14 @@ export default {
if (val) {
this.cardList.push(val);
this.limitTimes = val.cardLimit;
this.limitTimesNum = val.cardLimit;
this.proReferId = val.coupCardId;
this.couponForm.cardType = val.cardType;
this.couponCardStock = val.couponStock;
// this.couponForm.virtualStock = this.couponCardStock;
this.couponForm.proName = val.cardName;
this.couponForm.limitTimesStatus = true;
let params = {
couponCardId: val.coupCardId,
proType: 1
......
src/views/goods/gift/addSku.vue
......@@ -119,8 +119,8 @@ export default {
standardValueList: [], //规格值列表
refash: false,
// skuList: [],
// uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=intergral-mall',
uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=intergral-mall',
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=intergral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=intergral-mall',
intergral: '',
cash: '',
stock: '',
......
src/views/goods/gift/gift.vue
......@@ -210,7 +210,11 @@ export default {
},
//跳转到兑换记录
goRecord(item) {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
if (item.cardType === 2) {
this.$router.push({ name: 'couponExchange', query: { integralMallProId: item.integralMallProId } });
} else {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
}
},
// 获取列表
getList() {
......
src/views/goods/gift/info.vue
......@@ -117,6 +117,10 @@
<el-form-item label="限兑">
<el-checkbox v-model="giftForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
<span v-if="giftForm.limitTimesStatus"><el-input-number controls-position="right" v-model="giftForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number> 次</span>
<span v-show="cardList.length" style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;"
>兑换限制不得大于此兑换券的领取次数：<i>{{ limitTimesNum }}</i
>次</span
>
</el-form-item>
<el-form-item label="兑换日期" required>
<template>
......@@ -184,31 +188,30 @@
</el-form-item>
<div class="section-content1" v-show="giftForm.changeType === 1">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'">
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
<el-button plain @click="showCard">添加卡券</el-button>
</el-form-item>
<el-form-item label="选择卡券" required v-show="cardList.length > 0">
<el-table :data="cardList" style="width: 900px">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ scope.row.beginDate + '至' + scope.row.endDate }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
</template>
</el-table-column>
<el-table-column label="库存" prop="couponStock"> </el-table-column>
</el-table>
</el-form-item>
<el-form-item label="选择卡券" required v-show="mallProId !== '-1'"> </el-form-item>
<el-table :data="cardList" style="width: 900px;margin-left:170px;margin-top:-44px;" v-show="cardList.length > 0">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ scope.row.beginDate + '至' + scope.row.endDate }}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
</template>
</el-table-column>
<el-table-column label="库存" prop="couponStock"> </el-table-column>
</el-table>
</div>
</div>
......@@ -299,6 +302,7 @@ export default {
proCodeQuery: '' //条形码
},
limitTimes: 0,
limitTimesNum: 0,
validateTime,
memberGradeList: [], //会员等级列表
submitLoading: false, //按钮加载中
......@@ -313,8 +317,8 @@ export default {
limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }]
},
refundTypeStatus: false,
// uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
proNameLen: 0,
uploadStatus: true, //上传按钮
dialogVisibleImg: false, //上传图片
......@@ -390,6 +394,7 @@ export default {
this.cardList.push(res.data.result);
this.couponCardStock = res.data.result.couponStock; //兑换券库存
this.limitTimes = Number(res.data.result.cardLimit);
this.limitTimesNum = res.data.result.cardLimit;
let params = {
couponCardId: res.data.result.coupCardId,
proType: 1
......@@ -409,11 +414,15 @@ export default {
},
limitTimeChange() {
if (this.cardList.length) {
//选择了卡圈
if (Number(this.giftForm.limitTimes) > Number(this.limitTimes)) {
this.$message.error('兑换限制不得大于此优惠券的领取次数');
// this.couponForm.limitTimes = this.limitStock;
return false;
}
} else {
//未选择了卡圈
this.limitTimesNum = this.giftForm.limitTimes;
}
},
refashData() {
......@@ -966,11 +975,12 @@ export default {
this.cardList.push(val);
this.costValueStatus = true;
this.limitTimes = val.cardLimit;
this.limitTimesNum = val.cardLimit;
// this.limitStock = val.couponStock;
this.giftForm.proReferId = val.coupCardId;
this.giftForm.cardType = val.cardType;
this.couponCardStock = val.couponStock; //兑换券库存
this.giftForm.limitTimesStatus = true;
let params = {
couponCardId: val.coupCardId,
proType: 1
......@@ -1014,13 +1024,17 @@ export default {
this.$message.error('请填写库存');
return false;
}
if (!item.giftProSkuCash) {
this.$message.error('请填写现金');
return false;
if (Number(item.giftProSkuCash) !== 0) {
if (!item.giftProSkuCash) {
this.$message.error('请填写现金');
return false;
}
}
if (!item.giftProSkuIntegral) {
this.$message.error('请填写积分');
return false;
if (Number(item.giftProSkuIntegral) !== 0) {
if (!item.giftProSkuIntegral) {
this.$message.error('请填写积分');
return false;
}
}
}
}
......@@ -1044,7 +1058,7 @@ export default {
} else if (this.giftForm.cashCost === '') {
this.$message.error('请填写礼品现金');
return false;
} else if (this.giftForm.virtualStock === '') {
} else if (this.giftForm.virtualStock === '' || Number(this.giftForm.virtualStock) === 0) {
this.$message.error('请填写礼品库存');
return false;
}
......
src/views/order/couponExchange.vue
......@@ -163,7 +163,7 @@ export default {
// 导出数据控件
projectName: 'integral-mall', // 当前项目名
dialogVisible: false,
excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
excelUrl: '/api-integral-mall/download-exchange-list-execl', // 下载数据的地址
params: {}, // 传递的参数
orderInfo: {}, //订单信息
refunOrderdModal: {
......
static/css/iconfont.css
......@@ -28,10 +28,22 @@
content: "\e87c";
}
.icon-zhankai:before {
content: "\e742";
}
.icon-shouqi:before {
content: "\e743";
}
.icon-shangpin:before {
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -48,7 +60,3 @@
content: "\e74f";
}
static/fonts/iconfont.svg
......@@ -29,9 +29,18 @@ Created by iconfont
<glyph glyph-name="youhuiquan" unicode="&#59516;" d="M508 416.1c-5.4 0-10.7 2-14.8 6.2L391.4 524.1c-8.2 8.2-8.2 21.5 0 29.7s21.5 8.2 29.7 0L522.9 452c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.2-14.9-6.2zM508.7 416.1c-5.4 0-10.7 2-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l101.8 101.8c8.2 8.2 21.5 8.2 29.7 0s8.2-21.5 0-29.7L523.6 422.3c-4.1-4.1-9.5-6.2-14.9-6.2zM624 381.29999999999995H400c-11.6 0-21 9.4-21 21s9.4 21 21 21h224c11.6 0 21-9.4 21-21s-9.4-21-21-21zM624 268.79999999999995H400c-11.6 0-21 9.4-21 21s9.4 21 21 21h224c11.6 0 21-9.4 21-21s-9.4-21-21-21zM514.6 208.10000000000002c-11.6 0-21 9.4-21 21V408.6c0 11.6 9.4 21 21 21s21-9.4 21-21v-179.5c0-11.6-9.4-21-21-21zM883.8 19H140.2C99.3 19 66 52.299999999999955 66 93.20000000000005V218.10000000000002c0 10 7 18.6 16.8 20.6 68.6 14 118.5 75.1 118.5 145.3S151.4 515.3 82.8 529.3c-9.8 2-16.8 10.6-16.8 20.6V674.8c0 40.9 33.3 74.2 74.2 74.2h743.5c40.9 0 74.2-33.3 74.2-74.2v-124.9c0-10-7-18.6-16.8-20.6-68.6-14-118.5-75.1-118.5-145.3s49.8-131.3 118.5-145.3c9.8-2 16.8-10.6 16.8-20.6v-124.9c0.1-40.9-33.2-74.2-74.1-74.2zM108 201.79999999999995v-108.6c0-17.8 14.5-32.2 32.2-32.2h743.5c17.8 0 32.2 14.5 32.2 32.2V201.79999999999995c-35.7 10.8-67.8 32.1-91.8 61.1-28 34-43.5 77-43.5 121.1s15.4 87.1 43.5 121.1c24 29 56.1 50.3 91.8 61.1V674.8c0 17.8-14.5 32.2-32.2 32.2H140.2c-17.8 0-32.2-14.5-32.2-32.2v-108.6c35.7-10.8 67.8-32.1 91.8-61.1 28-34 43.5-77 43.5-121.1s-15.4-87.1-43.5-121.1c-24-29-56.1-50.3-91.8-61.1z" horiz-adv-x="1024" />
<glyph glyph-name="zhankai" unicode="&#59202;" d="M535.744 440.064h-535.68v-114.112h535.68V440.064z m489.28-389.952H1.28V-64h1023.744v114.112z m-260.096 145.472V576l260.096-190.208-260.096-190.208zM1025.024 832H2.624v-116.096h1022.4V832z" horiz-adv-x="1089" />
<glyph glyph-name="shouqi" unicode="&#59203;" d="M489.536 440.064h535.68v-114.112H489.6V440.064zM0.256 50.112H1024V-64H0.256v114.112z m260.096 145.472V576L0.256 385.792l260.096-190.208zM0.256 832h1022.4v-116.096H0.256V832z" horiz-adv-x="1088" />
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
......
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