Skip to content

I
integral-mall
Commit 842c6431 by chenyu
Options

Merge branch 'feature/1月-1年后上线' of http://git.gicdev.com/integralMall/integral-mall into dev

parents 7d3d80e4 313423aa
Showing with 88 additions and 2 deletions
dist/css/main.1aa97d0a2dabf71c78a4.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/main.4231d4e6f98b2839b8a8.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.9087dbb7d3804aecb8f3.js"></script><link href="/integral-mall/css/main.1aa97d0a2dabf71c78a4.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
=======
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.c84ab8586d3f73bd0504.js"></script><link href="/integral-mall/css/main.4231d4e6f98b2839b8a8.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
>>>>>>> 313423aab55dd015c743ec81c3179068e81e6f2a
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
......
dist/js/main.9087dbb7d3804aecb8f3.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.c84ab8586d3f73bd0504.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.c84ab8586d3f73bd0504.js.LICENSE.txt 0 → 100644
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.6+9869a4bc
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
/*!
* vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
* https://vue-treeselect.js.org/
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
* @license MIT
*/
src/main.js
......@@ -18,6 +18,9 @@ Vue.use(VueAxios, axios);
Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false;
if (process.env.NODE_ENV === 'development') {
Vue.config.devtools = true;
}
/* eslint-disable no-new */
/* eslint-disable no-new */
window.getLimit(router, 'integral-mall').then(() => {
......
src/views/activities/flashSale/list.vue
......@@ -54,6 +54,22 @@
</div>
<div class="fr">
<el-button
size="small"
v-if="$getButtonLimit($buttonCode.flashSaleExport)"
:limit-code="$buttonCode.flashSaleExport"
@click="exportExcel"
>
导出订单
</el-button>
<!-- <el-button
@click="exportExcel"
v-if="$getButtonLimit($buttonCode.flashSaleExport)"
:limit-code="$buttonCode.flashSaleExport"
type="primary"
>
<i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
</el-button> -->
<el-button
type="primary"
@click="addActivity"
:limit-code="$buttonCode.flashSaleAdd"
......@@ -77,11 +93,16 @@
<span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']" />{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }}
</template>
</el-table-column>
<el-table-column label="商品数量">
<el-table-column label="商品种类">
<template slot-scope="{ row }">
{{ row.activityProList ? row.activityProList.length : '--' }}
</template>
</el-table-column>
<el-table-column label="上架/售卖/剩余库存">
<template slot-scope="{ row }">
{{ row.activityTotalStock || 0 }}/{{ row|stock }}/{{ row.activityStock || 0 }}
</template>
</el-table-column>
<el-table-column label="适用会员" :render-header="renderHeader">
<template slot-scope="{ row }">
{{ row.memberSearchType === 1 ? '所有会员' : row.memberSearchType === 2 ? row.memberSearchParams.split(',').length + '个会员分组' : '部分会员' }}
......@@ -143,6 +164,14 @@
</div>
</div>
</div>
<vue-gic-export-excel
:dataArr="tableData"
:dialogVisible.sync="dialogVisible"
:type="2"
:excelUrl="excelUrl"
:params="query"
:projectName="projectName"
/>
</div>
</template>
......@@ -151,6 +180,13 @@ import qs from 'qs';
import request from '../../../service/request.js';
import getInputVal from '../../../utils/common.js';
export default {
filters: {
stock: ({ activityTotalStock, activityStock }) => {
activityTotalStock = activityTotalStock || 0;
activityStock = activityStock || 0;
return parseFloat((activityTotalStock - activityStock).toFixed(2));
},
},
data () {
return {
query: {
......@@ -166,6 +202,9 @@ export default {
getTimeAll: getInputVal.formatDate,
loading: false,
tableData: [],
dialogVisible: false,
projectName: 'integral-mall',
excelUrl: '/api-integral-mall/download-integral-activity-excel ', // 下载数据的地址
};
},
computed: {
......@@ -252,6 +291,11 @@ export default {
edit (item) {
this.$router.push({ name: 'flashSaleInfo', query: { activityId: item.activityId, edit: true, canEdit: '' } });
},
// 导出发货单
exportExcel () {
this.dialogVisible = true;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
},
},
};
</script>
......
src/views/order/couponExchange.vue
......@@ -88,6 +88,14 @@
<i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
</el-button>
<el-button
@click="exportExcel"
v-if="integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
type="primary"
:limit-code="$buttonCode.couponExchangeExport"
>
<i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
</el-button>
<el-button
@click="exportExcelAll"
v-if="!integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
type="primary"
......
src/views/setting/deliverSet.vue
......@@ -477,7 +477,7 @@ export default {
.then(res => {
if (res.data.errorCode === 0) {
setTimeout(() => {
window.open(window.location.origin + '/gic-web/#/reportList', '_self');
window.open(window.location.origin + '/gic-web/#/reportCenter', '_self');
}, 1000);
} else {
this.$message.error(res.data.message);
......
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