Skip to content

I
integral-mall
Commit 444ad3b4 by chenxin
Options

Merge branch 'feature/20201216' into 'master' 

Feature/20201216

See merge request !71
parents 0a986450 559c2b5b
Showing with 208 additions and 41 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.531d886a23a13ce370e73e3d82de3f11.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.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.9d68253c9a038dd54e36.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.f4df810fe1a60f5d404eaa2427a9f9df.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.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.f1a5c6bcbaf7ee09c337.js></script></body></html>
\ No newline at end of file
dist/static/css/app.531d886a23a13ce370e73e3d82de3f11.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f4df810fe1a60f5d404eaa2427a9f9df.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.9d68253c9a038dd54e36.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.f1a5c6bcbaf7ee09c337.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -30,9 +30,11 @@
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js'></script>
<!-- 数据对话选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js"></script><!-- 门店选择器 -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.19.js"></script><!-- 卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
......
src/components/eqCode.vue
......@@ -12,6 +12,9 @@
<p style="font-weight: 600;margin-bottom:15px">小程序二维码</p>
<img :src="modalData.imgUrl" class="wechat-img" style="width:140px;height:140px;" />
</div>
<div class="wechat-force" style="margin-bottom:0">
<p>温馨提示：通过二维码兑换，仅校验会员适用等级</p>
</div>
<div class="wechat-force">
<el-button type="primary" @click="force">重新生成</el-button>
</div>
......
src/views/goods/coupon/coupon.vue
......@@ -60,7 +60,14 @@
<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 />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<div>
<el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="light" placement="top-start">
<p class="pro-ellipsis" style="display:inline-block">{{ scope.row.proTitle }}</p>
</el-tooltip>
<el-tooltip v-if="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== ''" class="tips-content" popper-class="store-tips" effect="light" :content="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== '' ? '卡券存在异常，请进入详情查看' : ''" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#f5222d;display:inline-block"></i>
</el-tooltip>
</div>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
<p class="category-ellipsis">{{ scope.row.remarks }}</p>
</div>
......@@ -125,7 +132,9 @@
<template slot-scope="scope">
<div>
<el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.canEdit" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<dm-delete @confirm="deleteList(scope.row, 0, scope.$index)" tips="确定删除该商品吗?">
......@@ -159,7 +168,27 @@
</div>
</div>
</div>
<!-- 上架失败提示 -->
<el-dialog title="提示" :visible.sync="outerVisible" class="dialogStyle" :before-close="outerViewClose">
<div class="dialog-body">
<i class="el-icon-warning"></i>
<!-- <span>共{{ sum }}条申请，退款成功{{ successNum }}个，退款失败{{ failNum }}个，</span> -->
<span>{{ errorMessage }}</span>
<el-button type="primary" class="viewReason" @click="innerVisible = true">查看失败原因</el-button>
</div>
<el-dialog class="dialogStyle" width="30%" title="查看失败原因" :visible.sync="innerVisible" append-to-body>
<div class="dialog-body failReason" v-for="(item, index) in errorList" :key="index">
<span>{{ item }}</span>
<!-- <span class="marginLeft">{{ item.message }}</span> -->
</div>
<div slot="footer" class="dialog-footer borderNone contentCenter">
<el-button type="primary" @click="innerViewClose">关闭</el-button>
</div>
</el-dialog>
<div slot="footer" class="dialog-footer borderNone">
<el-button type="primary" @click="outerViewClose">确定</el-button>
</div>
</el-dialog>
<!-- 推广 -->
<eqCode :modalData="modalData" :integralMallProId="integralMallProId" :saleType="saleType"></eqCode>
<!-- 调整积分费用 -->
......@@ -221,7 +250,11 @@ export default {
integralMallProId: ''
},
integralMallProId: '',
saleType: ''
saleType: '',
errorMessage: '',
errorList: '',
outerVisible: false,
innerVisible: false
};
},
created() {
......@@ -424,12 +457,30 @@ export default {
this.currentPage = 1;
this.getList(); //拉取列表
this.goodsType = '';
} else if (res.data.errorCode === 1) {
this.errorMessage = res.data.message;
this.errorList = res.data.result;
if (this.errorList && this.errorList.length > 0) {
this.outerVisible = true;
}
} else {
this.$message.error(res.data.message);
this.$message({
dangerouslyUseHTMLString: true,
message: `<div>${res.data.message}</div>`,
type: 'error'
});
this.goodsType = '';
}
});
},
innerViewClose() {
this.innerVisible = false;
},
outerViewClose() {
this.outerVisible = false;
this.getList();
this.goodsType = '';
},
// 新增礼品
addCoupon() {
this.$router.push({ name: 'couponInfo', query: { giftId: '-1', coupCardId: '-1', canEdit: true } });
......@@ -572,3 +623,34 @@ export default {
display: inline-block;
}
</style>
<style>
.dialogStyle .el-dialog__footer {
border-top: none;
}
.dialogStyle .el-dialog {
width: 450px;
}
.dialogStyle .viewReason {
background-color: #fff !important;
color: #1890ff !important;
border: none !important;
padding-left: 0 !important;
text-decoration: underline !important;
text-decoration-color: #1890ff !important;
}
.dialogStyle .marginLeft {
margin-left: 15px;
}
.dialogStyle .contentCenter {
text-align: center;
margin-top: 120px;
}
.dialogStyle .failReason {
margin-bottom: 10px;
}
.dialogStyle .dialog-body .el-icon-warning {
color: #faad14;
font-size: 20px;
margin-right: 10px;
}
</style>
src/views/goods/coupon/info.vue
......@@ -25,11 +25,22 @@
<el-alert title="原卡券已被删除，请及时下线卡券，否则用户将无法兑换" type="warning"> </el-alert>
</div>
<el-form-item label="选择卡券" required v-show="mallProId !== '-1'"> </el-form-item>
<el-table :data="cardList" style="width: 900px;margin-left:135px;margin-bottom:22px;display:inline-block" v-show="cardList.length > 0" :style="{ marginTop: mallProId !== '-1' ? '-60px' : '' }">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<el-table :data="cardList" style="width: 1000px;margin-left:135px;margin-bottom:22px;display:inline-block" v-show="cardList.length > 0" :style="{ marginTop: mallProId !== '-1' ? '-60px' : '' }">
<el-table-column label="卡券名称" prop="cardName" min-width="140">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ scope.row.beginDate + '至' + scope.row.endDate }}</div>
<p style="line-height:22px;">{{ scope.row.cardName }}</p>
<p class="fz13 gray" style="line-height:20px;color:#909399">{{ scope.row.subName }}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" width="165" align="left" prop="createTime" label="卡券模板投放期限">
<template slot-scope="scope">
<span v-if="scope.row.putEffectiveMode == 0"> 固定日期：{{ getTime2(scope.row.putBeginDate) }} 至 {{ getTime2(scope.row.putEndDate) }} </span>
<span v-else>长期有效</span>
</template>
</el-table-column>
<el-table-column label="用户使用有效期" prop="limitDay" width="165">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ getTime2(scope.row.beginDate) + '至' + getTime2(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>
......@@ -49,12 +60,22 @@
</dm-delete>
</template>
</el-table-column>
<el-table-column label="卡券状态" v-if="mallProId !== '-1'">
<template slot-scope="scope">
<div style="color:#f5222d">
{{ scope.row.status === 0 ? '已删除' : scope.row.status === 1 ? '正常' : scope.row.status === 2 ? '已过期' : scope.row.status === 3 ? '未开始' : '' }}
</div>
</template>
</el-table-column>
</el-table>
<el-form-item label="券包名称" v-if="cardList.length > 1" prop="proName">
<el-input v-model.trim="couponForm.proName" class="w-600" type="text" placeholder="请输入券包名称" @input="value => goodsLimit(value)">
<span slot="suffix">{{ proNameLen }}/30</span>
</el-input>
</el-form-item>
<el-form-item label="数据对话">
<dm-activity-select :repProjectName="projectName" width="300" :actId.sync="couponForm.dataDialogueId" :showAdd="false"></dm-activity-select>
</el-form-item>
<!-- <el-form-item label="卡券主图">
<span style="font-size: 12px;color: rgb(144, 147, 153);">小程序积分商城请升级至V3.0.5及以上版本方可支持</span>
<div class="upload-list-box">
......@@ -171,11 +192,17 @@
</el-form-item> -->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<el-tooltip class="tips-content" popper-class="store-tips" effect="light" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-linkage style="margin-left:10px" v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" />
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1" class="store-card">
<el-tooltip class="tips-content" popper-class="store-tips" effect="light" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-card style="margin-left:10px" class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......@@ -257,7 +284,7 @@
</div>
</div>
<!-- 卡券选择弹框 -->
<vue-gic-card :disabledList="disabledList" :featureModule="projectName" :projectName="projectName" :showCardDialog="showCardDialog" :cardLimit="cardLimit" :cardType="cardType" @selectCard="selectCard" ref="dmcard"></vue-gic-card>
<vue-gic-card :disabledList="disabledList" :featureModule="projectName" :projectName="projectName" :showCardDialog.sync="showCardDialog" :cardLimit="cardLimit" :cardType="cardType" @selectCard="selectCard" ref="dmcard"></vue-gic-card>
</div>
</template>
......@@ -293,7 +320,8 @@ export default {
// 可传参数
projectName: 'integral-mall', //当前项目名
showCardDialog: false,
cardLimit: 3, //卡券限制类型 1-限制领取1张的卡券 2- 限制领取 1~100的卡券 3-限制领取&=100 的卡券
// cardLimit: 3, //卡券限制类型 1-限制领取1张的卡券 2- 限制领取 1~100的卡券 3-限制领取&=100 的卡券
cardLimit: -1, //卡券限制类型 1-限制领取1张的卡券 2- 限制领取 1~100的卡券 3-限制领取&=100 的卡券
cardType: null, //卡券类型集合（0：抵金券，1：折扣券，2：兑换券）null-为全部类型 逗号分隔
disabledList: [],
selectedData: {},
......@@ -325,7 +353,8 @@ export default {
timeRangeList: [{ timeRange: '' }], //部分时段数组
limitTimeBegin: '',
timeZones: ['', ''],
isNewGuestVisible: 0 // 0：新客不可见、1：新客可见
isNewGuestVisible: 0, // 0：新客不可见、1：新客可见
dataDialogueId: '' // 数据对话id
},
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
......@@ -619,6 +648,8 @@ export default {
} else {
this.couponForm.limitTimeBegin = '';
}
// 数据对话id
this.couponForm.dataDialogueId = res.data.result.dataDialogueId;
} else {
this.$message.error(res.data.message);
}
......@@ -647,8 +678,10 @@ export default {
if (this.cardList) {
this.couponForm.cardType = this.cardList[0].cardType;
for (let item of this.cardList) {
item.beginDate = this.getTime2(item.beginDate);
item.endDate = this.getTime2(item.endDate);
// item.beginDate = this.getTime2(item.beginDate);
// item.endDate = this.getTime2(item.endDate);
// item.putBeginDate = this.getTime2(item.putBeginDate);
// item.putEndDate = this.getTime2(item.putEndDate);
this.limitTimesNumArr.push(item.cardLimit);
this.couponCardStockArr.push(item.couponStock);
this.limitTimes = Math.min.apply(null, this.limitTimesNumArr);
......@@ -968,6 +1001,7 @@ export default {
integralMallProId: this.mallProId === '-1' ? '' : this.mallProId, //礼品id
proType: 1, //优惠券
proReferId: proReferIdArr.join(','), //卡券id
dataDialogueId: this.couponForm.dataDialogueId, // 数据对话id
cardCostList: this.cardCouponList.length > 1 ? this.cardCouponList : null,
detailDescription: this.couponForm.detailDescription, //图文详情
giftImageUrls: giftImageUrls.join(','), //礼品主图
......@@ -1241,6 +1275,13 @@ export default {
width: 500px;
margin: 22px 0 22px 133px;
}
.store-card {
position: relative;
}
.tips-content {
position: absolute;
left: -10px;
}
</style>
<style>
.select-shop__right {
......@@ -1285,4 +1326,9 @@ export default {
background: #f2f3f4;
padding: 0 0 20px 124px;
} */
.store-tips {
width: 200px;
position: absolute;
left: -10px;
}
</style>
src/views/goods/gift/gift.vue
......@@ -64,10 +64,13 @@
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
<!-- integralMallProId -->
<el-tooltip :content="'礼品id：' + scope.row.integralMallProId" effect="light" placement="top-start">
<p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
</el-tooltip>
<p class="category-ellipsis">编码：{{ scope.row.proCode }}</p>
</div>
</div>
......@@ -133,7 +136,10 @@
<div>
<el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>
<el-button type="text" v-if="scope.row.changeType === '5' && scope.row.canEdit" @click="getCouponList(scope.row.integralMallProId)">券码</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit" @click="deleteList(scope.row, 1)">下架</el-button>
<!-- <el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit" @click="deleteList(scope.row, 1)">下架</el-button> -->
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 1" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" v-if="scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 0" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.canEdit" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<dm-delete @confirm="deleteList(scope.row, 0, scope.$index)" tips="确定删除该商品吗?">
......
src/views/goods/gift/info.vue
......@@ -57,6 +57,9 @@
<el-button type="text" @click="createCategory">新建分类</el-button>
<span style="display:none">{{ refash }}</span>
</el-form-item>
<el-form-item label="数据对话">
<dm-activity-select :repProjectName="projectName" width="300" :actId.sync="giftForm.dataDialogueId" :showAdd="false"></dm-activity-select>
</el-form-item>
</div>
<div class="section-content">
<h3>销售信息</h3>
......@@ -138,11 +141,17 @@
</el-form-item>-->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(giftId && creatorId) || giftId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<el-tooltip class="tips-content" effect="light" popper-class="store-tips" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-linkage style="margin-left:10px" v-if="(giftId && creatorId) || giftId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes />
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1" class="store-card">
<el-tooltip class="tips-content" effect="light" popper-class="store-tips" content="会员的门店(常规设置)满足展示门店设置，则在礼品/优惠券列表可见" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#1890ff"></i>
</el-tooltip>
<vue-gic-store-card style="margin-left:10px" class="pt10" ref="storeCard" :uuid.sync="uuid" scenes />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="giftForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......@@ -377,6 +386,7 @@ export default {
proReferId: '', //礼品关联id
proName: '',
proCategoryId: '', //分类id
dataDialogueId: '', // 数据对话id
images: [],
gradeType: 1,
memberGrade: [], //适用会员
......@@ -727,6 +737,7 @@ export default {
this.giftForm.proName = res.data.result.proName; //名称
this.proNameLen = getInputVal.getZhLen(this.giftForm.proName);
this.giftForm.proCategoryId = res.data.result.proCategoryId; //分类
this.giftForm.dataDialogueId = res.data.result.dataDialogueId; // 数据对话id
this.giftForm.proCode = res.data.result.proCode; //编码
this.giftForm.integralCost = res.data.result.integralCost; //积分
this.giftForm.cashCost = res.data.result.cashCost; //现金
......@@ -1721,6 +1732,7 @@ export default {
proReferId: this.giftForm.proReferId, //关联id
cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
proCategoryId: this.giftForm.proCategoryId, //礼品分类
dataDialogueId: this.giftForm.dataDialogueId, // 数据对话id
detailDescription: this.giftForm.detailDescription, //图文详情
gradeType: this.giftForm.gradeType,
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
......@@ -2085,6 +2097,13 @@ export default {
position: absolute;
left: -25px;
}
.store-card {
position: relative;
}
.tips-content {
position: absolute;
left: -10px;
}
</style>
<style>
.upload-list-box .el-upload--picture-card {
......@@ -2118,4 +2137,9 @@ export default {
background: #f2f3f4;
padding: 0 0 20px 124px;
} */
.store-tips {
width: 200px;
position: absolute;
left: -10px;
}
</style>
src/views/order/couponExchange.vue
......@@ -90,6 +90,7 @@
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">兑换渠道：{{ orderInfo.source === '0' || orderInfo.source === '1' ? '二维码扫描' : orderInfo.source === '3' ? '常规兑换' : orderInfo.source === '2' ? '其他' : '' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
......@@ -299,21 +300,23 @@ export default {
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
},
getOrderInfo(i, integralMallProExchangeId) {
let params = {
integralMallProExchangeId: integralMallProExchangeId
};
request.get('/api-integral-mall/get-order-information', { params }).then(res => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result) {
this.orderInfo = res.data.result;
if (i) {
let params = {
integralMallProExchangeId: integralMallProExchangeId
};
request.get('/api-integral-mall/get-order-information', { params }).then(res => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result) {
this.orderInfo = res.data.result;
} else {
this.orderInfo = {};
}
} else {
this.orderInfo = {};
this.$message.error(res.data.message);
}
} else {
this.$message.error(res.data.message);
}
});
});
}
},
// 排序
sortChange(value) {
......
src/views/order/giftExchange.vue
......@@ -89,6 +89,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">兑换渠道：{{ orderInfo.source === '0' || orderInfo.source === '1' ? '二维码扫描' : orderInfo.source === '3' ? '常规兑换' : orderInfo.source === '2' ? '其他' : '' }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}</el-dropdown-item>
......
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