Skip to content

I
integral-mall
Commit a63bb0a9 by damodmg
Options

调整1

parent f06c5678
Showing with 17 additions and 16 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.22be846976e8836a7f3adb618924521a.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.8a1b8ec45c2ba0f918db.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.b15fae0abba5703094b69beb0b776fa6.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.cec5d0f83662c5d3f894.js></script></body></html>
\ No newline at end of file
dist/static/css/app.22be846976e8836a7f3adb618924521a.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.b15fae0abba5703094b69beb0b776fa6.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.8a1b8ec45c2ba0f918db.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.cec5d0f83662c5d3f894.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -6,7 +6,7 @@
<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>
<title>积分商城</title>
</head>
<body>
<div id="app"></div>
......
src/views/goods/gift/addSku.vue
......@@ -658,10 +658,11 @@ export default {
width: 900px;
border: 1px solid #e4e7ed;
margin-top: 22px;
padding: 0 8px;
/* padding: 0 8px; */
}
.sku-list-content .operate-top {
margin-top: 22px;
margin: 22px 8px 0 8px;
}
.red-color {
color: #f5222d;
......@@ -671,7 +672,7 @@ export default {
}
/* 表格 */
.sku-table {
width: 100%;
width: 884px;
font-size: 14px;
color: #606266;
margin-bottom: 12px;
......
src/views/goods/gift/info.vue
......@@ -98,10 +98,11 @@
</div>
<div class="section-content">
<h3>图文信息</h3>
<div class="tinymce-wrap">
<tinymce-edit ref="tinymceWrap" :bodyHtml="giftForm.detailDescription" :projectName="projectName"></tinymce-edit>
</div>
<el-form-item label="">
<div class="tinymce-wrap">
<tinymce-edit ref="tinymceWrap" :bodyHtml="giftForm.detailDescription" :projectName="projectName"></tinymce-edit>
</div>
</el-form-item>
</div>
<div class="section-content">
<h3>兑换设置</h3>
......@@ -1219,9 +1220,7 @@ export default {
.mall-content-section {
position: relative;
}
.tinymce-wrap {
margin-left: 32px;
}
/* 锚记 */
.anchor-link {
width: 120px;
......@@ -1285,7 +1284,7 @@ export default {
}
/* 表格 */
.spu-table {
width: 920px;
width: 900px;
font-size: 14px;
color: #606266;
margin-bottom: 12px;
......
src/views/order/closeOrder.vue
......@@ -53,8 +53,8 @@ export default {
if (valid) {
let params = {
integralMallProExchangeId: this.refunOrderdModal.integralMallProExchangeId,
cancelReason: this.refundForm.closeReason,
opType: this.refunOrderdModal.orderStatus === 11 ? 4 : 2
cancelReason: this.refunOrderdModal.status === 11 ? '' : this.refundForm.closeReason,
opType: this.refunOrderdModal.status === 11 ? 4 : 2
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
......
src/views/order/closeRefund.vue
......@@ -50,7 +50,7 @@ export default {
this.$refs[formName].validate(valid => {
if (valid) {
let params = {
integralMallProRefundId: this.refundModal.mallProId,
integralMallProRefundId: this.refundModal.integralMallProRefundId,
reason: this.refundForm.reason
};
request.get('/api-integral-mall/refuse-refund', { params }).then(res => {
......
src/views/order/couponExchange.vue
......@@ -302,6 +302,7 @@ export default {
// 关闭订单
closeOrder(item) {
this.refunOrderdModal.integralMallProExchangeId = item.integralMallProExchangeId;
this.refunOrderdModal.status = item.status;
this.refunOrderdModal.dialogVisible = true;
}
},
......
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