Skip to content

I
integral-mall
Commit 1ba4b67b by damodmg
Options

更新商品列表创建人

parent 4625931f
Showing with 32 additions and 10 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.b60e01b307e67355d1b907f849e78348.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.2147a2449eea48c8a935.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.6c075e9f4b741a7c1be015507b0446fb.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.ae20b7ce10ce59629839.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2147a2449eea48c8a935.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.ae20b7ce10ce59629839.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
......@@ -24,6 +24,9 @@
<el-option label="已下架" :value="1"></el-option>
</el-select>
</div>
<div class="search-item">
<el-checkbox v-model="showSelfStatus" label="仅见本人" border @change="getListCurr"></el-checkbox>
</div>
</div>
<div class="fr">
<div class="search-item">
......@@ -37,8 +40,8 @@
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="220px">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column label="礼品信息" min-width="260px">
<template slot-scope="scope">
<div class="gift-info">
<!-- <p v-if="scope.row.cardType === 2" style="display:inline-block">
......@@ -88,6 +91,9 @@
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="创建人" min-width="110px">
<template slot-scope="scope">{{ scope.row.creatorName ? scope.row.creatorName : '--' }}</template>
</el-table-column>
<el-table-column prop="sort" label="序号" sortable="custom" min-width="140px" :render-header="renderHeader">
<template slot-scope="scope">
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">{{ scope.row.sort }}<i class="el-icon-edit" @click="editNumber(scope.row)"></i></p>
......@@ -160,6 +166,7 @@ export default {
shelf: '', //上下架状态
goodsType: '', //批量操作
tableDate: [],
showSelfStatus: false,
currentPage: 1,
pageSizes: [20, 40, 60, 80],
pageSize: 20,
......@@ -216,7 +223,8 @@ export default {
sortType: this.sortType,
sortColumn: this.sortColumn,
giftName: this.searchValue,
shelf: this.shelf ? this.shelf : -1 //上架状态
shelf: this.shelf ? this.shelf : -1, //上架状态
showSelfFlag: this.showSelfStatus ? 1 : 0
};
this.loading = true;
request.post('/api-integral-mall/page-cards', qs.stringify(params)).then(res => {
......@@ -448,6 +456,9 @@ export default {
this.editInfoModal.mallProId = item.integralMallProId;
this.editInfoModal.dialogVisible = true;
},
selectInit(row, index) {
return row.canEdit;
}
},
components: {
......
src/views/goods/gift/gift.vue
......@@ -33,6 +33,9 @@
<el-option label="虚拟礼品" :value="2"></el-option>
</el-select>
</div>
<div class="search-item">
<el-checkbox v-model="showSelfStatus" label="仅见本人" border @change="getListCurr"></el-checkbox>
</div>
</div>
<div class="fr">
<div class="search-item">
......@@ -46,8 +49,8 @@
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="340px">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt="" />
......@@ -87,6 +90,9 @@
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="创建人" min-width="110px">
<template slot-scope="scope">{{ scope.row.creatorName ? scope.row.creatorName : '--' }}</template>
</el-table-column>
<el-table-column prop="sort" label="序号" sortable="custom" min-width="140px" :render-header="renderHeader">
<template slot-scope="scope">
<p v-if="!scope.row.editStatus" class="edit-number intergral-edit">{{ scope.row.sort }}<i class="el-icon-edit" @click="editNumber(scope.row)"></i></p>
......@@ -166,6 +172,7 @@ export default {
giftType: '', //商品类型
sortColumn: '',
sortType: '',
showSelfStatus: false,
tableDate: [
{
giftName: '1111'
......@@ -258,7 +265,8 @@ export default {
giftName: this.searchValue.trim(),
giftType: this.giftType ? this.giftType : -1,
shelf: this.shelf ? this.shelf : -1, //上架状态
goodsType: this.goodsType //商品类型
goodsType: this.goodsType, //商品类型
showSelfFlag: this.showSelfStatus ? 1 : 0
};
this.loading = true;
request.post('/api-integral-mall/page-gift', qs.stringify(params)).then(res => {
......@@ -637,6 +645,9 @@ export default {
this.$message.error(res.data.message);
}
});
},
selectInit(row, index) {
return row.canEdit;
}
},
components: {
......@@ -670,11 +681,11 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 72%;
width: 60%;
}
.pro-ellipsis {
color: #303133;
height: 36px;
height: 54px;
line-height: 18px;
/* width: 230px; */
font-size: 14px;
......
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