Skip to content

I
integral-mall
Commit 10a4b4d6 by 萱草
Options

update: bug修复及样式更改

parent a9de259b
Showing with 54 additions and 29 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.454f65220233246f4ebb86b9199f6e55.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.45.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.71.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.de22c94d2dfc8a048fe5.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.4666fda7ca73b526099f472b3b3890a5.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.45.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.71.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.2603a1b09aa749d6b771.js></script></body></html>
\ No newline at end of file
dist/static/css/app.454f65220233246f4ebb86b9199f6e55.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.4666fda7ca73b526099f472b3b3890a5.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.2603a1b09aa749d6b771.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.de22c94d2dfc8a048fe5.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goodsSelect.vue
......@@ -24,7 +24,7 @@
</div>
</div>
<div v-loading="loading" style="margin-top:20px">
<el-table :data="tableData" ref="maytable" style="width: 100%" :row-key="getRowKeys" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table :data="tableData" ref="maytable" style="width: 100%" :row-key="getRowKeys" @sort-change="sortChange" @row-click="handleSelectSingle" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" reserve-selection> </el-table-column>
<el-table-column label="商品信息" min-width="200px">
<template slot-scope="{ row }">
......@@ -128,9 +128,13 @@ export default {
stockStatus: '', // 礼品库存状态
tableData: [],
selectArr: [], // 全选数据
selectArr2: [], // 全选数据
selectArr2: [],
selectArr3: [],
val: [],
total: 999
total: 999,
dataLength: 0,
valCopy: '',
valCopy2: ''
};
},
created() {
......@@ -138,6 +142,7 @@ export default {
this.getInfo();
if (this.selectListMore.length > 0) {
this.selectArr2 = copy(this.selectListMore);
this.dataLength = this.selectArr2.length;
this.requestData();
}
},
......@@ -229,11 +234,28 @@ export default {
},
// 确认
confirmSelect() {
this.$emit('getSelectList', this.selectArr);
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeGoodsSelect');
}, 10);
if (this.selectArr2.length) {
if (this.handleResult.length) {
this.handleResult.forEach(item => {
this.selectArr2.push(item);
});
}
this.selectArr3 = copy(this.selectArr2);
} else {
this.selectArr3 = this.valCopy;
}
if (this.selectArr3.length > 20) {
this.$message.error(`现已选择${this.selectArr3.length}个商品，最多选择20个商品`);
this.selectArr2 = copy(this.selectListMore);
this.selectArr3 = [];
} else {
this.selectArr = copy(this.selectArr3);
this.$emit('getSelectList', this.selectArr);
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeGoodsSelect');
}, 10);
}
},
getRowKeys(row) {
//唯一值，一般都未id
......@@ -254,12 +276,13 @@ export default {
},
// 全选操作
handleSelectAll(val) {
let valCopy = copy(val);
let valCopy2 = copy(val);
this.valCopy = copy(val);
this.valCopy2 = copy(val);
if (this.selectArr2.length) {
let result = [];
for (let i = 0; i < valCopy2.length; i++) {
let obj = valCopy2[i];
// let result = [];
this.handleResult = [];
for (let i = 0; i < this.valCopy2.length; i++) {
let obj = this.valCopy2[i];
let num = obj.integralMallProId;
let isExist = false;
for (let j = 0; j < this.selectArr2.length; j++) {
......@@ -271,19 +294,15 @@ export default {
}
}
if (!isExist) {
result.push(obj);
// result.push(obj);
this.handleResult.push(obj);
}
}
if (result.length) {
result.forEach(item => {
this.selectArr2.push(item);
});
}
this.selectArr = copy(this.selectArr2);
} else {
this.selectArr = valCopy;
}
},
handleSelectSingle(val) {
this.$refs.maytable.toggleRowSelection(val);
},
cancelSubmit() {
this.dialogVisible = false;
setInterval(() => {
......
src/views/activities/flashSale/detail.vue
......@@ -125,14 +125,14 @@
<el-table-column label="当前库存" v-if="!isEdit">
<template slot-scope="{ row }">{{ row.virtualStock }}</template>
</el-table-column>
<el-table-column label="活动价格">
<el-table-column label="活动价格" min-width="100px">
<template slot-scope="{ row }">
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityIntegral" :disabled="!row.activityProStatus" placeholder="输入积分" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityPrice" :disabled="!row.activityProStatus" placeholder="输入现金" size="small" class="w-110"></el-input></div>
<span v-if="isEdit">{{ row.activityIntegral ? row.activityIntegral : '0' }}积分+{{ row.activityPrice ? row.activityPrice : '0' }}元</span>
</template>
</el-table-column>
<el-table-column label="活动库存">
<el-table-column label="活动库存" min-width="100px">
<template v-slot:header>
<span>活动库存</span>
<el-tooltip effect="dark" placement="top">
......@@ -1163,10 +1163,10 @@ export default {
color: #606266;
}
.add-sku-button:hover {
border: 1px dashed #597ef7;
border: 1px dashed #1890ff;
}
.add-sku-button:hover .el-button {
color: #597ef7;
color: #1890ff;
}
.gift-info img {
......@@ -1175,6 +1175,7 @@ export default {
background: #ffffff;
border: 1px solid #dcdfe6;
margin-right: 10px;
vertical-align: middle;
/* border-radius: 4px; */
/* padding: 4px; */
/* border: 1px solid #dcdfe6; */
......
src/views/goods/coupon/coupon.vue
......@@ -659,6 +659,7 @@ export default {
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
vertical-align: middle;
}
.info-name {
display: inline-block;
......
src/views/goods/coupon/info.vue
......@@ -197,6 +197,7 @@
</el-tab-pane>
</el-tabs>
<div style="margin-top:10px;text-align:right">
<el-button type="default" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" @click="saveLadderDetail">保存</el-button>
</div>
<el-button slot="reference" type="text" v-show="isDifferentialPricing" class="set-ladder" @click="setLadder">点击设置</el-button>
......
src/views/goods/gift/gift.vue
......@@ -795,6 +795,7 @@ export default {
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
vertical-align: middle;
}
.info-name {
display: inline-block;
......
src/views/goods/gift/info.vue
......@@ -172,6 +172,7 @@
</el-tab-pane>
</el-tabs>
<div style="margin-top:10px;text-align:right">
<el-button type="default" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" @click="saveLadderDetail">保存</el-button>
</div>
<el-button slot="reference" type="text" v-show="isDifferentialPricing" class="set-ladder" @click="setLadder">点击设置</el-button>
......
src/views/goods/soldStatistics/statistics.vue
......@@ -32,7 +32,7 @@
<el-table-column label="礼品">
<template slot-scope="{ row }">
<div class="gift-info">
<img :src="row.giftProImageUrl" alt />
<img :src="row.giftProImageUrl" style="margin-right:10px" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.giftProName }}</p>
<p class="category-ellipsis">编码：{{ row.giftProCode }}</p>
......@@ -210,6 +210,7 @@ export default {
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
vertical-align: middle;
}
.info-name {
display: inline-block;
......
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