Skip to content

M
marketing
Commit bf671033 by zhangmeng
Options

Merge branch 'bug' 

* bug:
  修复卡券数量问题
  store组件

# Conflicts:
#	dist/index.html
parents 1b05ee89 d3dd4917
Showing with 7 additions and 5 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.1d82a5a6816bc5796024ca95599baea5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ad484ea676beca0f8899.js></script><script type=text/javascript src=/marketing/static/js/app.43b0b43b0c9faa908da8.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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.1d82a5a6816bc5796024ca95599baea5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ad484ea676beca0f8899.js></script><script type=text/javascript src=/marketing/static/js/app.6cd6b648b1cc6a8c6f5b.js></script></body></html>
\ No newline at end of file
dist/static/js/app.6cd6b648b1cc6a8c6f5b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/test/dmStore/store-card.vue
......@@ -152,7 +152,7 @@ export default {
// 初始化左侧数据
initLeftList() {
this.leftLoading = true;
this.axios.get(baseUrl + '/api-plug/query-store-by-code-name-new?requestProject=gic-web&pageSize=999&currentPage=1&searchParams='+this.leftValue).then(res => {
this.axios.get(baseUrl + '/api-plug/query-store-by-code-name-new?requestProject=gic-web&pageSize=999&currentPage=1&searchParam='+this.leftValue).then(res => {
this.leftList = (res.data.result && res.data.result.result) || [];
this.leftTotal = (res.data.result && res.data.result.totalCount) || 0;
this.leftLoading = false;
......
src/views/card/card-info.vue
......@@ -108,8 +108,10 @@
</el-form-item>
<el-form-item prop="cardCodeCount" :label="form.useCustomCode?'默认数量':'新建数量'">
<div v-if="!form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="100000" :disabled="isEdit || isInfo" class="w200" v-model="form.cardCodeCount"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
<div v-if="form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="100000" disabled class="w200" :value="form.customCodeEnd - form.customCodeBegin + 1"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
<div v-if="!form.useCustomCode">
<el-input-number controls-position="right" :min="0" :max="10000000" :disabled="isEdit || isInfo" class="w200" v-model="form.cardCodeCount"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
<div v-if="form.useCustomCode">
<el-input-number controls-position="right" :min="0" :max="100000" disabled class="w200" :value="form.customCodeEnd - form.customCodeBegin + 1"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
</el-form-item>
<el-form-item class="is-required" prop="useCustomCode" label="有效期">
......
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