Skip to content

I
integral-mall
Commit 570fbb67 by 萱草
Options

update: 更改

parent 5e0931b0
Showing with 89 additions and 5 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.75da70f40bf85a85154ba79e4a6f02f3.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.51bcf100c25cc07ec41d.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.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
dist/static/css/app.75da70f40bf85a85154ba79e4a6f02f3.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.a73c4999dcd165619ab0c8a6fb7819f3.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.51bcf100c25cc07ec41d.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.df9a3af62cff0c8a1cb3.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/activities/flashSale/detail.vue
......@@ -73,15 +73,68 @@
</el-form-item>
<el-form-item label="活动商品设置">
<div class="add-sku-content">
<div class="add-table" v-if="selectList.length">
<el-table :data="selectList" ref="multipleTable" style="width: 100%">
<el-table-column label="商品信息">
<template slot-scope="{ row }">
<div class="gift-info" v-if="row.giftType">
<img :src="row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p class="category-ellipsis">编码：{{ row.proCode }}</p>
</div>
</div>
<div class="gift-info" v-else>
<img v-if="row.mainImageUrl" :src="row.mainImageUrl" alt />
<img v-if="row.cardType === 2 && !row.mainImageUrl" src="../../../../static/img/quan02.png" alt />
<img v-if="row.cardType === 0 && !row.mainImageUrl" src="../../../../static/img/quan01.png" alt />
<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>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="原价">
<template slot-scope="{ row }">{{ row.integralCost }}积分+{{ row.cashCost }}元</template>
</el-table-column>
<el-table-column label="当前库存">
<template slot-scope="{ row }">{{ row.virtualStock }}</template>
</el-table-column>
<el-table-column label="活动价格">
<template slot-scope="{ row }">
<div><el-input v-model="row.integral" placeholder="输入积分" size="small" class="w-110"></el-input></div>
<div class="mt10"><el-input v-model="row.cash" placeholder="输入现金" size="small" class="w-110"></el-input></div>
</template>
</el-table-column>
<el-table-column label="活动库存">
<template slot-scope="{ row }">
<div><el-input v-model="row.integral" placeholder="输入库存" size="small" class="w-110"></el-input></div>
<div class="mt10"><el-input v-model="row.cash" placeholder="输入限兑数量" size="small" class="w-110"></el-input></div>
</template>
</el-table-column>
<!-- <el-table-column label="参与活动">
<template slot-scope="{ row }"></template>
</el-table-column> -->
<el-table-column label="操作">
<template slot-scope="{ row }">
<el-button type="text">删除</el-button>
<el-button type="text" v-if="row.giftType && JSON.parse(row.giftProStandardJson).length">收起</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="add-sku">
<div class="add-sku-button">
<el-button @click="addGoods" type="text">添加商品&nbsp;({{ goodsLen }}/20)</el-button>
<el-button @click="addGoods" type="text">添加商品&nbsp;({{ selectList.length }}/20)</el-button>
</div>
</div>
</div>
</el-form-item>
</el-form>
</div>
<goods-select v-if="goodsDialog" :selectListMore="selectListMore" @closeGoodsSelect="closeGoodsSelect" @getSelectList="getSelectList"></goods-select>
</div>
</div>
</template>
......@@ -90,8 +143,12 @@
// import qs from 'qs';
// import request from '../../../service/request.js';
import getInputVal from '../../../utils/common.js';
import goodsSelect from '../../../components/goodsSelect';
// import copy from '../../../utils/clone.js';
export default {
components: {
goodsSelect
},
data() {
return {
isEdit: '',
......@@ -137,17 +194,34 @@ export default {
headersUpload: {
sign: ''
},
goodsLen: 0, // 添加商品的个数
goodsDialog: false // 选择商品弹窗
goodsDialog: false, // 选择商品弹窗
selectList: [], // 选中的商品
selectListMore: []
};
},
created() {
this.isEdit = this.$route.query.edit;
},
methods: {
// 选中活动商品
getSelectList(val) {
if (val) {
this.selectList = val;
}
// this.deleteList = [];
// for (let i in val) {
// this.deleteList.push(val[i].mallProId);
// }
},
// 开启和关闭选择商品弹窗
addGoods() {
this.selectListMore = this.selectList;
this.goodsDialog = true;
},
closeGoodsSelect(val) {
this.goodsDialog = false;
// this.selectListMore = this.selectList;
},
changeLimit(value) {
if (value.length) {
this.flashSaleForm.limit2 = 1;
......@@ -243,6 +317,12 @@ export default {
.w-140 {
width: 140px;
}
.w-110 {
width: 110px;
}
.mt10 {
margin-top: 10px;
}
/* .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9 !important;
border-radius: 6px;
......@@ -293,6 +373,10 @@ export default {
.add-sku-content {
border: 1px solid #e4e7ed;
}
.add-table {
margin: 10px 13px;
background: #f7f8fa;
}
.add-sku {
margin: 10px 13px;
padding-top: 7px;
......
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