Skip to content

S
shareConfig
Commit 3e18b84a by 无尘
Options

fix: 修改奖励

parent b0082c9c
Showing with 174 additions and 29 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.ffeb11bbc8a6f2a70ab5f0c853d31dc4.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.14.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.234022e1fbbdd7c7cbc4.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
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.2cddaffa43c32c0d1988330fae42d6d0.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.14.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.84b84dad51ee9cd0f138.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
dist/static/js/2.047b01d1a853d7574618.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.3c5196f831edec01dd17.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/3.b45331471e8656c5cb89.js → dist/static/js/3.35d0dca21b47e8e820e0.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.234022e1fbbdd7c7cbc4.js → dist/static/js/manifest.84b84dad51ee9cd0f138.js
!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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3c5196f831edec01dd17",3:"b45331471e8656c5cb89",4:"c9baf4695a3666998280",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(){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
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"047b01d1a853d7574618",3:"35d0dca21b47e8e820e0",4:"c9baf4695a3666998280",5:"e5020e10cc9f40ceacc5",6:"f11d902de0350ef6b333",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
src/components/active-config/configs/competition-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 11:47:08
* @LastEditTime: 2019-12-06 10:36:56
-->
<!--
<competition-award></competition-award>
......@@ -111,6 +111,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">前</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.end"
controls-position="right"
:min="1"
......@@ -122,6 +123,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">第</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -130,6 +132,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-l-10 p-r-10">名 至</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.end"
controls-position="right"
:min="1"
......@@ -141,6 +144,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">第</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -153,6 +157,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-input-number
v-if="!scope.row.infinity"
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.end"
controls-position="right"
:min="1"
......@@ -161,6 +166,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-checkbox
v-if="scope.$index == compitionAward.dealNumberSettingParam.length - 1"
class="m-l-10"
:disabled="$route.query.editFlag"
v-model="scope.row.infinity"
@change="changeEnd($event, scope.row)"
>无穷大</el-checkbox>
......@@ -179,6 +185,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
<el-input-number
class="w-146"
:disabled="$route.query.editFlag"
v-model="scope.row.point"
controls-position="right"
:min="1"
......@@ -189,6 +196,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
<el-select
class="w-146"
:disabled="$route.query.editFlag"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
......@@ -205,6 +213,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-button
v-if="scope.$index != 0"
class="m-l-16"
:disabled="$route.query.editFlag"
@click.stop="deleteRow(scope.$index, compitionAward.dealNumberSettingParam)"
type="text"
size="small"
......@@ -259,6 +268,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">前</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.end"
controls-position="right"
:min="1"
......@@ -270,6 +280,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">第</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -278,6 +289,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-l-10 p-r-10">名 至</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.end"
controls-position="right"
:min="1"
......@@ -289,6 +301,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<span class="font-14 color-606266 p-r-10">第</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag"
v-model="scope.row.start"
controls-position="right"
:min="1"
......@@ -299,6 +312,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
class="font-14 color-606266 p-l-10 p-r-10"
>人 至</span>
<el-input-number
:disabled="$route.query.editFlag"
v-if="!scope.row.infinity"
v-model="scope.row.end"
class="w-90"
......@@ -307,6 +321,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
:max="9999999999"
> </el-input-number>
<el-checkbox
:disabled="$route.query.editFlag"
v-if="scope.$index == compitionAward.dealAmountSettingParam.length - 1"
class="m-l-10"
v-model="scope.row.infinity"
......@@ -327,6 +342,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
<el-input-number
class="w-146"
:disabled="$route.query.editFlag"
v-model="scope.row.point"
controls-position="right"
:min="1"
......@@ -337,6 +353,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
<el-select
class="w-146"
:disabled="$route.query.editFlag"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
......@@ -353,6 +370,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
<el-button
v-if="scope.$index != 0"
class="m-l-16"
:disabled="$route.query.editFlag"
@click.stop="deleteRow(scope.$index, compitionAward.dealAmountSettingParam)"
type="text"
size="small"
......@@ -555,6 +573,9 @@ export default {
*/
selectStore(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
if (item.goalId == 1) {
that.compitionAward.dealNumberFlag = that.compitionAward.dealNumberFlag == 0 ? 1 : 0;
} else {
......@@ -590,6 +611,9 @@ export default {
*/
addPeopleItem() {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
if(that.compitionAward.dealNumberSettingParam.length < 2 || !that.compitionAward.dealNumberSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealNumberSettingParam.push({
awardName: '',
......@@ -620,6 +644,9 @@ export default {
},
addMoneyItem() {
const that = this; //成交额奖项 成交额奖项json
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
if(that.compitionAward.dealAmountSettingParam.length < 2 || that.compitionAward.dealAmountSettingParam.map(ele=>ele.infinity).includes('true')) {
that.compitionAward.dealAmountSettingParam.push({
awardName: '',
......
src/components/active-config/configs/consume-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:35:15
* @LastEditTime: 2019-12-06 10:22:42
-->
<!--
<consume-config></consume-config>
......@@ -294,6 +294,9 @@ export default {
*/
selectStore(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.consumeAction.consumeStoreControlFlag = item.goalId;
},
/**
......@@ -301,6 +304,9 @@ export default {
*/
selectMoney(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.consumeAction.dealAmountControlFlag = item.goalId;
},
......@@ -309,6 +315,9 @@ export default {
*/
selectNumber(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.consumeAction.singleDealNumberControlFlag = item.goalId;
}
},
......
src/components/active-config/configs/entry-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-05 17:21:29
* @LastEditTime: 2019-12-06 10:47:18
-->
<!--
<entry-award></entry-award>
......@@ -90,6 +90,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<span class="font-14 color-606266 p-r-10">满</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.achieve"
controls-position="right"
:min="1"
......@@ -105,9 +106,13 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<div class="cell flex flex-align-center">
<div>
<div>
<el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
<el-checkbox
v-model="scope.row.pointCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>积分</el-checkbox>
<el-input-number
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.point"
controls-position="right"
:min="1"
......@@ -115,9 +120,13 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
> </el-input-number>
</div>
<div class="m-t-10">
<el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
<el-checkbox
v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox>
<el-select
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
......@@ -134,6 +143,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<el-button
v-if="scope.$index != 0"
class="m-l-16"
:disabled="$route.query.editFlag || scope.row.oldData"
@click.stop="deleteRow(scope.$index, passAward.dealNumberSettingParam)"
type="text"
size="small"
......@@ -166,6 +176,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<span class="font-14 color-606266 p-r-10">满</span>
<el-input-number
class="w-90"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.achieve"
controls-position="right"
:min="1"
......@@ -181,9 +192,13 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<div class="cell flex flex-align-center">
<div>
<div>
<el-checkbox v-model="scope.row.pointCheck">积分</el-checkbox>
<el-checkbox
v-model="scope.row.pointCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>积分</el-checkbox>
<el-input-number
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.point"
controls-position="right"
:min="1"
......@@ -191,9 +206,13 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
> </el-input-number>
</div>
<div class="m-t-10">
<el-checkbox v-model="scope.row.cardCheck">卡券</el-checkbox>
<el-checkbox
v-model="scope.row.cardCheck"
:disabled="$route.query.editFlag || scope.row.oldData"
>卡券</el-checkbox>
<el-select
class="w-146"
:disabled="$route.query.editFlag || scope.row.oldData"
v-model="scope.row.cardId"
placeholder="请选择"
@change="changeCard($event, scope.row)"
......@@ -210,6 +229,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
<el-button
v-if="scope.$index != 0"
class="m-l-16"
:disabled="$route.query.editFlag || scope.row.oldData"
@click.stop="deleteRow(scope.$index, passAward.dealAmountSettingParam)"
type="text"
size="small"
......@@ -247,7 +267,8 @@ export default {
pointCheck: false,
cardId: '',
cardName: '',
cardCheck: false
cardCheck: false,
oldData: false
}
], //成交人数奖项 成交人数奖项json
dealAmountSettingParam: [
......@@ -257,7 +278,8 @@ export default {
pointCheck: false,
cardId: '',
cardName: '',
cardCheck: false
cardCheck: false,
oldData: false
}
], //成交额奖项 成交额奖项json
"stepType": 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
......@@ -390,10 +412,13 @@ export default {
});
},
/**
* 选择即时奖励模式：
* 选择奖励模式：
*/
selectStore(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
if (item.goalId == 1) {
that.passAward.dealNumberFlag = that.passAward.dealNumberFlag == 0 ? 1 : 0;
} else {
......@@ -404,7 +429,10 @@ export default {
* 删除：
*/
deleteRow(index, arr) {
// const that = this;
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
arr.splice(index, 1);
},
/**
......@@ -412,6 +440,9 @@ export default {
*/
changeCard(e, row) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.cardList.forEach(ele => {
if (ele.coupCardId == e) {
row.cardName = ele.cardName;
......@@ -424,24 +455,32 @@ export default {
*/
addPeopleItem() {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.passAward.dealNumberSettingParam.push({
achieve: 5,
point: 1,
pointCheck: false,
cardId: '',
cardName: '',
cardCheck: false
cardCheck: false,
oldData: false
});
},
addMoneyItem() {
const that = this; //成交额奖项 成交额奖项json
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.passAward.dealAmountSettingParam.push({
achieve: 5,
point: 1,
pointCheck: false,
cardId: '',
cardName: '',
cardCheck: false
cardCheck: false,
oldData: false
});
},
/**
......
src/components/active-config/configs/fraud-control.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:57:39
* @LastEditTime: 2019-12-06 10:26:48
-->
<!--
<fraud-control></fraud-control>
......@@ -236,6 +236,9 @@ export default {
showMsg.showmsg('成交额上限控制禁止修改', 'warning');
return false;
}
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.pointFreeze.amountLimitFlag = item.goalId;
},
/**
......@@ -243,6 +246,9 @@ export default {
*/
selectMoney(item) {
const that = this;
if (that.$route.query.hasOwnProperty('editFlag')) {
return false;
}
that.pointFreeze.pointProgram = item.goalId;
},
},
......
src/components/active-config/configs/invitee-reward.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:54:33
* @LastEditTime: 2019-12-06 10:25:19
-->
<!--
<invitee-reward></invitee-reward>
......@@ -399,6 +399,9 @@ export default {
that.$refs['rewardForm'].validate(valid => {
if (valid) {
that.$emit('input', that.invitedAward);
if (!that.invitedAward.pointSettingFlag && !that.invitedAward.cardSettingFlag){
resolve(false);
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 1 && !that.invitedAward.pointAwardPoint) {
resolve(false);
}
......
src/components/active-config/configs/spot-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:59:15
* @LastEditTime: 2019-12-06 10:23:35
-->
<!--
<spot-award></spot-award>
......@@ -205,6 +205,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<span class="font-14 color-606266">成交额等比奖励额度：</span>
<span class="font-14 color-606266">每消费</span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="instanceAward.instanceNumber"
controls-position="right"
:min="1"
......@@ -212,6 +213,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
> </el-input-number>
<span class="font-14 color-606266 p-l-3 p-r-10">元 - </span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="instanceAward.instancePoint"
controls-position="right"
:min="1"
......@@ -258,6 +260,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<div class="store-select-title">
<span class="font-14 color-606266">限制次数：</span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="instanceAward.awardLimitNumber"
controls-position="right"
:min="1"
......@@ -273,6 +276,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<div class="store-select-title">
<span class="font-14 color-606266">限制额度：</span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="instanceAward.awardLimitPoint"
controls-position="right"
:min="1"
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-06 09:57:10
* @LastEditTime: 2019-12-06 11:16:01
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -1480,6 +1480,16 @@ export default {
//本来不用判断具体提交数据，后端只保存选择的，判断所有不选的去掉字段
let filterData = JSON.parse(JSON.stringify(that.activeInfoData));
await that.resetKey(filterData);
if (!!filterData.passAward && filterData.passAward.dealNumberFlag == 1) {
filterData.passAward.dealNumberSettingParam.forEach(ele => {
ele.oldData = true;
});
}
if (!!filterData.passAward && filterData.passAward.dealAmountFlag == 1) {
filterData.passAward.dealAmountFlag.forEach(ele => {
ele.oldData = true;
});
}
const postData = {
activityId: filterData.activityId,
awardMode: filterData.awardMode,
......@@ -1684,6 +1694,16 @@ export default {
ele.invitedAward.pointSettingFlag = ele.invitedAward.pointSettingFlag ? 1:0;
ele.invitedAward.cardSettingFlag = ele.invitedAward.cardSettingFlag ? 1: 0;
}
if (!!ele.passAward && ele.passAward.dealNumberFlag == 1) {
ele.passAward.dealNumberSettingParam.forEach(ele => {
ele.oldData = true;
});
}
if (!!ele.passAward && ele.passAward.dealAmountFlag == 1) {
ele.passAward.dealAmountFlag.forEach(ele => {
ele.oldData = true;
});
}
})
for (let index = 0; index < that.ProgressiveData.length; index++) {
let element = that.ProgressiveData[index];
......@@ -1775,7 +1795,7 @@ export default {
if (ele.stepType == 6) {
ele.activeName = 'first';
}else {
ele.activeName = ele.instanceAward? 'second' : 'four';
ele.activeName = ele.instanceAward? 'second' : 'five';
}
that.consumeAction.stepType = ele.stepType;
that.instanceAward.stepType = ele.stepType;
......
src/components/active/finished-active.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 20:09:16
* @LastEditTime: 2019-12-06 11:10:05
-->
<!--
<finished-active></finished-active>
......@@ -32,7 +32,7 @@ import finishedActive from '@/components/active/finished-active.vue';
<el-button
type="primary"
plain
@click="toEdit(index, item)"
@click.stop="toEdit(index, item)"
>活动配置</el-button>
<!-- <el-button
type="primary"
......@@ -42,7 +42,7 @@ import finishedActive from '@/components/active/finished-active.vue';
<el-button
type="primary"
plain
@click="toDataList(index, item)"
@click.stop="toDataList(index, item)"
>数据明细</el-button>
</div>
</div>
......
src/view/dataDetails/inviterLog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-12 11:02:27
* @LastEditors: 无尘
* @LastEditTime: 2019-11-15 14:06:02
* @LastEditTime: 2019-12-06 11:10:50
-->
<template>
<div class="inviter-log common-wrap">
......@@ -12,7 +12,10 @@
<div class="right-content border-box">
<div class="right-box border-box">
<div class="inviter-data">
<div class="inviter-data-img flex flex-align-center flex-pack-center"><img :src="inviterData.headUrl" alt="" /></div>
<div class="inviter-data-img flex flex-align-center flex-pack-center"><img
:src="inviterData.headUrl"
alt=""
/></div>
<div class="inviter-data-name text-center font-14 color-606266">-{{inviterData.realName}}-</div>
<div class="inviter-data-datas">
......@@ -34,7 +37,10 @@
</div>
<div class="inviter-log-tab flex flex-space-between">
<div class="data-detail-radios">
<el-radio-group v-model="tabName" style="margin-bottom: 30px;">
<el-radio-group
v-model="tabName"
style="margin-bottom: 30px;"
>
<el-radio-button label="invite">邀请日志</el-radio-button>
<el-radio-button label="point">积分收益明细</el-radio-button>
<el-radio-button label="card">卡券收益明细</el-radio-button>
......@@ -52,6 +58,15 @@
</div>
</div>
<vue-gic-footer></vue-gic-footer>
<export-excel
:dataArr="tableData"
:dialogVisible.sync="dialogVisible"
:projectName="projectName"
:type="2"
:excelUrl="excelUrl"
:params="params"
>
</export-excel>
</div>
</template>
<script>
......@@ -85,7 +100,16 @@ export default {
totalTransPersonNum: '',
sumCardNum: '',
sumPoints: ''
}
},
tableData: [],
dialogVisible: false,
excelUrl: '/sharing-core-web/export',
params: {
activityId: this.$route.query.activityId,
isExportInvited: this.tabName == 'invite'? false : true,
requestProject: 'share-config',
},
projectName: 'share-config'
};
},
components: {
......@@ -96,6 +120,19 @@ export default {
},
methods: {
/**
* 导出数据
*/
exportData() {
const that = this;
that.dialogVisible = true;
that.tableData = that.tabName == 'invite'? that.$refs.inviteTable.tableData: that.$refs.invitedTable.tableData;
that.params = {
activityId: that.$route.query.activityId,
isExportInvited: that.tabName == 'invite'? false : true,
requestProject: 'share-config',
};
},
/**
* 分页---页码变化
*/
handleSizeChange(val) {
......
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