Skip to content

I
integral-mall
Commit fd8e822c by 萱草
Options

update: 更改

parent 570fbb67
Showing with 81 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.a73c4999dcd165619ab0c8a6fb7819f3.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.df9a3af62cff0c8a1cb3.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.c4958fd0f0d839e4f44a23309dbcc906.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.3bd025b7400ea5429377.js></script></body></html>
\ No newline at end of file
dist/static/js/app.3bd025b7400ea5429377.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.df9a3af62cff0c8a1cb3.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
......@@ -2,7 +2,7 @@
<el-dialog :visible.sync="dialogVisible" title="选择商品" width="1000px" @close="cancelSubmit()">
<div>
<div class="search-item">
<el-select v-model="type" clearable class="w-160" @change="getInfo">
<el-select v-model="type" clearable class="w-160" @change="changeType">
<el-option label="礼品" :value="0"></el-option>
<el-option label="优惠券" :value="1"></el-option>
</el-select>
......@@ -26,13 +26,13 @@
<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-column type="selection" width="50" reserve-selection> </el-table-column>
<el-table-column label="商品信息" min-width="300px">
<el-table-column label="商品信息" min-width="200px">
<template slot-scope="{ row }">
<div class="gift-info" v-if="!type">
<img :src="row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p class="category-ellipsis">编码：{{ row.proCode }}</p>
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
</div>
</div>
<div class="gift-info" v-else>
......@@ -42,14 +42,20 @@
<img v-if="row.cardType === 1 && !row.mainImageUrl" src="../../static/img/quan03.png" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proTitle }}</p>
<p class="category-ellipsis">{{ row.remarks || '--' }}</p>
<p v-if="row.proReferId.split(',').length > 1" class="category-ellipsis">--</p>
<p v-else class="category-ellipsis">{{ row.remarks || '--' }}</p>
</div>
</div>
</template>
</el-table-column>
<!-- <el-table-column label="投放有效期" v-if="type">
<template></template>
</el-table-column> -->
<el-table-column label="投放有效期" v-if="type" min-width="120px">
<template slot-scope="{ row }">
<p v-if="row.proReferId.split(',').length === 1 && row.exchangeFixDateBegin && row.exchangeFixDateEnd">{{ getTimeAll(row.exchangeFixDateBegin) }}&nbsp;至</p>
<p v-if="row.proReferId.split(',').length === 1 && row.exchangeFixDateBegin && row.exchangeFixDateEnd">{{ getTimeAll(row.exchangeFixDateEnd) }}</p>
<p v-if="row.proReferId.split(',').length === 1 && !row.exchangeFixDateBegin && !row.exchangeFixDateEnd">长期有效</p>
<p v-if="row.proReferId.split(',').length !== 1">--</p>
</template>
</el-table-column>
<el-table-column label="商品状态">
<template slot-scope="{ row }">
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 1">已下架</span>
......@@ -88,7 +94,8 @@
<script>
import qs from 'qs';
import request from '../service/request.js';
// import copy from '../utils/clone.js';
import copy from '../utils/clone.js';
import getInputVal from '../utils/common.js';
export default {
props: {
selectListMore: {
......@@ -100,6 +107,7 @@ export default {
},
data() {
return {
getTimeAll: getInputVal.formatDate,
loading: false,
type: 0, // 礼品或优惠券
shelf: '', // 上下架状态
......@@ -114,6 +122,7 @@ export default {
stockStatus: '', // 礼品库存状态
tableData: [],
selectArr: [], // 全选数据
selectArr2: [], // 全选数据
val: []
};
},
......@@ -121,8 +130,10 @@ export default {
this.dialogVisible = true;
this.getInfo();
if (this.selectListMore.length > 0) {
this.selectArr = JSON.parse(JSON.stringify(this.selectListMore || '[]'));
console.log(this.selectArr);
// this.selectArr = JSON.parse(JSON.stringify(this.selectListMore || '[]'));
// this.selectArr = copy(this.selectListMore);
this.selectArr2 = copy(this.selectListMore);
// console.log(this.selectArr);
this.requestData();
}
},
......@@ -170,6 +181,13 @@ export default {
});
}
},
changeType() {
this.getInfo();
if (this.selectListMore.length > 0) {
this.selectArr2 = copy(this.selectListMore);
this.requestData();
}
},
// 排序
sortChange(value) {
this.query.sortColumn = value.prop;
......@@ -195,7 +213,7 @@ export default {
requestData() {
// 将已选的数据筛选出来在进行选中
setTimeout(() => {
this.selectArr.forEach(item => {
this.selectArr2.forEach(item => {
this.tableData.forEach((row, index) => {
if (row.integralMallProId === item.integralMallProId) {
//这是默认选中上的
......@@ -208,16 +226,48 @@ export default {
// 全选操作
handleSelectAll(val) {
console.log(val);
// let valCpoy = copy(val);
// valCpoy.forEach((item, index) => {
// this.selectArr.forEach(it => {
// if (item.integralMallProId !== it.integralMallProId) {
// this.selectArr.push(val[index]);
// // this.$emit('getSelectList', this.selectArr);
// }
// });
// });
this.selectArr = val;
let valCopy = copy(val);
let valCopy2 = copy(val);
// let valCopy3 = [];
console.log(this.selectArr2);
if (this.selectArr2.length) {
// valCopy2.forEach((item, index) => {
// this.selectArr2.forEach(it => {
// if (item.integralMallProId === it.integralMallProId) {
// valCopy2.splice(index, 1);
// // this.$emit('getSelectList', this.selectArr);
// console.log(valCopy3);
// }
// });
// });
let result = [];
for (let i = 0; i < valCopy2.length; i++) {
let obj = valCopy2[i];
let num = obj.integralMallProId;
let isExist = false;
for (let j = 0; j < this.selectArr2.length; j++) {
let aj = this.selectArr2[j];
let n = aj.integralMallProId;
if (n == num) {
isExist = true;
break;
}
}
if (!isExist) {
result.push(obj);
}
}
console.log(result);
if (result.length) {
result.forEach(item => {
this.selectArr2.push(item);
console.log(this.selectArr2);
});
}
this.selectArr = copy(this.selectArr2);
} else {
this.selectArr = valCopy;
}
},
cancelSubmit() {
this.dialogVisible = false;
......@@ -241,19 +291,21 @@ export default {
.gift-info img {
width: 60px;
height: 60px;
border-radius: 4px;
padding: 4px;
background: #ffffff;
border: 1px solid #dcdfe6;
margin-right: 10px;
/* border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6; */
}
.info-name {
display: inline-block;
vertical-align: top;
margin-left: 10px;
width: 60%;
}
.pro-ellipsis {
color: #606266;
height: 54px;
height: 45px;
line-height: 22px;
/* width: 230px; */
font-size: 14px;
......
src/views/activities/flashSale/list.vue
......@@ -145,12 +145,12 @@ export default {
console.log(index);
},
addActivity() {
this.$router.push({ name: 'flashSaleInfo', query: { giftId: '', edit: '0', canEdit: '' } });
this.$router.push({ name: 'flashSaleInfo', query: { giftId: '', edit: false, canEdit: '' } });
},
edit(item) {
console.log(item);
// this.$router.push({ name: 'flashSaleInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId, canEdit: item.canEdit } });
this.$router.push({ name: 'flashSaleInfo', query: { giftId: '', edit: '1', canEdit: '' } });
this.$router.push({ name: 'flashSaleInfo', query: { giftId: '', edit: true, canEdit: '' } });
}
},
computed: {
......
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