Skip to content

W
welfare
Commit 6b651796 by 黑潮
Options

fix: 优化

parent cbbb05ae
Showing with 65 additions and 28 deletions
public/index.html
......@@ -52,5 +52,6 @@
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.18.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.13.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
<script src="//web-1251519181.file.myqcloud.com/components/user-info-card.1.0.3.js"></script>
</body>
</html>
src/components/stock-list/welfare-item.vue
......@@ -178,6 +178,9 @@ export default {
line-height: 40px;
float: right;
cursor: pointer;
&:hover {
color: $blue;
}
}
}
.content {
......
src/views/card/gic-card/card-form.js
......@@ -58,8 +58,8 @@ const _ruleForm1 = {
remarkName: '', // 备注名
subTitle: '', // 副标题
color: '#3970b5', // 卡券颜色
denomination: 0, // 优惠金额 抵金券0时存在
costPrice: 0, // 成本费用 折扣券1、兑换券2存在
denomination: '', // 优惠金额 抵金券0时存在
costPrice: '', // 成本费用 折扣券1、兑换券2存在
// manualGetFlag: 0,
// code类型↓
customCodeFlag: 0,
......@@ -291,8 +291,8 @@ export default {
loading: false,
active: 1,
uploadUrl,
zmImg: [], // 转赠图片
stImg: [], // 首图图片
zmImg: [ { url: 'https://pic01-10001430.image.myqcloud.com/13597/1622599355173_TAcQN.png', fileId: '13597/1622599355173_TAcQN.png' } ], // 转赠图片
stImg: [ { url: 'https://pic01-10001430.image.myqcloud.com/13597/1622599673145_IeGHg.png', fileId: '13597/1622599673145_IeGHg.png' } ], // 首图图片
stockType: [], // 库存使用类型（0:占用,1:动态 , 2占用+动态）
prefix,
couponId: '', // gic-card 新建时就生成couponId
......@@ -388,6 +388,10 @@ export default {
created() {
const breadName = this.isAdd || this.isCopy ? '新建卡券' : '编辑卡券';
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName } ]);
this.ruleForm1.giveImage = this.zmImg[0].url;
this.ruleForm1.giveImageField = this.zmImg[0].fileId;
this.ruleForm1.giveBannerImage = this.stImg[0].url;
this.ruleForm1.giveBannerImageField = this.stImg[0].fileId;
},
mounted() {
if (this.currentAreaId) {
......@@ -524,7 +528,14 @@ export default {
if (operAuthType == 2 && !operAuth.length) {
reject({ message: '请选择部分分组账号' });
}
resolve(target);
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save().then((res) => {
if (res.code == '0000') {
resolve(target);
} else {
reject({ message: res.message });
}
});
}
if (target === 3) {
const { xxsy, gicmall } = this;
......@@ -713,8 +724,8 @@ export default {
if (this.loading) {
return;
}
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save();
// if(!this.$refs.accg.validate()) return;
// this.$refs.accg.save();
let params = { ...this.ruleForm1, ...this.ruleForm2, goodsSearchId: this.goodsSearchId };
try {
params.couponId = this.couponId; // 主键在一进来页面的时候就已经确定
......@@ -871,6 +882,7 @@ export default {
zmSuccess(obj) {
console.log(11111);
this.zmImg = [ { url: obj.res.result.url, fileId: obj.res.result.fileId } ];
console.log(this.zmImg);
this.ruleForm1.giveImage = obj.res.result.url;
this.ruleForm1.giveImageField = obj.res.result.fileId;
},
......
src/views/card/gic-card/card-form.vue
......@@ -43,12 +43,12 @@
<!-- 抵金券 -->
<el-form-item prop="denomination" label="优惠金额" v-if="ruleForm1.cardType === 0">
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="金额需大于0" :precison="2" :min="0" ></dm-input-amount>
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="金额需大于0" :precison="2" :min="0.01" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字</span> -->
</el-form-item>
<!-- 折扣券 -->
<el-form-item prop="denomination" label="优惠折扣" v-if="ruleForm1.cardType === 1">
<el-input-number style="width:120px;" v-model="ruleForm1.denomination" :max="9.9" placeholder="请填写1-9.9之间的数字" controls-position="right" :precision="1" :step="0.1" :min="0" ></el-input-number>
<el-input-number style="width:120px;" v-model="ruleForm1.denomination" :max="9.9" placeholder="请填写1-9.9之间的数字" controls-position="right" :precision="1" :step="0.1" :min="1" ></el-input-number>
<span class="tips">折</span>
</el-form-item>
<!-- 兑换券 !!! 比微信卡券多的内容 -->
......@@ -57,23 +57,41 @@
</el-form-item>
<!-- 抵金券、兑换券 -->
<el-form-item prop="costPrice" label="成本费用" v-if="ruleForm1.cardType !== 1">
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" placeholder="金额需大于0" :precision="2" :min="0" ></dm-input-amount>
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" placeholder="金额需大于0" :precision="2" :min="0.01" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字（限制两位小数）</span> -->
</el-form-item>
<el-form-item label="最低适用商品件数" prop="goodsDiscountCheckLower">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="1">
<el-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1"></el-input-number> 件 &nbsp;
<!-- <dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number> -->
</el-radio>
<dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number>
</span>
</el-form-item>
<el-form-item label="最高适用商品件数" prop="goodsDiscountCheck">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="1">
<el-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1"></el-input-number> 件 &nbsp;
<!-- <dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number> -->
</el-radio>
<dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number>
</span>
</el-form-item>
<el-form-item label="code类型">
......@@ -200,7 +218,7 @@
</el-form-item>
<el-form-item label="首图链接设置" prop="giveBannerJumpUrl">
<el-checkbox v-model="checked" @change="onShow" />
<span class="op-btn ml5" style="cursor:pointer" @click="onShow(true)">首图链接 <i class="el-icon-arrow-right"></i></span>
<span class="op-btn ml5" style="cursor:pointer;color:#303133" @click="onShow(true)">首图链接 <i class="el-icon-arrow-right"></i></span>
<span v-if="checked && (linkData.name || linkData.url)" class="gray03 ml10" :title="linkData.url">【{{ linkData.name || '--' }}】【{{ linkData.url || '--' }}】</span>
</el-form-item>
<el-form-item label="卡券转赠规则" prop="giveRule" v-show="ruleForm1.giveFlag === 1">
......@@ -215,7 +233,7 @@
<span v-if="(linkData2.name || linkData2.url)" class="gray03 ml10" :title="linkData2.url">【{{ linkData2.name || '--' }}】【{{ linkData2.url || '--' }}】</span>
</template> -->
<el-checkbox v-model="ruleForm1.cardJumpFlag" :true-label="1" :false-label="0" @change="(val) => val && $refs.link2.onShow()" />
<span class="op-btn ml5" style="cursor:pointer" @click="$refs.link2.onShow(),ruleForm1.cardJumpFlag=1">跳转链接 <i class="el-icon-arrow-right"></i></span>
<span class="op-btn ml5" style="cursor:pointer;color:#303133" @click="$refs.link2.onShow(),ruleForm1.cardJumpFlag=1">跳转链接 <i class="el-icon-arrow-right"></i></span>
<span v-if="ruleForm1.cardJumpFlag && (linkData2.name || linkData2.url)" class="gray03 ml10" :title="linkData2.url">【{{ linkData2.name || '--' }}】【{{ linkData2.url || '--' }}】</span>
<p class="tips">* 开启后小程序卡券详情将对应路径的跳转按钮</p>
</el-form-item>
......
src/views/card/gic-card/card-info.vue
......@@ -109,9 +109,9 @@
<el-input show-word-limit v-if="isEdit" type="textarea" :rows="4" v-model="ruleForm.adaptStoreExplain" class="w500" :maxlength="50" placeholder="选填" />
<div v-if="isInfo" class="word-break">{{ ruleForm.adaptStoreExplain || '--' }}</div>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="submitForm" v-if="!isInfo">确认保存</el-button>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<div class="common-title mb25 mt60" id="f3">适用信息</div>
......@@ -159,6 +159,9 @@
<ul class="floor">
<li v-for="(item, idx) in floor" :key="idx" :class="{ active: item.targetId === floorId }" @click="toFloor(item)"><span>{{ item.name }}</span></li>
</ul>
<div class="fixed-bottom">
<el-button type="primary" @click="submitForm" v-if="!isInfo">确认保存</el-button>
</div>
<result-dialog :dialog-visible.sync="result.visible" :title="result.title" :info="result.info" @handleClose="handleResClose">
<el-button slot="footer" class="mt30" @click="handleResClose">关闭</el-button>
</result-dialog>
......@@ -186,7 +189,7 @@ export default cardInfo;
}
}
.card-info {
padding: 24px 20px;
padding: 24px 20px 40px;
position: relative;
.title {
font-size:14px;
......
src/views/card/gic-card/card-list.vue
......@@ -278,6 +278,8 @@ export default {
_cl = 'state-point-loading-scale'; // 使用中
break;
case 3:
_cl = 'state-point-default';
break;
case 4:
_cl = 'state-point-error'; // 已禁用已过期
break;
......
src/views/gift-manage/real-gift-detail.vue
......@@ -71,9 +71,9 @@
</div>
</div>
</div>
<div class="add-sku">
<div v-show="goodsStandardInfo.length < 3" class="add-sku">
<div class="add-sku-button">
<el-button v-show="goodsStandardInfo.length < 3" @click="addSku" type="text">添加规格项目</el-button>
<el-button @click="addSku" type="text">添加规格项目</el-button>
</div>
</div>
</div>
......@@ -1566,7 +1566,7 @@ export default {
}
.sku-table-content {
padding: 10px;
width: 900px;
width: 100%;
border: 1px solid #dcdfe6;
border-radius: 2px;
.batch-box {
......
src/views/gift-manage/real-gift.vue
......@@ -59,7 +59,7 @@
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<div class="text">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
<p class="goods-descript">
......@@ -722,4 +722,4 @@ export default {
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
</style>
src/views/gift-manage/virtual-gift.vue
......@@ -59,7 +59,7 @@
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<div class="text">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
<p class="goods-descript">
......@@ -795,4 +795,4 @@ export default {
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
</style>
src/views/performance-manage/delivery-list.vue
......@@ -10,10 +10,10 @@
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词进行搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:140px;" @change="handleSearchTypeChange">
<el-option label="发货单号" value="deliveryId"></el-option>
<el-option label="商品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftCode"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
<el-option label="发货单号" value="deliveryId"></el-option>
<el-option label="收件人手机号" value="consigneePhone"></el-option>
<el-option label="会员姓名" value="memberName"></el-option>
<el-option label="会员卡号" value="memberCardNo"></el-option>
......
src/views/performance-manage/record.vue
......@@ -16,12 +16,12 @@
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:160px;" @change="handleSearchTypeChange">
<el-option label="履约单号" value="orderId"></el-option>
<el-option label="礼品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftNo"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
<el-option label="会员姓名" value="memberName"></el-option>
<el-option label="会员卡号" value="memberCardNo"></el-option>
<el-option label="履约单号" value="orderId"></el-option>
</el-select>
</el-input>
<div class="clearfix mt20" style="margin-top:20px">
......
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