Skip to content

S
shareConfig
Commit bbb70f61 by 无尘
Options

fix：修改奖励显示

parent a08e0aca
Showing with 173 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.8d2792c6038a8140c59552be600e64d9.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.f69f29d88003fed5726c.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.3d72388818540a95385231efb3102e03.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.d1f510a51369f7fdf6ea.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.3ab0a463d7034a0e136f.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.3c62da6ab293f28c6431.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.73ec7e086eaaab516167.js → dist/static/js/3.12a1f435b25ad9b0e916.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.f69f29d88003fed5726c.js → dist/static/js/manifest.d1f510a51369f7fdf6ea.js
!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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3c62da6ab293f28c6431",3:"73ec7e086eaaab516167",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(){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
!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:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3ab0a463d7034a0e136f",3:"12a1f435b25ad9b0e916",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(){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/base-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 17:04:11
* @LastEditTime: 2019-12-05 10:03:08
-->
<!--
<base-config @submitNext="submitNext"></base-config>
......@@ -53,7 +53,7 @@ import baseConfig from '@/components/active-config/base-config.vue';
>
<limitInput
:inputWidth="350"
:disflag="$route.query.interfaceId ? true : false"
:disflag="$route.query.editFlag ? true : false"
:inputValue.sync="activeInfoData.activityName"
:holder="'请输入活动名称'"
:getByType="'word'"
......@@ -67,6 +67,7 @@ import baseConfig from '@/components/active-config/base-config.vue';
<el-date-picker
class="m-l-10"
prefix-icon="el-icon-time"
:disabled="$route.query.editFlag"
:picker-options="pickerOptions"
v-model="activeInfoData.dateRange"
@change="changeDate"
......@@ -183,7 +184,12 @@ export default {
that.$refs[formName].validate(valid => {
if (valid) {
that.$store.dispatch('clearIndexData'); // 清空首页暂存数据
that.postSave();
if (that.$route.query.hasOwnProperty('editFlag')) {
that.$emit('submitNext', that.activeInfoData);
that.$store.dispatch('saveBaseInfo', that.activeInfoData);
}else {
that.postSave();
}
} else {
return false;
}
......
src/components/active-config/card-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 14:07:21
* @LastEditTime: 2019-12-05 09:57:22
-->
<!--
<card-config @submitBack="submitBack" @submitNext="submitNext"></card-config>
......@@ -125,7 +125,12 @@ export default {
const that = this;
that.$refs[formName].validate(valid => {
if (valid) {
that.postSave();
if (that.$route.query.hasOwnProperty('editFlag')) {
that.$emit('submitNext', that.activeInfoData);
that.$store.dispatch('saveCardInfo', that.activeInfoData);
}else {
that.postSave();
}
} else {
return false;
}
......
src/components/active-config/center-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 10:37:02
* @LastEditTime: 2019-12-05 10:36:10
-->
<!--
<center-config @submitBack="submitBack" @submitNext="submitNext"></center-config>
......@@ -45,7 +45,13 @@ import centerConfig from '@/components/active-config/center-config.vue';
prop=""
>
<div class="flex">
<span class="color-wrap flex flex-pack-center flex-space-between border-box">背景色<el-color-picker v-model="activeInfoData.shareBackColor"></el-color-picker></span><span class="color-wrap flex flex-space-between flex-pack-center border-box">文字色<el-color-picker v-model="activeInfoData.shareFontColor"></el-color-picker></span>
<span class="color-wrap flex flex-pack-center flex-space-between border-box">背景色<el-color-picker
:disabled="$route.query.hasOwnProperty('editFlag') ? true: false"
v-model="activeInfoData.shareBackColor"
></el-color-picker></span><span class="color-wrap flex flex-space-between flex-pack-center border-box">文字色<el-color-picker
:disabled="$route.query.hasOwnProperty('editFlag') ? true: false"
v-model="activeInfoData.shareFontColor"
></el-color-picker></span>
</div>
</el-form-item>
<el-form-item
......@@ -66,6 +72,7 @@ import centerConfig from '@/components/active-config/center-config.vue';
prop="activityIntroduceMode"
>
<el-radio-group
:disabled="$route.query.hasOwnProperty('editFlag') ? true: false"
v-model="activeInfoData.activityIntroduceMode"
@change="changeMode"
>
......@@ -93,6 +100,7 @@ import centerConfig from '@/components/active-config/center-config.vue';
prop="activityIntroduceId"
>
<el-select
:disabled="$route.query.hasOwnProperty('editFlag') ? true: false"
size="large"
v-model="activeInfoData.activityIntroduceId"
@change="changePage"
......@@ -293,7 +301,12 @@ export default {
const that = this;
that.$refs[formName].validate(valid => {
if (valid) {
that.postSave();
if (that.$route.query.hasOwnProperty('editFlag')) {
that.$emit('submitNext', that.activeInfoData);
that.$store.dispatch('saveCenterInfo', that.activeInfoData);
}else {
that.postSave();
}
} else {
return false;
}
......
src/components/active-config/configs/competition-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 19:37:35
* @LastEditTime: 2019-12-05 10:48:21
-->
<!--
<competition-award></competition-award>
......@@ -49,7 +49,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
</div>
</li>
<li
v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费')"
v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费') && compitionAward.stepType == 6"
:class="['li-cell li-second-cell flex-1 ', compitionAward.dealAmountFlag == 1 ? 'li-second-active' : '']"
:key="index + 'first'"
@click="selectStore(item)"
......
src/components/active-config/configs/entry-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 18:54:59
* @LastEditTime: 2019-12-05 10:49:25
-->
<!--
<entry-award></entry-award>
......@@ -49,7 +49,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
</div>
</li>
<li
v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费')"
v-if="index == 1 && basePath.map(ele => ele.transName).includes('消费') && passAward.stepType == 6"
:class="['li-cell li-second-cell flex-1 ', passAward.dealAmountFlag == 1 ? 'li-second-active' : '']"
:key="index + 'first'"
@click="selectStore(item)"
......
src/components/active-config/configs/invitee-reward.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 18:32:14
* @LastEditTime: 2019-12-05 10:49:11
-->
<!--
<invitee-reward></invitee-reward>
......@@ -67,11 +67,11 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
<el-radio-group v-model="invitedAward.pointAwardMode">
<el-radio :label="1">定额奖励</el-radio>
<el-radio
v-if="basePath.map(ele => ele.transName).includes('消费')"
v-if="basePath.map(ele => ele.transName).includes('消费') && invitedAward.stepType == 6"
:label="2"
>阶梯奖励</el-radio>
<el-radio
v-if="basePath.map(ele => ele.transName).includes('消费')"
v-if="basePath.map(ele => ele.transName).includes('消费') && invitedAward.stepType == 6"
:label="3"
>成交额等比奖励</el-radio>
</el-radio-group>
......
src/components/active-config/configs/spot-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 19:24:09
* @LastEditTime: 2019-12-05 10:49:51
-->
<!--
<spot-award></spot-award>
......@@ -49,7 +49,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
</div>
</li>
<li
v-if="basePath.map(ele => ele.transName).includes('消费') && index == 2"
v-if="basePath.map(ele => ele.transName).includes('消费') && index == 2 && instanceAward.stepType == 6"
:class="['li-cell li-second-cell flex-1 ', instanceAward.instanceMade == item.goalId ? 'li-second-active' : '']"
:key="index + 'first'"
@click="selectStore(item)"
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 18:20:55
* @LastEditTime: 2019-12-05 10:52:31
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -313,9 +313,15 @@ import rewardConfig from '@/components/active-config/reward-config.vue';
@click="submitBack"
>上一步</el-button>
<el-button
v-if="!$route.query.hasOwnProperty('editFlag')"
type="primary"
@click="submitForm('rewardForm')"
>确认新建</el-button>
> {{$route.query.hasOwnProperty('activityId') ?'确认编辑':'确认新建'}}</el-button>
<el-button
v-if="$route.query.hasOwnProperty('editFlag')"
type="primary"
@click="submitForm('rewardForm')"
>返回活动列表</el-button>
</el-form-item>
</el-form>
</div>
......@@ -1188,7 +1194,7 @@ export default {
that.$nextTick(() => {
that.ProgressiveData[that.ProgressiveData.length-1].switchFlag = true;
that.ProgressiveData.forEach(ele => {
if (that.basePath.map(ele => ele.transName).includes('消费')) {
if (that.basePath.map(ele => ele.transName).includes('消费') && ele.stepType == 6) {
ele.activeName = 'first';
}else {
ele.activeName = 'second';
......@@ -1272,6 +1278,11 @@ export default {
const that = this;
that.$refs[formName].validate(valid => {
if (valid) {
if (that.$route.query.hasOwnProperty('editFlag')) {
that.$store.dispatch('clearActiveData');
that.$router.push(`/shareIndex`);
return false
}
if (that.activeInfoData.awardMode == 1) {
that.singleCheck(); // 判断单次
} else {
......
src/components/active/funnel-chart.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 20:19:19
* @LastEditTime: 2019-12-05 10:30:29
-->
<!--
<funnel-chart :funnelData="funnelData"></funnel-chart>
......@@ -17,7 +17,7 @@ import funnelChart from '@/components/active/funnel-chart.vue';
<div class="funnel-chart-body flex">
<div class="chart-left">
<div class="trapezoid-bg flex flex-column">
<template v-for="(item, index) in router">
<template v-for="(item, index) in funnelData.router">
<div
:key="index"
class="flex-1 flex flex-column"
......@@ -29,23 +29,11 @@ import funnelChart from '@/components/active/funnel-chart.vue';
>{{item.transId}}</div>
</div>
</template>
<!-- <div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-60"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-57"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-52"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-48"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-42"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"></div>
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line "></div> -->
</div>
</div>
<div class="chart-right">
<div class="chart-text flex flex-column">
<template v-for="(item, index) in router">
<template v-for="(item, index) in funnelData.router">
<div
:key="index"
class="flex-1 flex flex-column"
......@@ -57,15 +45,6 @@ import funnelChart from '@/components/active/funnel-chart.vue';
></div>
</div>
</template>
<!-- <div class="flex-1 flex flex-align-center space-line p-l-90 font-12 color-606066">访问活动着陆页 {{ funnelData.openCard | formatThousand }} 人</div>
<div class="flex-1 flex flex-align-center bg-f5f7fa"></div>
<div class="flex-1 flex flex-align-center space-line p-l-80 font-12 color-606066">认证开卡 {{ funnelData.openCard | formatThousand }} 人</div>
<div class="flex-1 flex flex-align-center bg-f5f7fa "></div>
<div class="flex-1 flex flex-align-center space-line p-l-72 font-12 color-606066">参与游戏 {{ funnelData.openCard | formatThousand }} 人</div>
<div class="flex-1 flex flex-align-center bg-f5f7fa"></div>
<div class="flex-1 flex flex-align-center space-line p-l-60 font-12 color-606066">领取卡券 {{ funnelData.openCard | formatThousand }} 人</div>
<div class="flex-1 flex flex-align-center bg-f5f7fa"></div>
<div class="flex-1 flex flex-align-center space-line p-l-45 font-12 color-606066">消费 {{ funnelData.orderCount | formatThousand }} 人， {{ funnelData.orderAmount | formatThousand }} 元</div> -->
</div>
</div>
</div>
......
src/components/active/will-start-active.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 20:10:30
* @LastEditTime: 2019-12-05 09:52:17
-->
<!--
<will-start-active></will-start-active>
......@@ -146,7 +146,7 @@ export default {
*/
toEdit(index, row) {
const that = this;
that.$router.push(`/createActive?activityId=${row.activityId}&editFlag=show`);
that.$router.push(`/createActive?activityId=${row.activityId}`);
},
/**
* 数据明细
......
src/view/activeConfig/index.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-12-04 17:27:23
* @LastEditTime: 2019-12-05 10:02:10
-->
<template>
......@@ -78,7 +78,7 @@ export default {
/*relocation: true */
},
{
name: '新建活动',
name: this.$route.query.hasOwnProperty('editFlag')? '查看配置': this.$route.query.hasOwnProperty('activityId')?'编辑活动': '新建活动',
/*relocation: true */
},
],
......
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