Skip to content

S
shareConfig
Commit 88c4bd66 by 无尘
Options

fix：修改即时奖励

parent b6a3029a
Showing with 76 additions and 17 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.dee50c1fda712fdcdcc1d61dfc520768.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.2345e37bedc4bce09c72.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.793bdaf34be2813fbbc29a29b94475fd.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.b99258193efb8e3e23be.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/js/2.b01304b6eca3a6af2946.js → dist/static/js/2.3aafedfcefbf5aa22384.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.2345e37bedc4bce09c72.js → dist/static/js/manifest.b99258193efb8e3e23be.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:"b01304b6eca3a6af2946",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}}([]); !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:"3aafedfcefbf5aa22384",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(){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 \ No newline at end of file
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-05 11:18:33 * @LastEditTime: 2019-12-05 15:35:08
--> -->
<!-- <!--
<spot-award></spot-award> <spot-award></spot-award>
...@@ -264,7 +264,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue'; ...@@ -264,7 +264,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
<div class="store-select-title"> <div class="store-select-title">
<span class="font-14 color-606266">限制额度：</span> <span class="font-14 color-606266">限制额度：</span>
<el-input-number <el-input-number
v-model="instanceAward.awardLimitNumber" v-model="instanceAward.awardLimitPoint"
controls-position="right" controls-position="right"
:min="1" :min="1"
:max="9999999999" :max="9999999999"
......
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-05 11:29:31 * @LastEditTime: 2019-12-05 14:14:54
--> -->
<!-- <!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config> <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
...@@ -1181,6 +1181,44 @@ export default { ...@@ -1181,6 +1181,44 @@ export default {
selectModeType(item, pItem) { selectModeType(item, pItem) {
const that = this; const that = this;
pItem[item.key] = pItem[item.key] ? 0 : 1; pItem[item.key] = pItem[item.key] ? 0 : 1;
// 修改tab
const type = that.stepObj[that.basePath[that.basePath.length-1].transName];
if (that.activeInfoData.awardMode == 1 && type != 6 && pItem.instantAwardFlag == 0 && that.activeName == 'second') {
that.activeName = 'five';
}
if (that.activeInfoData.awardMode == 1 && type != 6 && pItem.passAwardFlag == 0 && that.activeName == 'third') {
that.activeName = 'five';
}
if (that.activeInfoData.awardMode == 1 && type != 6 && pItem.competitionAwardFlag == 0 && that.activeName == 'four') {
that.activeName = 'five';
}
if (that.activeInfoData.awardMode == 1 && type == 6 && pItem[item.key] == 0 && pItem.instantAwardFlag == 0 && that.activeName == 'second') {
that.activeName = 'first';
}
if (that.activeInfoData.awardMode == 1 && type == 6 && pItem[item.key] == 0 && pItem.passAwardFlag == 0 && that.activeName == 'third') {
that.activeName = 'first';
}
if (that.activeInfoData.awardMode == 1 && type == 6 && pItem[item.key] == 0 && pItem.competitionAwardFlag == 0 && that.activeName == 'four') {
that.activeName = 'first';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType != 6 && pItem.instantAwardFlag == 0 && pItem.activeName == 'second') {
pItem.activeName = 'five';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType != 6 && pItem.passAwardFlag == 0 && pItem.activeName == 'third') {
pItem.activeName = 'five';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType != 6 && pItem.competitionAwardFlag == 0 && pItem.activeName == 'four') {
pItem.activeName = 'five';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType == 6 && pItem.instantAwardFlag == 0 && pItem.activeName == 'second') {
pItem.activeName = 'first';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType == 6 && pItem.passAwardFlag == 0 && pItem.activeName == 'third') {
pItem.activeName = 'first';
}
if (that.activeInfoData.awardMode == 2 && pItem.stepType == 6 && pItem.competitionAwardFlag == 0 && pItem.activeName == 'four') {
pItem.activeName = 'first';
}
}, },
/** /**
* 修改 奖励模式，修改数据 * 修改 奖励模式，修改数据
......
src/components/active/bar-chart.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-11-27 11:16:04 * @LastEditTime: 2019-12-05 15:33:46
--> -->
<!-- <!--
<bar-chart :funnelData="funnelData" :charHeight="charHeight"></bar-chart> <bar-chart :funnelData="funnelData" :charHeight="charHeight"></bar-chart>
...@@ -19,6 +19,7 @@ import barChart from '@/components/active/bar-chart.vue'; ...@@ -19,6 +19,7 @@ import barChart from '@/components/active/bar-chart.vue';
:settings="chartSettings" :settings="chartSettings"
:colors="colors" :colors="colors"
:height="charHeight" :height="charHeight"
:tooltip="tooltip"
></ve-histogram> ></ve-histogram>
<div class="chart-title font-12 color-000 text-center">- 近15天趋势图 -</div> <div class="chart-title font-12 color-000 text-center">- 近15天趋势图 -</div>
</div> </div>
...@@ -46,6 +47,16 @@ export default { ...@@ -46,6 +47,16 @@ export default {
//showLine: ['传播系数'] //showLine: ['传播系数']
} }
this.colors = ['#5B8FF9','#5AD8A6', '#FF6383'] this.colors = ['#5B8FF9','#5AD8A6', '#FF6383']
this.tooltip = {
trigger: 'axis',
formatter (v) {
let tpl = [v[0].axisValue]
v.forEach(i => {
tpl.push(`${i.marker} ${i.seriesName}：${i.data}`)
})
return tpl.join('<br>')
}
}
return {}; return {};
} }
/* methods() { /* methods() {
......
src/components/active/funnel-chart.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-05 10:30:29 * @LastEditTime: 2019-12-05 14:47:34
--> -->
<!-- <!--
<funnel-chart :funnelData="funnelData"></funnel-chart> <funnel-chart :funnelData="funnelData"></funnel-chart>
...@@ -24,9 +24,9 @@ import funnelChart from '@/components/active/funnel-chart.vue'; ...@@ -24,9 +24,9 @@ import funnelChart from '@/components/active/funnel-chart.vue';
> >
<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 space-line r-60"></div>
<div <div
v-if="index != router.length-1" v-if="index != funnelData.router.length-1"
class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa" class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"
>{{item.transId}}</div> >{{item.rate}}%</div>
</div> </div>
</template> </template>
</div> </div>
...@@ -38,9 +38,9 @@ import funnelChart from '@/components/active/funnel-chart.vue'; ...@@ -38,9 +38,9 @@ import funnelChart from '@/components/active/funnel-chart.vue';
:key="index" :key="index"
class="flex-1 flex flex-column" class="flex-1 flex flex-column"
> >
<div class="flex-1 flex flex-align-center space-line p-l-98 font-12 color-606066">{{item.transName}} {{ item.transId }} 人</div> <div class="flex-1 flex flex-align-center space-line p-l-98 font-12 color-606066">{{item.transName}} {{ item.countNumber }} 人 <span v-if="item.transId == 32 ">, {{item.countAmount | formatThousand }} 元</span></div>
<div <div
v-if="index != router.length-1" v-if="index != funnelData.router.length-1"
class="flex-1 flex flex-align-center bg-f5f7fa" class="flex-1 flex flex-align-center bg-f5f7fa"
></div> ></div>
</div> </div>
......
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-04 20:09:42 * @LastEditTime: 2019-12-05 15:11:10
--> -->
<!-- <!--
<in-progress-active></in-progress-active> <in-progress-active></in-progress-active>
...@@ -81,8 +81,8 @@ export default { ...@@ -81,8 +81,8 @@ export default {
return { return {
funnelData: {}, funnelData: {},
barChartData: { barChartData: {
columns: ['日期', '新增参与人数', '新增受邀人数', '传播系数'], columns: ['日期', '新增参与人数', '新增受邀人数'],
rows: [{ 日期: '1', 新增参与人数: 1393, 新增受邀人数: 1093, 传播系数: 0.32 }, { 日期: '2', 新增参与人数: 3530, 新增受邀人数: 3230, 传播系数: 0.26 }, { 日期: '3', 新增参与人数: 2923, 新增受邀人数: 2623, 传播系数: 0.76 }, { 日期: '4', 新增参与人数: 1723, 新增受邀人数: 1423, 传播系数: 0.49 }, { 日期: '5', 新增参与人数: 3192, 新增受邀人数: 3192, 传播系数: 0.323 }, { 日期: '6', 新增参与人数: 3593, 新增受邀人数: 3293, 传播系数: 0.78 }] rows: [{ 日期: '1', 新增参与人数: 1393, 新增受邀人数: 1093 }, { 日期: '2', 新增参与人数: 3530, 新增受邀人数: 3230}, { 日期: '3', 新增参与人数: 2923, 新增受邀人数: 2623}, { 日期: '4', 新增参与人数: 1723, 新增受邀人数: 1423}, { 日期: '5', 新增参与人数: 3192, 新增受邀人数: 3192}, { 日期: '6', 新增参与人数: 3593, 新增受邀人数: 3293}]
}, },
selectItem: '', selectItem: '',
inProgressData: [ inProgressData: [
...@@ -119,7 +119,17 @@ export default { ...@@ -119,7 +119,17 @@ export default {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.funnelData = resData.result || {}; that.funnelData = resData.result || {};
that.barChartData = resData.result.trend || {}; if (!!resData.result.trend && !!resData.result.trend.length) {
resData.result.trend.forEach(ele => {
ele['日期'] = ele.date.split('-')[2];
ele['新增参与人数'] = ele.inviteCount;
ele['新增受邀人数'] = ele.invitedCount;
})
}
that.barChartData = {
columns: ['日期', '新增参与人数', '新增受邀人数'],
rows: resData.result.trend || []
}
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
......
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