Skip to content

I
integral-mall
Commit b17ebee5 by 萱草
Options

update: 优化上架异常信息

parent bf3be497
Showing with 73 additions and 4 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.5be1f0c261b1556b868df42094c86727.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.7f14dd5429924a032263.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.201a0cfb20d95f8766f149a8e395d151.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.c9a851e8e66fb20d3001.js></script></body></html>
\ No newline at end of file
dist/static/css/app.201a0cfb20d95f8766f149a8e395d151.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.5be1f0c261b1556b868df42094c86727.css 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.7f14dd5429924a032263.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.c9a851e8e66fb20d3001.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/coupon.vue
......@@ -166,7 +166,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>
<!-- 调整积分费用 -->
......@@ -228,7 +248,11 @@ export default {
integralMallProId: ''
},
integralMallProId: '',
saleType: ''
saleType: '',
errorMessage: '',
errorList: '',
outerVisible: false,
innerVisible: false
};
},
created() {
......@@ -431,6 +455,12 @@ 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({
dangerouslyUseHTMLString: true,
......@@ -441,6 +471,14 @@ export default {
}
});
},
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 } });
......@@ -583,3 +621,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>
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