Skip to content

I
integral-mall
Commit 8a23f392 by damodmg
Options

修改

parent 976c3a51
Showing with 37 additions and 9 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.650a9746aa8a2ff40ac133a3edd04641.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/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.0ec41083027d41bdd5c7.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.b0f590527623ca8fe546c48bca478c9e.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/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.6c005c64bb0d5329f56c.js></script></body></html>
\ No newline at end of file
dist/static/css/app.650a9746aa8a2ff40ac133a3edd04641.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.b0f590527623ca8fe546c48bca478c9e.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.0ec41083027d41bdd5c7.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.6c005c64bb0d5329f56c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/getSkuList.vue
......@@ -124,6 +124,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......@@ -136,6 +138,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......
src/views/goods/gift/addSku.vue
......@@ -185,6 +185,7 @@ export default {
}
});
},
// 规格去重
getStdList(item) {
let arrIds = [];
......@@ -252,12 +253,17 @@ export default {
getStdValueList(item) {
this.refash = !this.refash;
this.getValueId(item);
this.handleSku();
},
// 点击规格下拉选中
getSelected(i, item) {
item.valueList = [{ valueName: '', valueId: '' }];
item.standardName = i.standardName;
item.standardId = i.standardId;
this.refash = !this.refash;
this.handleSku();
this.$emit('getStandradList', this.skuJson);
this.$emit('getSkuList', this.skuList);
},
//点击规格值
getSelectedValue(i, item, index) {
......@@ -363,16 +369,23 @@ export default {
// 批量填充的
// 积分
limitIntergral(value) {
if (!Number(this.intergral)) {
if (Number(this.intergral) === 0) {
return false;
} else if (!Number(this.intergral)) {
this.$message.error('请输入数字类型');
this.intergral = '';
} else if (!Number(this.intergral) < 0) {
this.$message.error('请输入大于等于0的数字');
this.intergral = '';
} else {
this.intergral = Number(this.intergral).toFixed(0);
}
},
// 现金
limitCash() {
if (Number(this.cash) < 0) {
if (Number(this.intergral) === 0) {
return false;
} else if (Number(this.cash) < 0) {
this.$message.error('请输入大于0的数字');
this.cash = '';
} else if (!Number(this.cash)) {
......@@ -469,6 +482,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(this.giftForm.cashCost) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......@@ -480,6 +495,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......
src/views/goods/gift/info.vue
......@@ -18,7 +18,7 @@
<div class="section-content">
<h3>基础信息</h3>
<el-form-item label="礼品名称" prop="proName">
<el-input v-model="giftForm.proName" class="w-376" type="text" placeholder="请输入礼品名称" @input="value => goodsLimit(value)">
<el-input v-model="giftForm.proName" class="w-600" type="text" placeholder="请输入礼品名称" @input="value => goodsLimit(value)">
<span slot="suffix">{{ proNameLen }}/30</span>
</el-input>
</el-form-item>
......@@ -519,6 +519,8 @@ export default {
if (Number(this.giftForm.integralCost) < 0) {
this.$message.error('请输入大于0的数字');
this.giftForm.integralCost = '';
} else if (Number(this.giftForm.cashCost) === 0) {
return false;
} else if (!Number(this.giftForm.integralCost)) {
this.$message.error('请输入数字类型');
this.giftForm.integralCost = '';
......@@ -529,8 +531,10 @@ export default {
limitCash() {
//现金
if (Number(this.giftForm.cashCost) < 0) {
this.$message.error('请输入大于0的数字');
this.$message.error('请输入大于等于0的数字');
this.giftForm.cashCost = '';
} else if (Number(this.giftForm.cashCost) === 0) {
return false;
} else if (!Number(this.giftForm.cashCost)) {
this.$message.error('请输入数字类型');
this.giftForm.cashCost = '';
......@@ -708,7 +712,7 @@ export default {
this.giftForm.timeRangeList.splice(index, 1);
},
changeDeliver() {
if (this.giftForm.changeType === 2) {
if (this.giftForm.changeType === 1) {
this.refundTypeStatus = true;
this.giftForm.refundType = 0;
} else {
......@@ -1046,6 +1050,9 @@ export default {
.w-300 {
width: 300px;
}
.w-600 {
width: 600px;
}
.mall-content-section {
position: relative;
}
......
src/views/order/refundList.vue
......@@ -11,7 +11,7 @@
<span>退款列表</span>
</h3>
</div>
<el-tabs v-model="activeName" class="bread-content" v-loading="loading">
<el-tabs v-model="activeName" class="bread-content">
<div style="height:24px;background:#f0f2f5;"></div>
<div>
<div class="operate-top">
......@@ -36,7 +36,7 @@
<el-tab-pane label="'退款成功" name="third" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款关闭" name="fouth" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="220px">
<template slot-scope="scope">
......
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