Skip to content

S
shareConfig
Commit 46b5eb53 by 无尘
Options

fix: 修改配置

parent 1258503d
Showing with 567 additions and 78 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.a5ad652f36058c2b45953d68fc61ffcf.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.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/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.6de6008515f5f34359e1.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.974e05aac37c91bb6dc7755514c638de.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.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/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.e3766ce8e82729a0b0d5.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.974e05aac37c91bb6dc7755514c638de.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.a5ad652f36058c2b45953d68fc61ffcf.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.a241bcffdcca0e47e2f3.js → dist/static/js/2.591e2aed3eb7333f7ee7.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.6de6008515f5f34359e1.js deleted 100644 → 0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"a6710db96e29b9dc1718",1:"5b546fa38466a0b05e37",2:"a241bcffdcca0e47e2f3",3:"8a28cc9072e8d2e92c0a",4:"4c86fa657d5a0ae796ae",5:"e5f29637bed979a22d84",6:"cfe9b80ab51704b08fb2",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.e3766ce8e82729a0b0d5.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"a6710db96e29b9dc1718",1:"5b546fa38466a0b05e37",2:"591e2aed3eb7333f7ee7",3:"0f0848f0ca702100d4d9",4:"a67e58b528a1e68453ba",5:"e5f29637bed979a22d84",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/active-config/configs/competition-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 16:45:14 * @LastEditTime: 2019-12-04 19:37:35
--> -->
<!-- <!--
<competition-award></competition-award> <competition-award></competition-award>
...@@ -227,11 +227,15 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -227,11 +227,15 @@ import competitionAward from '@/components/active-config/configs/competition-awa
label="成交额闯关奖项: " label="成交额闯关奖项: "
prop="" prop=""
> >
<div class="w-1019">
<el-table <el-table
:data="compitionAward.dealAmountSettingParam" :data="compitionAward.dealAmountSettingParam"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="奖项名称"> <el-table-column
label="奖项名称"
width="307"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell"> <div class="cell">
<limitInput <limitInput
...@@ -247,7 +251,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -247,7 +251,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="排名" label="排名"
width="455" width="405"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell"> <div class="cell">
...@@ -262,7 +266,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -262,7 +266,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
> </el-input-number> > </el-input-number>
<span class="font-14 color-606266 p-l-10">名</span> <span class="font-14 color-606266 p-l-10">名</span>
</div> </div>
<div v-if="scope.$index != 0"> <div v-if="scope.$index != 0 && scope.$index != compitionAward.dealAmountSettingParam.length - 1">
<span class="font-14 color-606266 p-r-10">第</span> <span class="font-14 color-606266 p-r-10">第</span>
<el-input-number <el-input-number
class="w-90" class="w-90"
...@@ -282,7 +286,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -282,7 +286,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-l-10">名</span> <span class="font-14 color-606266 p-l-10">名</span>
</div> </div>
<div v-if="scope.$index != 0 && scope.$index == compitionAward.dealAmountSettingParam.length - 1"> <div v-if="scope.$index != 0 && scope.$index == compitionAward.dealAmountSettingParam.length - 1">
<span class="font-14 color-606266 p-r-10">前</span> <span class="font-14 color-606266 p-r-10">第</span>
<el-input-number <el-input-number
class="w-90" class="w-90"
v-model="scope.row.start" v-model="scope.row.start"
...@@ -312,7 +316,10 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -312,7 +316,10 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="奖品"> <el-table-column
label="奖品"
width="300"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell flex flex-align-center"> <div class="cell flex flex-align-center">
<div> <div>
...@@ -360,6 +367,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa ...@@ -360,6 +367,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
class="add-line text-center cursor-pointer" class="add-line text-center cursor-pointer"
@click="addMoneyItem" @click="addMoneyItem"
><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div> ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -375,7 +383,6 @@ export default { ...@@ -375,7 +383,6 @@ export default {
type: [Object, Array], type: [Object, Array],
default() { default() {
return { return {
basePath: [],
dealNumberFlag: 1, //成交人数开关 1开启 dealNumberFlag: 1, //成交人数开关 1开启
dealAmountFlag: 0, //成交额开关 1开启 dealAmountFlag: 0, //成交额开关 1开启
dealNumberSettingParam: [ dealNumberSettingParam: [
...@@ -414,6 +421,7 @@ export default { ...@@ -414,6 +421,7 @@ export default {
}, },
data() { data() {
return { return {
basePath: [],
compitionAward: { compitionAward: {
dealNumberFlag: 1, //成交人数开关 1开启 dealNumberFlag: 1, //成交人数开关 1开启
dealAmountFlag: 0, //成交额开关 1开启 dealAmountFlag: 0, //成交额开关 1开启
...@@ -451,9 +459,90 @@ export default { ...@@ -451,9 +459,90 @@ export default {
if (that.compitionAward.dealNumberFlag == 1 && !that.compitionAward.dealNumberSettingParam.length) { if (that.compitionAward.dealNumberFlag == 1 && !that.compitionAward.dealNumberSettingParam.length) {
resolve(false); resolve(false);
} }
if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) {
let flag = true;
that.compitionAward.dealNumberSettingParam.forEach(ele => {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
flag = false;
}
});
if (!flag) {
resolve(false);
}
}
// 阶梯奖励没有勾选无穷大判断
if(that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length>1&&!that.compitionAward.dealNumberSettingParam[that.compitionAward.dealNumberSettingParam.length-1].infinity) {
resolve(false);
}
// 阶梯奖励中顺序值判断
if(that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length>1){
const arr = [];
that.compitionAward.dealNumberSettingParam.forEach(ele => {
arr.push(ele.start);
if(ele.end != -1) {
arr.push(ele.end);
}
});
let flag = true
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
if (that.compitionAward.dealAmountFlag == 1 && !that.compitionAward.dealAmountSettingParam.length) { if (that.compitionAward.dealAmountFlag == 1 && !that.compitionAward.dealAmountSettingParam.length) {
resolve(false); resolve(false);
} }
if (that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length) {
let flag = true;
that.compitionAward.dealAmountSettingParam.forEach(ele => {
if (!ele.awardName ||(ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
flag = false;
}
});
if (!flag) {
resolve(false);
}
}
// 阶梯奖励没有勾选无穷大判断
if(that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length>1&&!that.compitionAward.dealAmountSettingParam[that.compitionAward.dealAmountSettingParam.length-1].infinity) {
resolve(false);
}
// 阶梯奖励中顺序值判断
if(that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length>1){
const arr = [];
that.compitionAward.dealAmountSettingParam.forEach(ele => {
arr.push(ele.start);
if(ele.end != -1) {
arr.push(ele.end);
}
});
let flag = true
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
resolve(that.compitionAward); resolve(that.compitionAward);
} else { } else {
resolve(false); resolve(false);
......
src/components/active-config/configs/entry-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 14:30:58 * @LastEditTime: 2019-12-04 18:54:59
--> -->
<!-- <!--
<entry-award></entry-award> <entry-award></entry-award>
...@@ -306,9 +306,79 @@ export default { ...@@ -306,9 +306,79 @@ export default {
if (that.passAward.dealNumberFlag == 1 && !that.passAward.dealNumberSettingParam.length) { if (that.passAward.dealNumberFlag == 1 && !that.passAward.dealNumberSettingParam.length) {
resolve(false); resolve(false);
} }
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) {
let flag = true;
that.passAward.dealNumberSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
flag = false;
}
});
if (!flag) {
resolve(false);
}
}
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length>1) {
let flag = true
const arr = [];
that.passAward.dealNumberSettingParam.forEach(ele => {
arr.push(ele.achieve);
if (ele.cardCheck && !ele.cardId) {
flag = false;
}
});
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
if (that.passAward.dealAmountFlag == 1 && !that.passAward.dealAmountSettingParam.length) { if (that.passAward.dealAmountFlag == 1 && !that.passAward.dealAmountSettingParam.length) {
resolve(false); resolve(false);
} }
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) {
let flag = true;
that.passAward.dealAmountSettingParam.forEach(ele => {
if ((ele.cardCheck && !ele.cardId) || (!ele.pointCheck && !ele.cardCheck)) {
flag = false;
}
});
if (!flag) {
resolve(false);
}
}
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length>1) {
let flag = true
const arr = [];
that.passAward.dealAmountSettingParam.forEach(ele => {
arr.push(ele.achieve);
if (ele.cardCheck && !ele.cardId) {
flag = false;
}
});
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
resolve(that.passAward); resolve(that.passAward);
} else { } else {
resolve(false); resolve(false);
......
src/components/active-config/configs/invitee-reward.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 14:30:11 * @LastEditTime: 2019-12-04 18:32:14
--> -->
<!-- <!--
<invitee-reward></invitee-reward> <invitee-reward></invitee-reward>
...@@ -207,17 +207,17 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue ...@@ -207,17 +207,17 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
style="margin-left: 85px;" style="margin-left: 85px;"
> >
<el-radio-group v-model="invitedAward.cardAwardMode"> <el-radio-group v-model="invitedAward.cardAwardMode">
<el-radio :label="0">固定奖励</el-radio> <el-radio :label="1">固定奖励</el-radio>
<el-radio <el-radio
v-if="basePath.map(ele => ele.transName).includes('消费')" v-if="basePath.map(ele => ele.transName).includes('消费')"
:label="1" :label="2"
>阶梯奖励</el-radio> >阶梯奖励</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</div> </div>
<div <div
v-if="invitedAward.cardAwardMode == 0" v-if="invitedAward.cardAwardMode == 1"
class="m-t-20 child-select-wrap" class="m-t-20 child-select-wrap"
> >
<div class="store-select-title"> <div class="store-select-title">
...@@ -239,7 +239,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue ...@@ -239,7 +239,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
</div> </div>
<div <div
v-if="invitedAward.cardAwardMode == 1" v-if="invitedAward.cardAwardMode == 2"
class="m-t-20 child-select-wrap" class="m-t-20 child-select-wrap"
> >
<el-table <el-table
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -356,7 +356,7 @@ export default { ...@@ -356,7 +356,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -384,9 +384,72 @@ export default { ...@@ -384,9 +384,72 @@ export default {
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 1 && !that.invitedAward.pointAwardPoint) { if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 1 && !that.invitedAward.pointAwardPoint) {
resolve(false); resolve(false);
} }
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 0 && !that.invitedAward.cardId) { if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && !that.invitedAward.pointAwardStepParam.length) {
resolve(false);
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length>1) {
let flag = true
const arr = [];
that.invitedAward.pointAwardStepParam.forEach(ele => {
arr.push(ele.amount);
});
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 1 && !that.invitedAward.cardId) {
resolve(false);
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && !that.invitedAward.cardAwardStepParam.length) {
resolve(false);
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length) {
let flag = true;
that.invitedAward.cardAwardStepParam.forEach(ele => {
if (!ele.cardId) {
flag = false;
}
});
if (!flag) {
resolve(false); resolve(false);
} }
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length>1) {
let flag = true
const arr = [];
that.invitedAward.cardAwardStepParam.forEach(ele => {
arr.push(ele.amount);
if (!ele.cardId) {
flag = false;
}
});
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
resolve(that.invitedAward); resolve(that.invitedAward);
} else { } else {
resolve(false); resolve(false);
...@@ -394,7 +457,13 @@ export default { ...@@ -394,7 +457,13 @@ export default {
}); });
}); });
}, },
/**
* 删除：
*/
deleteRow(index, arr) {
// const that = this;
arr.splice(index, 1);
},
/** /**
* 阶梯奖励添加奖项： * 阶梯奖励添加奖项：
*/ */
......
src/components/active-config/configs/spot-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-04 10:03:47 * @LastEditTime: 2019-12-04 19:24:09
--> -->
<!-- <!--
<spot-award></spot-award> <spot-award></spot-award>
...@@ -115,7 +115,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue'; ...@@ -115,7 +115,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<span class="font-14 color-606266 p-l-10">人</span> <span class="font-14 color-606266 p-l-10">人</span>
</div> </div>
<div v-if="scope.$index != 0 && scope.$index != instanceAward.instanceContent.length - 1"> <div v-if="scope.$index != 0 && scope.$index != instanceAward.instanceContent.length - 1">
<span class="font-14 color-606266 p-r-10">前</span> <span class="font-14 color-606266 p-r-10">第</span>
<el-input-number <el-input-number
v-model="scope.row.start" v-model="scope.row.start"
controls-position="right" controls-position="right"
...@@ -132,7 +132,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue'; ...@@ -132,7 +132,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<span class="font-14 color-606266 p-l-10">人</span> <span class="font-14 color-606266 p-l-10">人</span>
</div> </div>
<div v-if="scope.$index != 0 && scope.$index == instanceAward.instanceContent.length - 1"> <div v-if="scope.$index != 0 && scope.$index == instanceAward.instanceContent.length - 1">
<span class="font-14 color-606266 p-r-10">前</span> <span class="font-14 color-606266 p-r-10">第</span>
<el-input-number <el-input-number
v-model="scope.row.start" v-model="scope.row.start"
controls-position="right" controls-position="right"
......
src/components/active-config/reward-config.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-18 10:37:02 * @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-04 17:29:36 * @LastEditTime: 2019-12-04 18:20:55
--> -->
<!-- <!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config> <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
...@@ -445,7 +445,7 @@ export default { ...@@ -445,7 +445,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -595,7 +595,7 @@ export default { ...@@ -595,7 +595,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -699,7 +699,7 @@ export default { ...@@ -699,7 +699,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -821,7 +821,7 @@ export default { ...@@ -821,7 +821,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -925,7 +925,7 @@ export default { ...@@ -925,7 +925,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -1029,7 +1029,7 @@ export default { ...@@ -1029,7 +1029,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
...@@ -1133,7 +1133,7 @@ export default { ...@@ -1133,7 +1133,7 @@ export default {
], ],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元 pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分 pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 0, cardAwardMode: 1,
cardId: '', cardId: '',
cardName: '', cardName: '',
cardAwardStepParam: [ cardAwardStepParam: [
......
src/components/active/finished-active.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-13 16:37:02 * @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 20:51:06 * @LastEditTime: 2019-12-04 20:09:16
--> -->
<!-- <!--
<finished-active></finished-active> <finished-active></finished-active>
...@@ -173,22 +173,22 @@ export default { ...@@ -173,22 +173,22 @@ export default {
const that = this; const that = this;
let para = { let para = {
pageNum: that.currentPage, pageNum: that.currentPage,
pageSize: that.pageSize pageSize: that.pageSize,
type: 3
}; };
getRequest('/sharing-core-web/page-activity', para) getRequest('/sharing-core-web/page-activity', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
const nowDate = new Date().getTime();
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
let arr = []; /* let arr = [];
if (resData.result.result && resData.result.result.length) { if (resData.result.result && resData.result.result.length) {
resData.result.result.forEach(ele => { resData.result.result.forEach(ele => {
if (ele.endDate < nowDate) { if (ele.endDate < nowDate) {
arr.push(ele); arr.push(ele);
} }
}); });
} } */
that.finishedData = arr || []; that.finishedData = resData.result.result || [];
that.total = resData.result.totalCount; that.total = resData.result.totalCount;
return false; return false;
} }
......
src/components/active/in-progress-active.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-13 16:37:02 * @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 20:51:44 * @LastEditTime: 2019-12-04 20:09:42
--> -->
<!-- <!--
<in-progress-active></in-progress-active> <in-progress-active></in-progress-active>
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
const fakeElement = document.createElement('button') const fakeElement = document.createElement('button')
let clipboard = new Clipboard(fakeElement, { let clipboard = new Clipboard(fakeElement, {
text: function() { text: function() {
return row.activityUrl; return row.activityUrl || '您复制的数据是空的！';
} }
}); });
clipboard.on('success', e => { clipboard.on('success', e => {
...@@ -178,12 +178,12 @@ export default { ...@@ -178,12 +178,12 @@ export default {
*/ */
getTableList() { getTableList() {
const that = this; const that = this;
let para = {}; let para = {type: 1};
getRequest('/sharing-core-web/page-activity', para) getRequest('/sharing-core-web/page-activity', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
const nowDate = new Date().getTime(); /*const nowDate = new Date().getTime();
let arr = []; let arr = [];
if (resData.result.result && resData.result.result.length) { if (resData.result.result && resData.result.result.length) {
resData.result.result.forEach(ele => { resData.result.result.forEach(ele => {
...@@ -191,10 +191,10 @@ export default { ...@@ -191,10 +191,10 @@ export default {
arr.push(ele); arr.push(ele);
} }
}); });
} } */
that.inProgressData = arr || []; that.inProgressData = resData.result.result || [];
if (arr.length) { if (resData.result.result.length) {
that.getActivityData(arr[0].activityId); that.getActivityData(resData.result.result[0].activityId);
} }
return false; return false;
} }
......
src/components/active/will-start-active.vue 0 → 100644
<!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 20:10:30
-->
<!--
<will-start-active></will-start-active>
import willStartActive from '@/components/active/will-start-active.vue';
-->
<template>
<div class="start-active border-box">
<ul>
<template v-for="(item, index) in startData">
<li
:class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']"
:key="index + 'data'"
>
<div
class="start-active-title flex flex-space-between border-box"
@click.stop="selectLi(item)"
>
<div class="active-title-left">
<div class="active-title-name font-18 color-303133">{{ item.activityName }}</div>
<div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div>
</div>
<div class="active-title-right">
<el-button
type="primary"
plain
@click="toEdit(index, item)"
>活动配置</el-button>
<!-- <el-button
type="primary"
plain
@click="handleCopy(index, item)"
>复制路径</el-button> -->
<el-button
type="primary"
plain
@click="toDataList(index, item)"
>数据明细</el-button>
</div>
</div>
<div
v-if="selectItem == item.activityId"
class="start-active-body"
>
<out-date-active
:barChartData="barChartData"
:funnelData="funnelData"
></out-date-active>
</div>
</li>
</template>
</ul>
<div
class="pagination text-right m-t-14"
v-if="startData.length"
>
<el-pagination
small
:page-size="pageSize"
:current-page="currentPage"
layout="prev, pager, next"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
> </el-pagination>
</div>
</div>
</template>
<script>
import outDateActive from '@/components/active/out-date-active.vue';
// import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api';
export default {
name: 'start-active',
components: {
outDateActive
},
data() {
return {
funnelData: [],
barChartData: {
columns: ['日期', '访问用户', '下单用户'],
rows: [{ 日期: '1/1', 访问用户: 1393, 下单用户: 1093 }, { 日期: '1/2', 访问用户: 3530, 下单用户: 3230 }, { 日期: '1/3', 访问用户: 2923, 下单用户: 2623 }, { 日期: '1/4', 访问用户: 1723, 下单用户: 1423 }, { 日期: '1/5', 访问用户: 3192, 下单用户: 3192 }, { 日期: '1/6', 访问用户: 3593, 下单用户: 3293 }]
},
selectItem: '',
startData: [
/* {
activityId: 1,
activityName: '1',
startDate: 1574300553953,
endDate: 1574300553953
} */
],
// 分页
pageSize: 20,
currentPage: 1,
total: 1
};
},
methods: {
/**
* 选择 li
*/
selectLi(item) {
const that = this;
that.selectItem = item.activityId;
that.getActivityData(item.activityId);
},
/**
* 获取单个活动数据信息
* /sharing-core-web/get-activity-data-summary
*/
getActivityData(activityId) {
const that = this;
let para = {
activityId: activityId
};
getRequest('/sharing-core-web/get-activity-data-summary', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.funnelData = resData.result;
that.barChartData = resData.result.trend;
return false;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 活动配置
*/
toEdit(index, row) {
const that = this;
that.$router.push(`/createActive?activityId=${row.activityId}&editFlag=show`);
},
/**
* 数据明细
*/
toDataList(index, row) {
const that = this;
that.$router.push(`/dataDetail?activityId=${row.activityId}`);
},
/**
* 分页
*/
handleSizeChange(val) {
this.pageSize = val;
this.getData();
},
handleCurrentChange(val) {
this.currentPage = val;
this.getData();
},
/**
* 获取列表数据
*/
getTableList() {
const that = this;
let para = {
pageNum: that.currentPage,
pageSize: that.pageSize,
type: 2
};
getRequest('/sharing-core-web/page-activity', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.startData = resData.result.result || [];
that.total = resData.result.totalCount;
return false;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}
},
mounted() {
const that = this;
that.getTableList();
}
};
</script>
<style lang="less" scoped>
.m-t-7 {
margin-top: 7px;
}
.start-active {
width: 100%;
padding: 0 20px 48px 20px;
background: #fff;
li {
// height: 90px;
padding: 0 20px;
cursor: pointer;
&.li-border {
padding: 0 20px;
box-shadow: 0px 0px 8px 3px rgba(154, 170, 201, 0.11);
border-radius: 4px;
border: 1px solid rgba(220, 223, 230, 1);
margin-top: -1px;
}
.start-active-title {
padding: 27px 0 20px 0;
border-bottom: 1px solid #dcdfe6;
}
.start-active-body {
padding: 20px 0;
}
}
}
</style>
src/components/export-excel.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-12-01 17:29:53 * @Date: 2019-12-01 17:29:53
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-04 16:46:23 * @LastEditTime: 2019-12-04 20:16:25
--> -->
<!-- <!--
import exportExcel from '@gic-test/export-excel' import exportExcel from '@gic-test/export-excel'
...@@ -130,7 +130,8 @@ import exportExcel from '@gic-test/export-excel' ...@@ -130,7 +130,8 @@ import exportExcel from '@gic-test/export-excel'
</template> </template>
<script> <script>
import { postRequest } from '@/api/api'; import { baseUrl } from '@/config/index.js';
import qs from 'qs';
export default { export default {
name: 'export-excel', name: 'export-excel',
data() { data() {
...@@ -199,28 +200,37 @@ export default { ...@@ -199,28 +200,37 @@ export default {
}, },
senReport() { senReport() {
// 脱敏数据 生成报告 // 脱敏数据 生成报告
if (this.type == '2') { const that = this;
this.params.dataType = 1; if (that.type == '2') {
that.params.dataType = 1;
} }
if (this.isReadyReportBool) { if (that.isReadyReportBool) {
this.isReadyReportBool = false; that.isReadyReportBool = false;
postRequest(this.excelUrl, this.params).then(res => { that.axios.post(that.excelUrl, qs.stringify(that.params)).then(res => {
let data = res.data; let data = res.data;
if (data.errorCode == 0) { if (data.errorCode == 1) {
this.goReportBool = true; that.goReportBool = true;
this.isReadyReportBool = true; that.isReadyReportBool = true;
this.$message.success('您下载的数据已为您打包好，请点击下面按钮去报告中心'); that.$message.success('您下载的数据已为您打包好，请点击下面按钮去报告中心');
this.allDataBool = true; that.allDataBool = true;
} else { } else {
this.$message.error(data.message); that.$message.error(data.message);
} }
}); });
} else { } else {
this.$message.error('正在打包您要下载的数据，请稍候...'); that.$message.error('正在打包您要下载的数据，请稍候...');
} }
}, },
senGoReport() { senGoReport() {
// 脱敏数据 完整数据 去报告中心 // 脱敏数据 完整数据 去报告中心
/* let url = '';
if (this.projectName == 'mall') {
url = '//' + window.location.host + '/mall/#/reportList';
} else if (this.projectName == 'integral-mall') {
url = '//' + window.location.host + '/mall/#/reportList';
} else {
url = '//' + window.location.host + '/gic-web/#/reportCenter';
} */
window.open('/gic-web/reportCenter'); window.open('/gic-web/reportCenter');
}, },
async allReport() { async allReport() {
...@@ -258,15 +268,17 @@ export default { ...@@ -258,15 +268,17 @@ export default {
if (this.type == '2') { if (this.type == '2') {
this.params.dataType = 2; this.params.dataType = 2;
} }
postRequest(this.excelUrl,this.params).then(res => { this.axios.post(this.excelUrl, qs.stringify(this.params)).then(res => {
let data = res.data; let data = res.data;
if (data.errorCode == 0 || (this.projectName==='member-tag' && data.errorCode==1)) { if (data.errorCode == 1 ) {
this.downloadReportId = data.result; this.downloadReportId = data.result;
postRequest( this.axios
'/api-admin/apply-download-report', .post(
{ baseUrl + '/api-admin/apply-download-report',
qs.stringify({
requestProject: this.projectName,
downloadReportId: this.downloadReportId downloadReportId: this.downloadReportId
} })
) )
.then(res => { .then(res => {
let data = res.data; let data = res.data;
...@@ -286,7 +298,13 @@ export default { ...@@ -286,7 +298,13 @@ export default {
getCheckerList() { getCheckerList() {
// 获取审核员列表 // 获取审核员列表
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
postRequest('/api-admin/list-auditor') this.axios
.post(
baseUrl + '/api-admin/list-auditor',
qs.stringify({
requestProject: this.projectName
})
)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
...@@ -306,7 +324,7 @@ export default { ...@@ -306,7 +324,7 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="scss" scoped>
.outer-dialogwrap { .outer-dialogwrap {
padding: 10px 40px 30px; padding: 10px 40px 30px;
height: 250px; height: 250px;
......
src/components/post-upload.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-20 13:44:22 * @Date: 2019-11-20 13:44:22
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 14:03:59 * @LastEditTime: 2019-12-04 18:04:32
--> -->
<!-- <!--
单个上传组件 单个上传组件
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
></i> ></i>
</el-upload> </el-upload>
<p class="upload-tip w-500"> <p class="upload-tip w-500">
图片规格750*1300px，大小不超过,2M，仅限JPG格式。 图片规格750*1300px，大小不超过{{uploadLimit}}M，仅限JPG格式。
</p> </p>
<p class="upload-tip">为了确保二维码位置的准确，建议，<a <p class="upload-tip">为了确保二维码位置的准确，建议，<a
class="color-1890ff" class="color-1890ff"
......
src/view/activeConfig/createCompletion.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-15 10:10:08 * @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 20:56:39 * @LastEditTime: 2019-12-04 19:25:52
--> -->
<template> <template>
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
const that = this; const that = this;
let clipboard = new Clipboard('.copy-tag', { let clipboard = new Clipboard('.copy-tag', {
text: function() { text: function() {
return `${that.activityUrl}`; return `${that.activityUrl}` || '您复制的数据是空的！';
} }
}); });
clipboard.on('success', e => { clipboard.on('success', e => {
......
src/view/dataDetails/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-15 10:10:08 * @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-04 16:40:13 * @LastEditTime: 2019-12-04 20:02:06
--> -->
<template> <template>
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<export-excel <export-excel
:dataArr="tableData" :dataArr="tableData"
:dialogVisible.sync="dialogVisible" :dialogVisible.sync="dialogVisible"
:projectName="projectName"
:type="2" :type="2"
:excelUrl="excelUrl" :excelUrl="excelUrl"
:params="params" :params="params"
...@@ -86,8 +87,13 @@ export default { ...@@ -86,8 +87,13 @@ export default {
], ],
tableData: [], tableData: [],
dialogVisible: false, dialogVisible: false,
excelUrl: '', excelUrl: '/sharing-core-web/export',
params: '' params: {
activityId: this.$route.query.activityId,
isExportInvited: this.tabName == 'invite'? false : true,
requestProject: 'share-config',
},
projectName: 'share-config'
}; };
}, },
methods: { methods: {
...@@ -99,7 +105,9 @@ export default { ...@@ -99,7 +105,9 @@ export default {
that.dialogVisible = true; that.dialogVisible = true;
that.tableData = that.tabName == 'invite'? that.$refs.inviteTable.tableData: that.$refs.invitedTable.tableData; that.tableData = that.tabName == 'invite'? that.$refs.inviteTable.tableData: that.$refs.invitedTable.tableData;
that.params = { that.params = {
activityId: that.$route.query.activityId activityId: that.$route.query.activityId,
isExportInvited: that.tabName == 'invite'? false : true,
requestProject: 'share-config',
}; };
} }
} }
......
src/view/shareIndex/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-12 10:59:45 * @Date: 2019-11-12 10:59:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-11-29 14:21:39 * @LastEditTime: 2019-12-04 20:11:21
--> -->
<template> <template>
<div class="share-index common-wrap"> <div class="share-index common-wrap">
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
<!-- v-if="!canCreate" --> <!-- v-if="!canCreate" -->
<div class="separator-space">- 当前有正在进行的活动，无法创建新的活动 -</div> <div class="separator-space">- 当前有正在进行的活动，无法创建新的活动 -</div>
<in-progress-active></in-progress-active> <in-progress-active></in-progress-active>
<div class="separator-space">- 当前有未开始的活动 -</div>
<will-start-active></will-start-active>
<div class="separator-space">- 以下为已结束活动 -</div> <div class="separator-space">- 以下为已结束活动 -</div>
<finished-active></finished-active> <finished-active></finished-active>
</div> </div>
...@@ -30,6 +32,7 @@ ...@@ -30,6 +32,7 @@
import activeSelect from '@/components/active/active-select.vue'; import activeSelect from '@/components/active/active-select.vue';
import inProgressActive from '@/components/active/in-progress-active.vue'; import inProgressActive from '@/components/active/in-progress-active.vue';
import finishedActive from '@/components/active/finished-active.vue'; import finishedActive from '@/components/active/finished-active.vue';
import willStartActive from '@/components/active/will-start-active.vue';
// import showMsg from '@/common/js/showmsg'; // import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
...@@ -38,7 +41,8 @@ export default { ...@@ -38,7 +41,8 @@ export default {
components: { components: {
activeSelect, activeSelect,
inProgressActive, inProgressActive,
finishedActive finishedActive,
willStartActive
}, },
data() { data() {
return { return {
......
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