Skip to content

I
integral-mall
Commit 6ad39df0 by 萱草
Options

update: 数据对话及卡券异常提示

parent 3acc741f
Showing with 33 additions and 12 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.0d6f3360c7f732fd33634bda5554e0d7.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.11.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.547f2323d83b9f6ce650.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.fbf292b99a8e38aca2e1da35ef1ac82f.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.64.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/card.2.0.13.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.c7c36016c0761e77c90d.js></script></body></html>
\ No newline at end of file
dist/static/js/app.547f2323d83b9f6ce650.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.c7c36016c0761e77c90d.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/store-new.2.0.11.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.64.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/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.13.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/views/goods/coupon/coupon.vue
......@@ -60,9 +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">
<el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="light" placement="top-start">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
</el-tooltip>
<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>
......
src/views/goods/coupon/info.vue
......@@ -62,6 +62,9 @@
<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">
......@@ -270,7 +273,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>
......@@ -306,7 +309,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: {},
......@@ -338,7 +342,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',
......@@ -632,6 +637,8 @@ export default {
} else {
this.couponForm.limitTimeBegin = '';
}
// 数据对话id
this.couponForm.dataDialogueId = res.data.result.dataDialogueId;
} else {
this.$message.error(res.data.message);
}
......@@ -981,6 +988,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(','), //礼品主图
......
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>
......@@ -383,6 +386,7 @@ export default {
proReferId: '', //礼品关联id
proName: '',
proCategoryId: '', //分类id
dataDialogueId: '', // 数据对话id
images: [],
gradeType: 1,
memberGrade: [], //适用会员
......@@ -733,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; //现金
......@@ -1727,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(','), //适用会员
......
src/views/order/couponExchange.vue
......@@ -90,7 +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.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>
......
src/views/order/giftExchange.vue
......@@ -89,7 +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.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