Skip to content

I
integral-mall
Commit fff6a0c2 by dyf
Options

新功能

parent a348d9cc
Showing with 272 additions and 2 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.1fa2312f2735e42ab69e14e62e27bd90.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.33.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.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.35.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.13.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 type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.6229d770ae58d02c52fb.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.5378f16485f6269156b1abb7a911a565.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.33.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.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.35.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.13.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 type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.0da5ee1ed110aedc287c.js></script></body></html>
\ No newline at end of file
dist/static/css/app.1fa2312f2735e42ab69e14e62e27bd90.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.5378f16485f6269156b1abb7a911a565.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.0da5ee1ed110aedc287c.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.6229d770ae58d02c52fb.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/router/index.js
......@@ -12,6 +12,8 @@ import refundList from '../views/order/refundList';
import deliverSet from '../views/setting/deliverSet';
import editDeliver from '../views/setting/editDeliver';
import orderDetail from '../views/order/orderDetail';
import recordList from '../views/setting/recordList';
import convenSet from '../views/setting/convenSet';
Vue.use(VueClipboard);
const router = new Router({
......@@ -72,6 +74,16 @@ const router = new Router({
path: '/editDeliver',
name: 'editDeliver',
component: editDeliver
},
{
path: '/recordList',
name: 'recordList',
component: recordList
},
{
path: '/convenSet',
name: 'convenSet',
component: convenSet
}
]
}
......
src/views/goods/gift/gift.vue
......@@ -28,6 +28,12 @@
</el-select>
</div>
<div class="search-item">
<el-select v-model="stockStatus" placeholder="库存状态" clearable class="w-140" @change="getListCurr">
<el-option label="有库存" :value="1"></el-option>
<el-option label="无库存" :value="2"></el-option>
</el-select>
</div>
<div class="search-item">
<el-select v-model="giftType" placeholder="礼品类型" clearable class="w-140" @change="getListCurr">
<el-option label="实物礼品" :value="1"></el-option>
<el-option label="虚拟礼品" :value="2"></el-option>
......@@ -172,6 +178,7 @@ export default {
getSeconds: getInputVal.getSeconds,
searchValue: '',
shelf: '', //上下架状态
stockStatus: '', //库存状态
giftType: '', //商品类型
sortColumn: '',
sortType: '',
......@@ -236,6 +243,7 @@ export default {
this.pageSize = this.giftListObj.pageSize;
this.total = this.giftListObj.total;
this.shelf = this.giftListObj.shelf;
this.stockStatus = this.giftListObj.stockStatus;
this.searchValue = this.giftListObj.searchValue.trim();
this.giftType = this.giftListObj.giftType;
this.sortType = this.giftListObj.sortType;
......@@ -281,6 +289,7 @@ export default {
giftName: this.searchValue.trim(),
giftType: this.giftType ? this.giftType : -1,
shelf: this.shelf ? this.shelf : -1, //上架状态
stockStatus: this.stockStatus ? this.stockStatus : -1,
goodsType: this.goodsType, //商品类型
showSelfFlag: this.showSelfStatus ? 1 : 0
};
......@@ -499,6 +508,7 @@ export default {
pageSize: this.pageSize,
total: this.total,
shelf: this.shelf,
stockStatus: this.stockStatus,
giftType: this.giftType,
searchValue: this.searchValue.trim(),
sortType: this.sortType,
......
src/views/setting/convenSet.vue 0 → 100644
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>设置</el-breadcrumb-item>
<el-breadcrumb-item>常规设置</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>常规设置</span>
</h3>
</div>
<div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="100px" class="demo-ruleForm" label-position="right">
<el-form-item prop="cardType" label="积分消耗卡">
<el-select v-model="form.cardType" placeholder="积分消耗卡">
<el-option label="集团卡" :value="2"></el-option>
<el-option label="品牌卡" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSubmit('form')">确定</el-button>
</el-form-item>
</el-form>
</div>
</div>
</div>
</template>
<script>
// import qs from 'qs';
import request from '../../service/request.js';
// import getInputVal from '../../utils/common.js';
export default {
data() {
return {
form: {
cardType: ''
},
formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }]
}
};
},
created() {
this.getMess();
},
methods: {
getMess() {
request.get('/api-integral-mall/get-card-config').then(res => {
if (res.data.errorCode === 0) {
this.form.cardType = res.data.result.cardType || '';
} else {
this.$message.error(res.data.message);
}
});
},
handleSubmit(form) {
this.$refs[form].validate(valid => {
if (valid) {
let params = {
cardType: this.form.cardType
};
request.get('/api-integral-mall/g/save-card-config', { params }).then(res => {
if (res.data.errorCode === 0) {
this.getMess();
} else {
this.$message.error(res.data.message);
}
});
} else {
return false;
}
});
}
},
components: {}
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
</style>
src/views/setting/recordList.vue 0 → 100644
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>设置</el-breadcrumb-item>
<el-breadcrumb-item>库存日志</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>库存日志</span>
</h3>
</div>
<div class="section">
<div>
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入卡券名称/礼品名称/编码" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
<el-date-picker v-model="dateValue" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeTime"> </el-date-picker>
</div>
</div>
</div>
<el-table :data="tableDate" style="width: 100%" v-loading="loading">
<el-table-column prop="author" label="操作人"> </el-table-column>
<el-table-column prop="integralMallProName" label="卡券/卡券名称"> </el-table-column>
<el-table-column prop="createTime" label="操作时间">
<template slot-scope="scope">
<p>{{ getTime(scope.row.createTime) }}</p>
<p>{{ getSeconds(scope.row.createTime) }}</p>
</template>
</el-table-column>
<el-table-column prop="message" label="变更明细">
<template slot-scope="scope">
<p>{{ scope.row.message }}</p>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
// import qs from 'qs';
import getInputVal from '../../utils/common.js';
import request from '../../service/request.js';
export default {
data() {
return {
getTime: getInputVal.getTime,
getSeconds: getInputVal.getSeconds,
getTimeAll: getInputVal.formatDate,
searchValue: '',
dateValue: '',
currentPage: 1,
pageSizes: [20, 40, 60, 80],
pageSize: 20,
total: 0,
loading: false,
startTime: '',
endTime: '',
tableDate: []
};
},
created() {
this.getList();
},
methods: {
getSearchList() {
this.currentPage = 1;
this.getList();
},
changeTime() {
if (this.dateValue) {
this.startTime = this.dateValue[0] ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue[1] ? this.getTimeAll(this.dateValue[1]) : '';
} else {
this.startTime = '';
this.endTime = '';
}
this.currentPage = 1;
this.getList();
},
//分页设置每页的数量
handleSizeChange(size) {
this.pageSize = size;
this.getList();
},
// 分页设置跳转到第几页
handleCurrentChange(page) {
this.currentPage = page;
this.getList();
},
getList() {
this.startTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
search: this.searchValue,
startTime: this.startTime,
endTime: this.endTime
};
this.loading = true;
request.get('/api-integral-mall/page-pro-stock-record', { params }).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.result) {
this.tableDate = res.data.result.result;
this.total = res.data.result.totalCount;
} else {
this.tableDate = [];
this.total = 0;
}
this.loading = false;
} else {
this.$message.error(res.data.message);
this.loading = false;
}
});
}
},
components: {}
};
</script>
<style scoped>
.w-280 {
width: 280px;
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.header-top {
/* margin: 15px 0 22px 0; */
}
.header-top span {
width: 130px;
display: inline-block;
}
</style>
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